Changeset 15414 for main/waeup.aaue/trunk/src/waeup/aaue/students/browser.py

Timestamp:

17 May 2019, 15:13:53 (5 years ago)

Author:

Henrik Bettermann

Message:

Enable lecturers to edit imported_ts.

File:

• main/waeup.aaue/trunk/src/waeup/aaue/students/browser.py (modified) (6 diffs)

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

@@ -1035 +1035 @@
 
         We expect uploadfile to be a regular CSV file with columns
-        ``student_id``, ``score`` and ``ca`` (other cols are ignored).
+        ``student_id``, ``score``, ``imported_ts``
+        and ``ca`` (other cols are ignored).
         """
         result = dict()
@@ -1041 +1042 @@
         reader = csv.DictReader(data)
         for row in reader:
-            if not ('student_id' in row and 'score' in row and 'ca' in row):
+            if not ('student_id' in row and 'score' in row and 'ca' in row and
+                'imported_ts' in row):
                 continue
-            result[row['student_id']] = (row['score'], row['ca'])
+            result[row['student_id']] = (
+                row['score'], row['ca'], row['imported_ts'])
         return result
 
@@ -1063 +1066 @@
                 return False
         else:
-            formvals = dict(zip(form['sids'], zip(form['scores'], form['cas'])))
+            formvals = dict(zip(form['sids'], zip(
+                form['scores'], form['cas'], form['imported_tss'])))
         for ticket in self.editable_tickets:
             ticket_error = False
             score = ticket.score
             ca = ticket.ca
+            imported_ts = ticket.imported_ts
             sid = ticket.student.student_id
             if formvals[sid][0] == '':
@@ -1073 +1078 @@
             if formvals[sid][1] == '':
                 ca = None
+            if formvals[sid][2] == '':
+                imported_ts = None
             try:
                 if formvals[sid][0]:
@@ -1078 +1085 @@
                 if formvals[sid][1]:
                     ca = int(formvals[sid][1])
+                if formvals[sid][2]:
+                    imported_ts = int(formvals[sid][2])
             except ValueError:
                 error += '%s, ' % ticket.student.display_fullname
@@ -1102 +1111 @@
                     (ob_class, ticket.student.student_id,
                      ticket.level, ticket.code, ca))
+            if not ticket_error and ticket.imported_ts != imported_ts:
+                try:
+                    ticket.imported_ts = imported_ts
+                except TooBig:
+                    error += '%s, ' % ticket.student.display_fullname
+                    pass
+                ticket.student.__parent__.logger.info(
+                    '%s - %s %s/%s imported_ts updated (%s)' %
+                    (ob_class, ticket.student.student_id,
+                     ticket.level, ticket.code, imported_ts))
         if error:
-            self.flash(_('Error: Score(s) and CA(s) of %s have not be updated. '
+            self.flash(_('Error: Score(s), CA(s) and Imported TS(s) of %s have not be updated. '
               % error.strip(', ')), type="danger")
         return True