SAK-45507 Assignment improve the use of the submission status

https://jira.sakaiproject.org/browse/SAK-45507
brdebr · Jul 5, 2021 · 4d2385e · 4d2385e
1 parent 8de8b92
commit 4d2385e
Show file tree

Hide file tree

Showing 9 changed files with 490 additions and 154 deletions.
diff --git a/assignment/api/src/java/org/sakaiproject/assignment/api/AssignmentService.java b/assignment/api/src/java/org/sakaiproject/assignment/api/AssignmentService.java
@@ -490,7 +490,7 @@ public interface AssignmentService extends EntityProducer {
      * @param submissionId
      * @return
      */
-    public AssignmentConstants.SubmissionStatus getSubmissionCannonicalStatus(AssignmentSubmission s);
+    AssignmentConstants.SubmissionStatus getSubmissionCanonicalStatus(AssignmentSubmission submission, boolean canGrade);
 
     /**
      * @param submissionId

diff --git a/assignment/impl/src/java/org/sakaiproject/assignment/impl/AssignmentServiceImpl.java b/assignment/impl/src/java/org/sakaiproject/assignment/impl/AssignmentServiceImpl.java
diff --git a/assignment/impl/src/test/org/sakaiproject/assignment/impl/AssignmentServiceTest.java b/assignment/impl/src/test/org/sakaiproject/assignment/impl/AssignmentServiceTest.java
diff --git a/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java b/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java
@@ -4013,7 +4013,7 @@ private void processIfHasSubmission(AssignmentSubmission submission, boolean isN
         resetNavOptions(flag);
 
         // If the submission is actually a submission, set the appropriate flag and reference; return true
-        if (!AssignmentConstants.SubmissionStatus.NO_SUBMISSION.equals(assignmentService.getSubmissionCannonicalStatus(submission)) && submission.getUserSubmission()) {
+        if (!AssignmentConstants.SubmissionStatus.NO_SUBMISSION.equals(assignmentService.getSubmissionCanonicalStatus(submission, true)) && submission.getUserSubmission()) {
             applyNavOption(flag, submission);
         }
     }
@@ -4030,7 +4030,7 @@ private void processIfHasUngradedSubmission(AssignmentSubmission submission, boo
         resetNavOptions(flag);
 
         // If the submisison is actually a submission and is ungraded, set the appropriate flag and reference; return true
-        if (!submission.getGraded() && !AssignmentConstants.SubmissionStatus.NO_SUBMISSION.equals(assignmentService.getSubmissionCannonicalStatus(submission)) && submission.getUserSubmission()) {
+        if (!submission.getGraded() && !AssignmentConstants.SubmissionStatus.NO_SUBMISSION.equals(assignmentService.getSubmissionCanonicalStatus(submission, true)) && submission.getUserSubmission()) {
             applyNavOption(flag, submission);
         }
     }

diff --git a/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_list_submissions.vm b/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_list_submissions.vm
@@ -404,6 +404,7 @@ function printView(url) {
 					#end
 					#if ($!submission)## && $submission.submitted)
 						## SAK-17606
+						#set($submissionId = $submission.Id)
 						#set($anonymousSubmissionId = $submission.getId() + ' ' + ($tlang.getString("grading.anonymous.title")))
 
 						<tr>
@@ -420,13 +421,6 @@ function printView(url) {
 							</td>
 							<td headers="studentname">
 								#if ($taggable)
-									#if (!$!submission.submitted)
-										#set($submittedText = $!submission.submittedText)
-										#set($submittedAttachments = $submission.Attachments)
-										#if ($!submittedText.length() > 0 || $!submittedAttachments.size() > 0 )
-										#end
-									#end
-
 									#if ($value_CheckAnonymousGrading)
 										$anonymousSubmissionId
 									#else
@@ -468,13 +462,6 @@ function printView(url) {
 								#else
 									#if(!$disableGrade)
 										<a href="#toolLinkParam("AssignmentAction" "doGrade_submission" "assignmentId=$formattedText.escapeUrl($assignmentReference)&submissionId=$formattedText.escapeUrl($userSubmission.Reference)")" title="$tlang.getString("listsub.grasub")">
-											#if (!$!submission.submitted)
-												#set($submittedText = $!submission.submittedText)
-												#set($submittedAttachments = $submission.Attachments)
-												#if ($submittedText && !$submittedText.isEmpty() || $!submittedAttachments.size() > 0 )
-												#end
-											#end
-
 											#if ($value_CheckAnonymousGrading)
 												$anonymousSubmissionId
 											#else
@@ -515,11 +502,7 @@ function printView(url) {
 									#end
 							</td>
 							<td headers="status">
-								#if ($!submission && $submission.submitted)
-									$!service.getSubmissionStatus($submission.Id)
-								#elseif (!$!submission.submitted)
-										$tlang.getString("listsub.nosub")
-								#end
+								$!service.getSubmissionStatus($!submissionId)
 							</td>
 							#if ($assignment.AllowPeerAssessment)
 								<td>

diff --git a/...ent/tool/src/webapp/vm/assignment/chef_assignments_instructor_student_list_submissions.vm b/...ent/tool/src/webapp/vm/assignment/chef_assignments_instructor_student_list_submissions.vm
@@ -145,9 +145,10 @@
 											&nbsp;
 										</td>
 										<td headers="status">
-											#if ($!submission)
-												$!service.getSubmissionStatus($submission.Id)
+											#if ($submission)
+												#set($submissionId = $submission.Id)
 											#end
+											$!service.getSubmissionStatus($!submissionId)
 											&nbsp;
 										</td>
 										#if ($withGrade)

diff --git a/assignment/tool/src/webapp/vm/assignment/chef_assignments_list_assignments.vm b/assignment/tool/src/webapp/vm/assignment/chef_assignments_list_assignments.vm
@@ -473,16 +473,10 @@
 								#if ($allowAddAssignment && $!view.equals('lisofass1'))
 								   $!service.getAssignmentStatus($assignment.Id)
 								#else
-									#if ($!submission)
-										$!service.getSubmissionStatus($submission.Id)
-										#if ($submission.Submitted)
-											#if ($assignment.DueDate && $submission.DateSubmitted && $submission.DateSubmitted.isAfter($assignment.DueDate))
-												<span class="highlight">$tlang.getString("gen.late2")</span>
-											#end
-										#end
-									#else
-										$tlang.getString("gen.notsta")
+									#if ($submission)
+										#set ($submissionId = $submission.Id)
 									#end
+									<span class="highlight">$!service.getSubmissionStatus($!submissionId)</span>
 								#end
 							</td>
 							<td headers="openDate" class="hidden-xs">

diff --git a/assignment/tool/src/webapp/vm/assignment/chef_assignments_student_view_grade.vm b/assignment/tool/src/webapp/vm/assignment/chef_assignments_student_view_grade.vm
@@ -40,13 +40,10 @@
         #if ($!assignment.IsGroup)
             <span> - $tlang.getString("gen.groupassignment") </span>
         #end
-        #if ($submission.Returned)
-            <span class="highlight"> - $tlang.getString("gen.returned")</span>
-        #elseif (!$submission.Submitted)
-            <span class="highlight"> - $!service.getSubmissionStatus($!submission.Id) </span>
-        #elseif (!$!nonElectronicType && $!submission.UserSubmission)
-            <span class="highlight"> - $tlang.getString("gen.subm4")</span>
+        #if ($submission)
+            #set($submissionId = $submission.Id)
         #end
+        <span class="highlight"> - $!service.getSubmissionStatus($!submissionId)</span>
     </h3>
     #if (!$!nonElectronicType)
         #progressBar($!service.getProgressBarStatus($!submission))

diff --git a/assignment/tool/src/webapp/vm/assignment/chef_assignments_student_view_submission.vm b/assignment/tool/src/webapp/vm/assignment/chef_assignments_student_view_submission.vm
@@ -59,16 +59,9 @@ $(document).ready(function(){
 			#else
 			<h3>
 				$formattedText.escapeHtml($assignment.Title)
-				#if(!$submitted)
-                    <span class="highlight">
-						 - $!service.getSubmissionStatus($!submission.Id)
-					</span>
-				#end
-				#if ($dateReturned && $dateSubmitted && $dateReturned.isAfter($dateSubmitted))
-					<span class="highlight">
-						 - $tlang.getString("resubmit")
-					</span>
-				#end	
+				<span class="highlight">
+					 - $!service.getSubmissionStatus($submission.Id)
+				</span>
 			</h3>
 			#end
 			#if ($returned)