Changeset 10637

Timestamp:

22 Sep 2013, 05:07:40 (11 years ago)

Author:

Henrik Bettermann

Message:

Scores can be removed.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/students

Files:

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

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

@@ -3097 +3097 @@
             for ticket in editable_tickets:
                 score = ticket.score
-                try:
-                    score = int(scores[tno])
-                except ValueError:
-                    error += '%s, ' % ticket.student.display_fullname
+                if scores[tno] == '':
+                    score = None
+                else:
+                    try:
+                        score = int(scores[tno])
+                    except ValueError:
+                        error += '%s, ' % ticket.student.display_fullname
                 if ticket.score != score:
                     ticket.score = score

main/waeup.kofa/trunk/src/waeup/kofa/students/interfaces.py

@@ -647 +647 @@
         default = None,
         required = False,
+        missing_value = None,
         )
 

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

@@ -1731 +1731 @@
         self.assertTrue('Error: Score(s) of Anna Tester have not be updated'
             in self.browser.contents)
+        # Scores can be removed
+        self.browser.open(
+            "http://localhost/app/faculties/fac1/dep1/courses/COURSE1/edit_scores")
+        self.browser.getControl(name="scores", index=0).value = ''
+        self.browser.getControl("Update scores").click()
+        self.assertEqual(
+            self.student['studycourse']['100']['COURSE1'].score, None)
+        logcontent = open(logfile).read()
+        self.assertTrue('mrslecturer - students.browser.EditScoresPage - '
+                        'K1000000 100/COURSE1 score updated (None)' in logcontent)
 
     def test_change_current_mode(self):