SAM-3254 Student waiting until after due date and then starting asses…

…sment should not create new submission (sakaiproject#4786)
s50600822 · Sep 12, 2017 · a223287 · a223287
1 parent 82488bb
commit a223287
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/...o/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/delivery/DeliveryBean.java b/...o/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/delivery/DeliveryBean.java
@@ -3409,7 +3409,7 @@ private boolean isAvailable(){
 	  return isAvailable;
   }
 
-  private boolean pastDueDate(){
+  public boolean pastDueDate(){
     boolean pastDue = true;
     Date currentDate = new Date();
 		Date dueDate;
@@ -3424,7 +3424,7 @@ private boolean pastDueDate(){
     return pastDue;
   }
 
-  private boolean isAcceptLateSubmission() {
+  public boolean isAcceptLateSubmission() {
 	  boolean acceptLateSubmission = AssessmentAccessControlIfc.ACCEPT_LATE_SUBMISSION.equals(publishedAssessment.getAssessmentAccessControl().getLateHandling());
 	  //If using extended Time Delivery, the late submission setting is based on retracted
 	  if (extendedTimeDeliveryService.hasExtendedTime()) {
@@ -3434,7 +3434,7 @@ private boolean isAcceptLateSubmission() {
 	  return acceptLateSubmission;
   }
 
-  private boolean isRetracted(boolean isSubmitForGrade){
+  public boolean isRetracted(boolean isSubmitForGrade){
     boolean isRetracted = true;
     Date currentDate = new Date();
     Date retractDate;

diff --git a/...rc/java/org/sakaiproject/tool/assessment/ui/listener/delivery/DeliveryActionListener.java b/...rc/java/org/sakaiproject/tool/assessment/ui/listener/delivery/DeliveryActionListener.java
@@ -159,6 +159,21 @@ public void processAction(ActionEvent ae) throws
     	// there is no action needed (the outcome is set in BeginDeliveryActionListener).
       	return;
       }
+
+      if (delivery.pastDueDate()){
+        if (delivery.isAcceptLateSubmission()) {
+          if(delivery.getTotalSubmissions() > 0) {
+            // Not during a Retake
+            if (delivery.getActualNumberRetake() == delivery.getNumberRetake()) {
+              return;
+            }
+          }
+        } else {
+          if(delivery.isRetracted(false)){
+              return;
+          }
+        }
+      }
       // Clear elapsed time, set not timed out
       clearElapsedTime(delivery);