Changeset 14390 for main

Timestamp:

12 Jan 2017, 17:00:20 (8 years ago)

Author:

Henrik Bettermann

Message:

Number of number of decimal places of CGPA depends on whether it is final level or not.

Location:

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

Files:

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

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

@@ -64 +64 @@
         # The 'remark' column remains empty in base package.
         remark = getattr(level_obj, 'remark', '')
+        end_level = getattr(stud['studycourse'].certificate, 'end_level', None)
+        if end_level and level >= end_level:
+            cgpa = '%.2f' % (int(100*level_obj.cumulative_params[0])/100.0)
+        else:
+            cgpa = '%.3f' % (int(1000*level_obj.cumulative_params[0])/1000.0)
         line = (
                 #stud.student_id,
@@ -70 +75 @@
                 level_obj.gpa_params[1],
                 passed_params[2],
-                '%.2f' % (int(100*level_obj.gpa)/100.0),
+                '%.3f' % (int(1000*level_obj.gpa)/1000.0),
                 failed_courses,
                 passed_params[5],
                 level_obj.cumulative_params[1],
                 level_obj.cumulative_params[4],
-                '%.3f' % (int(1000*level_obj.cumulative_params[0])/1000.0),
+                cgpa,
                 remark,
                 )

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, '1.66',
+            [(u'1234', u'Bob Tester', 90, 30, '1.666',
             'm_Course2_m Course3', 0, 90, 30, '1.666', '')])
         return