Changeset 14464

Timestamp:

26 Jan 2017, 11:03:09 (8 years ago)

Author:

Henrik Bettermann

Message:

ivama: Any student with less than 30 units in summary of result should not proceed no matter the GPA/CGPA.

Location:

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

Files:

• studylevel.py (modified) (2 diffs)
• utils.py (modified) (2 diffs)

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

@@ -181 +181 @@
         # final level student remark
         if end_level and self.level >= end_level:
-            if self.gpa_params[1] == 0:
-                # No credits weighted at this level
-                return 'NEOR'
+            if self.level > end_level:
+                # spill-over level
+                if self.gpa_params[1] == 0:
+                    # no credits taken
+                    return 'NEOR'
+            else:
+                if self.gpa_params[1] < 30:
+                    # credits taken below limit
+                    return 'NEOR'
             if self.level_verdict in ('FRNS', 'NEOR', 'NEOV'):
                 return self.level_verdict
@@ -208 +214 @@
         # returning student remark
         if self.gpa_params[1] < 30:
-            # Credits taken below limit
+            # credits taken below limit
             return 'Probation'
         if self.level_verdict in ('FRNS', 'NEOR', 'NEOV'):

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

@@ -72 +72 @@
         reports).
         """
-        if level_obj.gpa_params[1] == 0:
-            # No credits weighted
-            return 0
-        if level_obj.level_verdict in ('FRNS', 'NEOR', 'NEOV'):
-            return 0
         certificate = getattr(level_obj.__parent__,'certificate', None)
         end_level = getattr(certificate, 'end_level', None)
         if end_level and level_obj.level >= end_level:
+            if level_obj.level > end_level:
+                # spill-over level
+                if self.gpa_params[1] == 0:
+                    # no credits taken
+                    return 0
             failed_courses = level_obj.passed_params[4]
             not_taken_courses = level_obj.passed_params[5]
@@ -87 +87 @@
                 and not not_taken_courses == 'NIL':
                 return 0
+        elif level_obj.gpa_params[1] < 30:
+            # credits taken below limit
+            return 0
+        if level_obj.level_verdict in ('FRNS', 'NEOR', 'NEOV'):
+            return 0
         # use gpa_boundaries above
         return self.getClassFromCGPA(