SAK-40363: Assignments > Upload All > silent failure if grades file i…

…s wrong type
ottenhoff · Jul 23, 2018 · f8de0a7 · f8de0a7
1 parent 6dfacfb
commit f8de0a7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/assignment/bundles/resources/assignment.properties b/assignment/bundles/resources/assignment.properties
@@ -705,6 +705,8 @@ uploadall.alert.wrongZipFormat=ZIP file is not in correct format. Please ensure
 uploadall.alert.incorrectFormat=ZIP file is not in correct format.
 uploadall.alert.invalidUserId=Please ensure that user id's correctly match those in the site and the folders are in the top level of the zip (not nested).
 uploadall.alert.noGradeFile=Please ensure there is a grade file and correct folder structure.
+uploadall.alert.nocsv=CSV grades file format was selected, but no grades.csv file was found at the root level.
+uploadall.alert.noexcel=Excel grades file format was selected, but no grades.xls file was found at the root level.
 downloadall.alert.choose.element=You must choose at lease one element in the download options.
 uploadall.alert.zipFile=You have not selected a zip archive file. You must select either a .zip or a .sit archive file as the upload file.
 uploadall.note=NOTICE: If you switch between languages in your preferences, for example English to Spanish, you will need to upload this archive in the same language as it was downloaded (or re-download and use a new archive).

diff --git a/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java b/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java
@@ -13473,6 +13473,16 @@ else if (gradeType == PASS_FAIL_GRADE_TYPE) {
 
         boolean zipError = false;
 
+        // generate error when there is no grade file yet it was selected
+        if (!zipHasGradeFile && hasGradeFile) {
+            if ("csv".equals(gradeFileFormat)) {
+                addAlert(state, rb.getString("uploadall.alert.nocsv"));
+            } else {
+                addAlert(state, rb.getString("uploadall.alert.noexcel"));
+            }
+            zipError = true;
+        }
+
         // generate error when there is no grade file and no folder structure
         if (!zipHasGradeFile && !zipHasFolder) {
             addAlert(state, rb.getString("uploadall.alert.incorrectFormat"));