Changeset 14387 for main/waeup.kofa/trunk

Timestamp:

11 Jan 2017, 13:08:15 (8 years ago)

Author:

Henrik Bettermann

Message:

Move 'courses w/o results' column.

Location:

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

Files:

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

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

@@ -70 +70 @@
                 level_obj.gpa_params[1],
                 passed_params[2],
-                passed_params[5],
                 '%.2f' % (int(100*level_obj.gpa)/100.0),
                 failed_courses,
+                passed_params[5],
                 level_obj.cumulative_params[1],
                 level_obj.cumulative_params[4],
@@ -118 +118 @@
             TTR(translate(_('Total Credits Taken'))),
             TTR(translate(_('Total Credits Passed'))),
-            TTR(translate(_('Courses w/o Result'))),
             TTR(translate(_('GPA'))),
             translate(_('Courses Failed')),
+            TTR(translate(_('Courses w/o Result'))),
             TTR(translate(_('Cum. Credits Taken'))),
             TTR(translate(_('Cum. Credits Passed'))),
@@ -130 +130 @@
         # Underline mandatory (core) courses
         failed_courses = Paragraph(
-            line[6].replace('m_', '<u>').replace('_m', '</u>'), SMALL_PARA_STYLE)
-        line = line[:6] + (failed_courses,) + line[7:]
+            line[5].replace('m_', '<u>').replace('_m', '</u>'), SMALL_PARA_STYLE)
+        line = line[:5] + (failed_courses,) + line[6:]
         # Superscript in remarks (needed by AAUE)
         remark = Paragraph(
@@ -189 +189 @@
         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, 1*cm,
-                      6*cm, 0.8*cm, 0.8*cm, 1*cm, 2*cm]
+        col_widths = [1*cm, 4*cm, 5*cm, 0.8*cm, 0.8*cm, 1*cm,
+                      6*cm, 0.8*cm, 0.8*cm, 0.8*cm, 1*cm, 2*cm]
         pdf_data = [Paragraph('<b>%s - Report %s</b>'
                               % (self.creation_dt_string, job_id),

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

@@ -41 +41 @@
         result = get_students('fac1', 'dep1', 2010, 100)
         self.assertEqual(result,
-            [(u'1234', u'Bob Tester', 90, 30, 0, '1.66',
-            'm_Course2_m Course3', 90, 30, '1.666', '')])
+            [(u'1234', u'Bob Tester', 90, 30, '1.66',
+            'm_Course2_m Course3', 0, 90, 30, '1.666', '')])
         return