Skip to content

Commit

Permalink
Merge branch 'SAK-49998' into SAK-49998b
Browse files Browse the repository at this point in the history
  • Loading branch information
@JuanDavid102
JuanDavid102 authored May 21, 2024
2 parents 58d6980 + 5ebdf53 commit 56d3202
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 19 deletions.
1 change: 0 additions & 1 deletion assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5777,7 +5777,6 @@ private String build_instructor_view_students_assignment_context(VelocityPortlet
}
}


context.put("expandedUserId", state.getAttribute(EXPANDED_USER_ID));
context.put("studentMembersMap", studentMembers);
context.put("studentMembers", new SortedIterator(studentMembers.values().iterator(), new AssignmentComparator(state, SORTED_USER_BY_SORTNAME, Boolean.TRUE.toString())));
Expand Down
58 changes: 40 additions & 18 deletions ...ent/tool/src/webapp/vm/assignment/chef_assignments_instructor_student_list_submissions.vm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
#end
#viewFilterPanel("viewFilterForm", "viewgroup", $viewSelectOptions, "doChange_submission_list_option")
#end
#searchFilterPanel("$form_search", $searchString, "doView_submission_list_search", "doView_submission_list_search_clear")
</div>
<div class="sakai-table-toolBar-centre">
#if ($!isTimesheet)
Expand Down Expand Up @@ -126,20 +127,30 @@
#else
data-action-href='#toolLinkParam("AssignmentAction" "doHide_student_submission" "studentId=$formattedText.escapeUrl($member.Id)")'
#end
data-expanded="$isExpanded"
>
$submitterName
</span>
</td>
<td headers="assignment" data-order="ZZZZZZZZ"></td>
<td headers="submitted"></td>
<td headers="status" data-order="999999999999"></td>
#if ($!isTimesheet)
<td headers="time"></td>
#end
<td headers="grade"></td>
</tr>
#else
</div>
<div>
<div class="spinnerBesideContainer" id="$submitterName">
#set( $userSpinnerID = "userSpinner_" + $member.Id )
#if (!$studentListShowSet.contains($member.Id))
<a href="javascript:void(0)" onclick="SPNR.insertSpinnerInPreallocated( this, null, '$userSpinnerID' ); location='#toolLinkParam("AssignmentAction" "doShow_student_submission" "studentId=$formattedText.escapeUrl($member.Id)")'; return false;"
title="$tlang.getString("stulistsunbm.shostuass")" name="studentLink" >
<img src="#imageLink("sakai/expand.gif")" alt="$tlang.getString("stulistsunbm.shostuass")" width="13" height="13" border="0" />
#else
<a href="javascript:void(0)" onclick="SPNR.insertSpinnerInPreallocated( this, null, '$userSpinnerID' ); location='#toolLinkParam("AssignmentAction" "doHide_student_submission" "studentId=$formattedText.escapeUrl($member.Id)")'; return false;"
title="$tlang.getString("stulistsunbm.hidstuass")" name="studentLink" >
<img src="#imageLink("sakai/collapse.gif")" alt="$tlang.getString("stulistsunbm.hidstuass")" width="13" height="13" border="0" />
#end
$formattedText.escapeHtml($submitterName)
</a>
<div id="$userSpinnerID" class="allocatedSpinPlaceholder"></div>
</div>
</div>
</div>
</td>
<td colspan="5">
</td>
</tr>
#if ($studentListShowSet.contains($member.Id))
#set($assignments=false)
#set($assignments=$!studentAssignmentsTable.get($member))
#foreach ($assignment in $!assignments)
Expand All @@ -156,10 +167,16 @@
#set($submission=$service.getSubmission($assignment.Id, $member))
#set($submissionReference=$service.submissionReference($assignment.Context, $submission.Id, $assignment.Id))
<tr>
<td headers="studentname" data-order="$submitterName">
<span data-user-id="$member.Id"
#if (!$studentListShowSet.contains($member.Id))
data-action-href='#toolLinkParam("AssignmentAction" "doShow_student_submission" "studentId=$formattedText.escapeUrl($member.Id)")'
<td headers="studentname"/>
<td headers="assignment">
<a href="#toolLinkParam("AssignmentAction" "doGrade_submission" "assignmentId=$formattedText.escapeUrl($assignmentReference)&submissionId=$formattedText.escapeUrl($submissionReference)&option=lisofass2&user_id=$member.id")" title="$formattedText.escapeHtml($assignment.Title)">$formattedText.escapeHtml($assignment.Title)</a>
#if ($allowAddAssignment && $allowSubmitByInstructor)
#set( $submitSpinnerID = "submitFor_" + $member.Id + "_" + $formattedText.escapeUrl($assignmentReference) )
<div class="itemAction spinnerBesideContainer">
#if ($assignment.DueDate.isAfter($currentTime))
<a onclick="SPNR.insertSpinnerInPreallocated( this, null, '$submitSpinnerID' );" href="#toolLinkParam("AssignmentAction" "doView_submission" "assignmentReference=$formattedText.escapeUrl($assignmentReference)&submitterId=$formattedText.escapeUrl($member.id)")">
$tlang.getString("submitforstudent")
</a>
#else
data-action-href='#toolLinkParam("AssignmentAction" "doHide_student_submission" "studentId=$formattedText.escapeUrl($member.Id)")'
#end
Expand Down Expand Up @@ -265,5 +282,10 @@
<input type="hidden" name="sakai_csrf_token" value="$sakai_csrf_token" />
</form>
#end
#if ($expandedUserName)
<script>
window.location.href = window.location.href + "#" + "$expandedUserName";
</script>
#end
</div>
<!-- end: chef_assignments_instructor_student_list_submissions.vm -->

0 comments on commit 56d3202

Please sign in to comment.