Changeset 13922 for main/waeup.kofa/branches/uli-scores-upload/src

Timestamp:

13 Jun 2016, 00:44:56 (9 years ago)

Author:

uli

Message:

We can use zope.publisher to enforce types.

Location:

main/waeup.kofa/branches/uli-scores-upload/src/waeup/kofa/students

Files:

• browser.py (modified) (1 diff)
• browser_templates/editscorespage.pt (modified) (1 diff)
• tests/test_browser.py (modified) (7 diffs)

main/waeup.kofa/branches/uli-scores-upload/src/waeup/kofa/students/browser.py

@@ -3130 +3130 @@
             scores = form['scores']
             sids = form['sids']
-            if isinstance(scores, basestring):
-                scores = [scores]
-            if isinstance(sids, basestring):
-                sids = [sids]
             formvals = dict([(sids[i], scores[i]) for i in range(len(sids))])
             for ticket in editable_tickets:

main/waeup.kofa/branches/uli-scores-upload/src/waeup/kofa/students/browser_templates/editscorespage.pt

@@ -24 +24 @@
 
           <td tal:condition="ticket/editable_by_lecturer" style="width: 65px;">
-          <input type="text" name="scores" class="form-control"
+          <input type="text" name="scores:list" class="form-control"
                      tal:attributes="value ticket/score" />
-          <input type="hidden" name="sids"
+          <input type="hidden" name="sids:list"
                  tal:attributes="value ticket/student/student_id" />
       </td>

main/waeup.kofa/branches/uli-scores-upload/src/waeup/kofa/students/tests/test_browser.py

@@ -3962 +3962 @@
         IWorkflowState(self.student).setState(VALIDATED)
         self.browser.open(self.edit_scores_url)
-        self.assertTrue(self.browser.getControl(name="scores") is not None)
+        self.assertTrue(
+            self.browser.getControl(name="scores:list") is not None)
 
     def test_score_editing_offers_only_current_scores(self):
@@ -3981 +3982 @@
         self.app['configuration'].current_academic_session = 2004
         self.browser.reload()
-        self.assertTrue(self.browser.getControl(name="scores") is not None)
+        self.assertTrue(
+            self.browser.getControl(name="scores:list") is not None)
 
     def test_score_editing_can_change_scores(self):
@@ -3989 +3991 @@
             self.student['studycourse']['100']['COURSE1'].score, None)
         self.browser.open(self.edit_scores_url)
-        self.browser.getControl(name="scores", index=0).value = '55'
+        self.browser.getControl(name="scores:list", index=0).value = '55'
         self.browser.getControl("Update scores").click()
         # the new value is stored in data
@@ -3996 +3998 @@
         # the new value is displayed on page/prefilled in form
         self.assertEqual(
-            self.browser.getControl(name="scores", index=0).value, '55')
+            self.browser.getControl(name="scores:list", index=0).value, '55')
         # The change has been logged
         with open(self.stud_log_path, 'r') as fd:
@@ -4007 +4009 @@
         self.login_as_lecturer()
         self.browser.open(self.edit_scores_url)
-        self.browser.getControl(name="scores", index=0).value = 'abc'
+        self.browser.getControl(name="scores:list", index=0).value = 'abc'
         self.browser.getControl("Update scores").click()
         self.assertTrue(
@@ -4019 +4021 @@
         self.student['studycourse']['100']['COURSE1'].score = None
         self.browser.open(self.edit_scores_url)
-        self.browser.getControl(name="scores", index=0).value = ''
+        self.browser.getControl(name="scores:list", index=0).value = ''
         self.browser.getControl("Update scores").click()
         logcontent = open(self.stud_log_path, 'r').read()
@@ -4025 +4027 @@
         # now retry with some value set
         self.student['studycourse']['100']['COURSE1'].score = 55
-        self.browser.getControl(name="scores", index=0).value = ''
+        self.browser.getControl(name="scores:list", index=0).value = ''
         self.browser.getControl("Update scores").click()
         logcontent = open(self.stud_log_path, 'r').read()