Changeset 16240

Timestamp:

17 Sep 2020, 07:34:46 (4 years ago)

Author:

Henrik Bettermann

Message:

Don't allow the total outcome of course grade exceed 100 (ie if CA + Score > 100, return "total score is greater than 100").

Location:

main/waeup.aaue/trunk/src/waeup/aaue

Files:

• applicants/tests/test_browser.py (modified) (1 diff)
• students/browser.py (modified) (1 diff)
• students/tests/test_browser.py (modified) (1 diff)

main/waeup.aaue/trunk/src/waeup/aaue/applicants/tests/test_browser.py

@@ -137 +137 @@
         IWorkflowState(self.applicant).setState('admitted')
         self.applicant.course_admitted = self.certificate
-        self.browser.open(self.manage_path)
+        self.browser.open(self.view_path)
         self.browser.getLink("Download application slip").click()
         self.assertEqual(self.browser.headers['Status'], '200 Ok')

main/waeup.aaue/trunk/src/waeup/aaue/students/browser.py

@@ -1076 +1076 @@
                     imported_ts = int(formvals[sid][2])
             except ValueError:
+                error += '%s, ' % ticket.student.display_fullname
+                ticket_error = True
+            if score and ca and not ticket_error and score + ca > 100:
                 error += '%s, ' % ticket.student.display_fullname
                 ticket_error = True

main/waeup.aaue/trunk/src/waeup/aaue/students/tests/test_browser.py

@@ -372 +372 @@
         self.browser.open(self.edit_scores_url)
         upload_ctrl = self.browser.getControl(name='uploadfile:file')
+        upload_file = StringIO(UPLOAD_CSV_TEMPLATE % ('65','52','77'))
+        upload_ctrl.add_file(upload_file, 'text/csv', 'myscores.csv')
+        self.browser.getControl("Update editable scores from").click()
+        self.assertTrue('TESTER, Anna have not be updated' in self.browser.contents)
+        # values have not been changed
+        self.assertEqual(
+            self.student['studycourse']['100']['COURSE1'].score, 55)
+        self.assertEqual(
+            self.student['studycourse']['100']['COURSE1'].ca, None)
+        self.assertEqual(
+            self.student['studycourse']['100']['COURSE1'].imported_ts, None)
+        self.browser.open(self.edit_scores_url)
+        upload_ctrl = self.browser.getControl(name='uploadfile:file')
         upload_file = StringIO(UPLOAD_CSV_TEMPLATE % ('65','22','77'))
         upload_ctrl.add_file(upload_file, 'text/csv', 'myscores.csv')
         self.browser.getControl("Update editable scores from").click()
-        # value changed
+        # values changed
         self.assertEqual(
             self.student['studycourse']['100']['COURSE1'].score, 65)