Changeset 14899 for main/waeup.aaue/trunk/src/waeup/aaue

Timestamp:

16 Nov 2017, 06:51:01 (7 years ago)

Author:

Henrik Bettermann

Message:

Implement GPA classification for diploma students.

File:

• main/waeup.aaue/trunk/src/waeup/aaue/students/utils.py (modified) (1 diff)

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

@@ -37 +37 @@
     PORTRAIT_CHANGE_STATES = (ADMITTED,)
 
+    gpa_boundaries_diploma = ((1.5, 'Fail'),
+                              (1.5, 'Fail'),
+                              (2.4, 'Pass'),
+                              (3.5, 'Merit'),
+                              (4.5, 'Credit'),
+                              (5, 'Distinction'))
+
     gpa_boundaries = ((1, 'FRNS / NER / NYV'),
                       (1.5, 'Pass'),
-                      (2.4, '3rd Class Honours'),
-                      (3.5, '2nd Class Honours Lower Division'),
-                      (4.5, '2nd Class Honours Upper Division'),
-                      (5, '1st Class Honours'))
+                      (2.4, '3rd Class Honours (Diploma: Pass)'),
+                      (3.5, '2nd Class Honours Lower Division (Diploma: Merit)'),
+                      (4.5, '2nd Class Honours Upper Division (Diploma: Credit)'),
+                      (5, '1st Class Honours (Diploma: Distinction)'))
 
     def getClassFromCGPA(self, gpa, student):
-        if gpa < self.gpa_boundaries[0][0]:
-            # FRNS
-            return 0, self.gpa_boundaries[0][1]
-        if student.entry_session < 2013:
-            if gpa < self.gpa_boundaries[1][0]:
+        if student.current_mode.startswith('dp'):
+            gpa_boundaries = self.gpa_boundaries_diploma
+
+        else:
+            gpa_boundaries = self.gpa_boundaries
+        if gpa < gpa_boundaries[0][0]:
+            # FRNS / Fail
+            return 0, gpa_boundaries[0][1]
+        if student.entry_session < 2013 and \
+            not student.current_mode.startswith('dp'):
+            if gpa < gpa_boundaries[1][0]:
                 # Pass
-                return 1, self.gpa_boundaries[1][1]
+                return 1, gpa_boundaries[1][1]
         else:
-            if gpa < self.gpa_boundaries[1][0]:
+            if gpa < gpa_boundaries[1][0]:
                 # FRNS (Pass degree has been phased out in 2013)
-                return 0, self.gpa_boundaries[0][1]
-        if gpa < self.gpa_boundaries[2][0]:
-            # 3rd
-            return 2, self.gpa_boundaries[2][1]
-        if gpa < self.gpa_boundaries[3][0]:
-            # 2nd L
-            return 3, self.gpa_boundaries[3][1]
-        if gpa < self.gpa_boundaries[4][0]:
-            # 2nd U
-            return 4, self.gpa_boundaries[4][1]
-        if gpa <= self.gpa_boundaries[5][0]:
-            # 1st
-            return 5, self.gpa_boundaries[5][1]
+                return 0, gpa_boundaries[0][1]
+        if gpa < gpa_boundaries[2][0]:
+            # 3rd / Pass
+            return 2, gpa_boundaries[2][1]
+        if gpa < gpa_boundaries[3][0]:
+            # 2nd L / Merit
+            return 3, gpa_boundaries[3][1]
+        if gpa < gpa_boundaries[4][0]:
+            # 2nd U / Credit
+            return 4, gpa_boundaries[4][1]
+        if gpa <= gpa_boundaries[5][0]:
+            # 1st / Distinction
+            return 5, gpa_boundaries[5][1]
         return 'N/A'