Changeset 14042 for main/waeup.aaue/trunk/src/waeup

Timestamp:

2 Aug 2016, 14:45:49 (8 years ago)

Author:

Henrik Bettermann

Message:

Catch traceback.

File:

• main/waeup.aaue/trunk/src/waeup/aaue/students/reports/raw_score_report.py (modified) (1 diff)

main/waeup.aaue/trunk/src/waeup/aaue/students/reports/raw_score_report.py

@@ -117 +117 @@
             'Matric No.',
             'Name',
-            #TTR('xxx'),
             )
+    catalog = getUtility(ICatalog, name='courses_catalog')
     for code in course_codes:
-        col_names += (TTR(code),)
+        course = list(catalog.searchResults(code=(code, code)))[0]
+        col_names += (TTR('%s (%s)' % (course.title, code)),)
     table = [col_names]
     sn = 1
+    scores = tuple()
     for line in data:
         composed_line = (sn,) + line[:-1]
-        scores = tuple([
-            '%s%s' % (line[-1][code][0],line[-1][code][1])
-            for code in course_codes])
+        for code in course_codes:
+            result = line[-1].get(code)
+            if not result:
+                continue
+            scores += ('%s%s' % (result[0], result[1]),)
         composed_line += scores
         table.append(composed_line)