Changeset 10616 for main/waeup.kofa/trunk/src/waeup/kofa/students/reports

Timestamp:

11 Sep 2013, 06:03:04 (11 years ago)

Author:

Henrik Bettermann

Message:

Print cumulative params.

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

@@ -64 +64 @@
                 level_obj.gpa,
                 passed_params[4],
+                level_obj.cumulative_params[3],
+                level_obj.cumulative_params[4],
+                level_obj.cumulative_params[0],
                 )
         table.append(line)
@@ -106 +109 @@
             TTR('Total Credits Passed'),
             TTR('GPA'),
-            'Courses Failed')
+            'Courses Failed',
+            TTR('Cum. Credits Taken'),
+            TTR('Cum. Credits Passed'),
+            TTR('CGPA'))
     table = [col_names]
     sn = 1
@@ -157 +163 @@
         table_data = tbl_data_to_table(self.data)
         #col_widths = [3.5*cm] * len(self.data[0])
-        col_widths = [1*cm, 4*cm, 5*cm, 0.8*cm, 0.8*cm, 0.8*cm, 6*cm, ]
+        col_widths = [1*cm, 4*cm, 5*cm, 0.8*cm, 0.8*cm, 0.8*cm,
+                      6*cm, 0.8*cm, 0.8*cm, 0.8*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'K1000000', u'1234', u'Bob Tester', 30, 30, 5.0, [])])
+            [(u'1234', u'Bob Tester', 30, 30, 5.0, [], 30, 30, 5.0)])
         return