Changeset 14410

Timestamp:

17 Jan 2017, 06:11:25 (8 years ago)

Author:

Henrik Bettermann

Message:

Move if statement to utility into method to ease customization.

Location:

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

Files:

• reports/session_results_presentation.py (modified) (1 diff)
• reports/tests/test_session_results_presentation.py (modified) (1 diff)
• utils.py (modified) (1 diff)

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

@@ -81 +81 @@
                 table[len(students_utils.gpa_boundaries)].append(line)
                 continue
-        if level_obj.gpa_params[1] == 0:
-            # No credits weighted
-            table[0].append(line)
-        else:
-            gpaclass = students_utils.getDegreeClassNumber(level_obj)
-            table[gpaclass].append(line)
+        gpaclass = students_utils.getDegreeClassNumber(level_obj)
+        table[gpaclass].append(line)
         for i in range(len(students_utils.gpa_boundaries)+1):
             if len(table[i]):

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

@@ -52 +52 @@
         result = get_students('fac1', 'dep1', 2010, 0)
         self.assertEqual(result,
-            [[(u'K1000000', u'1234', u'Bob Tester')], [], [], [], [], [], []])
+            [[], [], [], [], [], [], [(u'K1000000', u'1234', u'Bob Tester')]])
 
     def test_get_students_without_level_in_session(self):

main/waeup.kofa/trunk/src/waeup/kofa/students/utils.py

@@ -840 +840 @@
         reports).
         """
+        if level_obj.gpa_params[1] == 0:
+            # No credits weighted
+            return 6
         return self.getClassFromCGPA(level_obj.cumulative_params[0])[0]