Changeset 14079 for main/waeup.kofa/trunk/src/waeup/kofa

Timestamp:

16 Aug 2016, 09:01:16 (8 years ago)

Author:

Henrik Bettermann

Message:

Add remark column. So far, only used and filled by AAUE.

Location:

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

Files:

• level_report.py (modified) (3 diffs)
• tests/test_level_report.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/students/reports/level_report.py

@@ -71 +71 @@
                 level_obj.cumulative_params[4],
                 level_obj.cumulative_params[0],
+                getattr(level_obj, 'remark', None),
                 )
         table.append(line)
@@ -115 +116 @@
             TTR('Cum. Credits Taken'),
             TTR('Cum. Credits Passed'),
-            TTR('CGPA'))
+            TTR('CGPA'),
+            TTR('Remark'))
     table = [col_names]
     sn = 1
@@ -171 +173 @@
         #col_widths = [3.5*cm] * len(self.data[0])
         col_widths = [1*cm, 4*cm, 5*cm, 0.8*cm, 0.8*cm, 1*cm,
-                      6*cm, 0.8*cm, 0.8*cm, 1*cm]
+                      6*cm, 0.8*cm, 0.8*cm, 1*cm, 2*cm]
         pdf_data = [Paragraph('<b>%s</b>' % self.creation_dt_string,
                               STYLE["Normal"]),

main/waeup.kofa/trunk/src/waeup/kofa/students/reports/tests/test_level_report.py

@@ -27 +27 @@
         result = get_students('fac1', 'dep1', 2010, 100)
         self.assertEqual(result,
-            [(u'1234', u'Bob Tester', 30, 30, 5.0, '', 30, 30, 5.0)])
+            [(u'1234', u'Bob Tester', 30, 30, 5.0, '', 30, 30, 5.0, None)])
         return