Skip to content

Commit

Permalink
SAK-43257: Assignments: expanding the assignment instructions causes …
Browse files Browse the repository at this point in the history 
…the page to reload (sakaiproject#8011)

Co-authored-by: Fernando Alvarez <[email protected]>
  • Loading branch information
@fer-acr
FerAlvarez95 and fer-acr authored Apr 20, 2020
1 parent d59b40e commit 37b8e46
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 54 deletions.
13 changes: 0 additions & 13 deletions assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -467,12 +467,10 @@ public class AssignmentAction extends PagedResourceActionII {
/**
* ****************** flags controls the grade assignment page layout *******************
*/
private static final String GRADE_ASSIGNMENT_EXPAND_FLAG = "grade_assignment_expand_flag";
private static final String GRADE_SUBMISSION_EXPAND_FLAG = "grade_submission_expand_flag";
/**
* ****************** instructor's grade submission *****************************
*/
private static final String GRADE_SUBMISSION_ASSIGNMENT_EXPAND_FLAG = "grade_submission_assignment_expand_flag";
private static final String GRADE_SUBMISSION_ALLOW_RESUBMIT = "grade_submission_allow_resubmit";
private static final String GRADE_SUBMISSION_DONE = "grade_submission_done";
private static final String GRADE_SUBMISSION_SUBMIT = "grade_submission_submit";
Expand Down Expand Up @@ -3428,7 +3426,6 @@ protected String build_instructor_grade_submission_context(VelocityPortlet portl
context.put("value_CheckAnonymousGrading", assignmentService.assignmentUsesAnonymousGrading(assignment.get()));
context.put("value_grade", displayGrade(state, (String) state.getAttribute(GRADE_SUBMISSION_GRADE), scaleFactor));

context.put("assignment_expand_flag", state.getAttribute(GRADE_SUBMISSION_ASSIGNMENT_EXPAND_FLAG));

// is this a non-electronic submission type of assignment
context.put("nonElectronic", (assignment.isPresent() && assignment.get().getTypeOfSubmission() == Assignment.SubmissionType.NON_ELECTRONIC_ASSIGNMENT_SUBMISSION) ? Boolean.TRUE : Boolean.FALSE);
Expand Down Expand Up @@ -4260,7 +4257,6 @@ private String build_instructor_grade_assignment_context(VelocityPortlet portlet
context.put("submissionTypeTable", submissionTypeTable());
context.put("attachments", state.getAttribute(ATTACHMENTS));
context.put("contentTypeImageService", contentTypeImageService);
context.put("assignment_expand_flag", state.getAttribute(GRADE_ASSIGNMENT_EXPAND_FLAG));
context.put("submission_expand_flag", state.getAttribute(GRADE_SUBMISSION_EXPAND_FLAG));

add2ndToolbarFields(data, context);
Expand Down Expand Up @@ -4753,7 +4749,6 @@ private String build_student_review_edit_context(VelocityPortlet portlet, Contex
}
}

context.put("assignment_expand_flag", state.getAttribute(GRADE_SUBMISSION_ASSIGNMENT_EXPAND_FLAG));
context.put("user", sessionUser);
context.put("submissionTypeTable", submissionTypeTable());
context.put("instructorAttachments", state.getAttribute(ATTACHMENTS));
Expand Down Expand Up @@ -7169,7 +7164,6 @@ private Instant putTimeInputInState(ParameterParser params, SessionState state,
*/
public void doHide_submission_assignment_instruction(RunData data) {
SessionState state = ((JetspeedRunData) data).getPortletSessionState(((JetspeedRunData) data).getJs_peid());
state.setAttribute(GRADE_SUBMISSION_ASSIGNMENT_EXPAND_FLAG, Boolean.FALSE);

// save user input
readGradeForm(data, state, "read");
Expand All @@ -7185,7 +7179,6 @@ public void doHide_submission_assignment_instruction_review(RunData data) {
}

SessionState state = ((JetspeedRunData) data).getPortletSessionState(((JetspeedRunData) data).getJs_peid());
state.setAttribute(GRADE_SUBMISSION_ASSIGNMENT_EXPAND_FLAG, Boolean.FALSE);

// save user input
saveReviewGradeForm(data, state, "read");
Expand All @@ -7199,7 +7192,6 @@ public void doShow_submission_assignment_instruction_review(RunData data) {


SessionState state = ((JetspeedRunData) data).getPortletSessionState(((JetspeedRunData) data).getJs_peid());
state.setAttribute(GRADE_SUBMISSION_ASSIGNMENT_EXPAND_FLAG, Boolean.TRUE);

// save user input
saveReviewGradeForm(data, state, "read");
Expand All @@ -7210,7 +7202,6 @@ public void doShow_submission_assignment_instruction_review(RunData data) {
*/
public void doShow_submission_assignment_instruction(RunData data) {
SessionState state = ((JetspeedRunData) data).getPortletSessionState(((JetspeedRunData) data).getJs_peid());
state.setAttribute(GRADE_SUBMISSION_ASSIGNMENT_EXPAND_FLAG, Boolean.TRUE);

// save user input
readGradeForm(data, state, "read");
Expand Down Expand Up @@ -9614,7 +9605,6 @@ public void doGrade_submission(RunData data) {
putSubmissionInfoIntoState(state, assignmentId, submissionId, viewSubsOnlySelected);

if (state.getAttribute(STATE_MESSAGE) == null) {
state.setAttribute(GRADE_SUBMISSION_ASSIGNMENT_EXPAND_FLAG, Boolean.FALSE);
state.setAttribute(STATE_MODE, MODE_INSTRUCTOR_GRADE_SUBMISSION);
state.setAttribute(FROM_VIEW, (String) params.getString("option"));
// assignment read event
Expand Down Expand Up @@ -9746,7 +9736,6 @@ public void doRelease_grades(RunData data) {
*/
public void doExpand_grade_assignment(RunData data) {
SessionState state = ((JetspeedRunData) data).getPortletSessionState(((JetspeedRunData) data).getJs_peid());
state.setAttribute(GRADE_ASSIGNMENT_EXPAND_FLAG, Boolean.TRUE);

} // doExpand_grade_assignment

Expand All @@ -9755,7 +9744,6 @@ public void doExpand_grade_assignment(RunData data) {
*/
public void doCollapse_grade_assignment(RunData data) {
SessionState state = ((JetspeedRunData) data).getPortletSessionState(((JetspeedRunData) data).getJs_peid());
state.setAttribute(GRADE_ASSIGNMENT_EXPAND_FLAG, Boolean.FALSE);

} // doCollapse_grade_assignment

Expand Down Expand Up @@ -9796,7 +9784,6 @@ public void doGrade_assignment(RunData data) {
Assignment a = getAssignment(assignmentId, "doGrade_assignment", state);
if (a != null) {
state.setAttribute(EXPORT_ASSIGNMENT_ID, a.getId());
state.setAttribute(GRADE_ASSIGNMENT_EXPAND_FLAG, Boolean.FALSE);
state.setAttribute(GRADE_SUBMISSION_EXPAND_FLAG, Boolean.TRUE);
state.setAttribute(GRADE_SUBMISSION_SHOW_STUDENT_DETAILS, params.getBoolean(GRADE_SUBMISSION_SHOW_STUDENT_DETAILS));
state.setAttribute(STATE_MODE, MODE_INSTRUCTOR_GRADE_ASSIGNMENT);
Expand Down
9 changes: 9 additions & 0 deletions assignment/tool/src/webapp/js/assignments.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -816,6 +816,15 @@ ASN.toggleSendFeedbackPanel = function()
ASN.swapDisplay(expandImg, collapseImg);
}

ASN.toggleAssignamentInstructionPanel = function()
{
var panel = document.getElementById("assignamentInstructionPanelContent");
$(panel).slideToggle(200);
var expandImg = document.getElementById("expandAssignamentInstruction");
var collapseImg = document.getElementById("collapseAssignamentInstruction");
ASN.swapDisplay(expandImg, collapseImg);
}

ASN.swapDisplay = function(elem1, elem2)
{
var tmpDisplay = elem1.style.display;
Expand Down
35 changes: 13 additions & 22 deletions assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_grading_submission.vm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,31 +221,22 @@
</table>

## show or hide assignment instruction and attachment
#if ($assignment_expand_flag)
<div id="assignamentInstructionPanel">
<p class="discTria">
<a href="javascript:void(0)" onclick="ASN.submitForm( 'gradeForm', 'hide_instruction', null, null ); return false;">
<img src="#imageLink("sakai/collapse.gif")" alt="$tlang.getString("gradingsub.opecliass")" border="0" width="13" height="13" align="top"/>
<a href="javascript:void(0)" onclick="ASN.toggleAssignamentInstructionPanel();">
<img id="expandAssignamentInstruction" src="#imageLink("sakai/expand.gif")" alt="$tlang.getString("gen.clocli")" border="0" width="13" height="13" align="top"/>
<img id="collapseAssignamentInstruction" style="display: none;" src="#imageLink("sakai/collapse.gif")" alt="$tlang.getString("gradingsub.opecliass")" border="0" width="13" height="13" align="top"/>
$tlang.getString("gen.assinf")
</a>
$tlang.getString("gen.assinf")
</p>
#else
<p class="discTria">
<a href="javascript:void(0)" onclick="ASN.submitForm( 'gradeForm', 'show_instruction', null, null ); return false;">
<img src="#imageLink("sakai/expand.gif")" alt="$tlang.getString("gen.clocli")" border="0" width="13" height="13" align="top"/>
</a>
$tlang.getString("gen.assinf")
</p>
#end
#if ($assignment_expand_flag)
#if (!$assignment.Instructions.isEmpty())
<div class="textPanel">$formattedText.escapeHtmlFormattedText($assignment.Instructions)</div>
#end

## Assignment Attachments
#attachmentFragment($assignment.Attachments $assignmentAttachmentReferences $!decoratedUrlMap false)
#end
## show the assignment content

<div id="assignamentInstructionPanelContent" style="display: none;">
<p>$formattedText.escapeHtmlFormattedText($assignment.Instructions)</p>
## Assignment Attachments
#attachmentFragment($assignment.Attachments $assignmentAttachmentReferences $!decoratedUrlMap false)
##end
## show the assignment content
</div>
</div>
#supplementItems($!allowViewModelAnswer $!allowReadAssignmentNoteItem $!allowViewAllPurposeItem $!assignmentModelAnswerItem $!assignmentNoteItem $!assignmentAllPurposeItem)

#if ($!hasAssociatedRubric)
Expand Down
33 changes: 14 additions & 19 deletions assignment/tool/src/webapp/vm/assignment/chef_assignments_student_review_edit.vm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,27 +80,22 @@
</div>

## show or hide assignment instruction and attachment
#if ($assignment_expand_flag)
<p class="discTria">
<a href="javascript:void(0)" onclick="ASN.submitForm( 'gradeForm', 'hide_instruction_review', null, null ); return false;">
<img src="#imageLink("sakai/collapse.gif")" alt="$tlang.getString("gradingsub.opecliass")" border="0" width="13" height="13" align="top" /></a>
<div id="assignamentInstructionPanel">
<p class="discTria">
<a href="javascript:void(0)" onclick="ASN.toggleAssignamentInstructionPanel();">
<img id="expandAssignamentInstruction" src="#imageLink("sakai/expand.gif")" alt="$tlang.getString("gen.clocli")" border="0" width="13" height="13" align="top"/>
<img id="collapseAssignamentInstruction" style="display: none;" src="#imageLink("sakai/collapse.gif")" alt="$tlang.getString("gradingsub.opecliass")" border="0" width="13" height="13" align="top"/>
$tlang.getString("gen.assinf")
</p>
#else
<p class="discTria">
<a href="javascript:void(0)" onclick="ASN.submitForm( 'gradeForm', 'show_instruction_review', null, null ); return false;">
<img src="#imageLink("sakai/expand.gif")" alt="$tlang.getString("gen.clocli")" border="0" width="13" height="13" align="top" /></a>
$tlang.getString("gen.assinf")
</p>
#end
#if ($assignment_expand_flag)
#if ($assignment.Instructions && !$assignment.Instructions.isEmpty())
<div class="textPanel">$formattedText.escapeHtmlFormattedText($assignment.Instructions)</div>
#else
#end
## attachments of assignment
</a>
</p>
<div id="assignamentInstructionPanelContent" style="display: none;">
<p>$formattedText.escapeHtmlFormattedText($assignment.Instructions)</p>
## Assignment Attachments
#attachmentFragment($assignment.Attachments $assignmentAttachmentReferences $!decoratedUrlMap false)
#end ## show the assignment content
##end
## show the assignment content
</div>
</div>

#supplementItems($!allowViewModelAnswer $!allowReadAssignmentNoteItem $!allowViewAllPurposeItem $!assignmentModelAnswerItem $!assignmentNoteItem $!assignmentAllPurposeItem)

Expand Down

0 comments on commit 37b8e46

Please sign in to comment.