Changeset 13875 for main

Timestamp:

4 Jun 2016, 08:55:08 (8 years ago)

Author:

Henrik Bettermann

Message:

Bugfix, see #222.

Location:

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

Files:

• browser.py (modified) (3 diffs)
• browser_templates/editscorespage.pt (modified) (1 diff)

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

@@ -558 +558 @@
             return
         if 'UPDATE' in form:
-            tno = 0
             error = ''
             if not editable_tickets:
@@ -564 +563 @@
             scores = form['scores']
             cas = form['cas']
+            sids = form['sids']
             if isinstance(scores, basestring):
                 scores = [scores]
             if isinstance(cas, basestring):
                 cas = [cas]
+            if isinstance(sids, basestring):
+                sids = [sids]
+            formvals = dict([(sids[i], (scores[i], cas[i]))
+                             for i in range(len(sids))])
             for ticket in editable_tickets:
                 ticket_error = False
                 score = ticket.score
                 ca = ticket.ca
-                if scores[tno] == '':
+                sid = ticket.student.student_id
+                if formvals[sid][0] == '':
                     score = None
-                if cas[tno] == '':
+                if formvals[sid][1] == '':
                     ca = None
                 try:
-                    if scores[tno]:
-                        score = int(scores[tno])
-                    if cas[tno]:
-                        ca = int(cas[tno])
+                    if formvals[sid][0]:
+                        score = int(formvals[sid][0])
+                    if formvals[sid][1]:
+                        ca = int(formvals[sid][1])
                 except ValueError:
                     error += '%s, ' % ticket.student.display_fullname
@@ -596 +601 @@
                         (ob_class, ticket.student.student_id,
                          ticket.level, ticket.code, ca))
-                tno += 1
             if error:
                 self.flash(_('Error: Score(s) and CA(s) of %s have not be updated. '

main/waeup.aaue/trunk/src/waeup/aaue/students/browser_templates/editscorespage.pt

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