Changeset 14537

Timestamp:

13 Feb 2017, 06:14:08 (8 years ago)

Author:

Henrik Bettermann

Message:

Students at final year level are marked NER if their credits taken fall below 30.

Location:

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

Files:

• studylevel.py (modified) (1 diff)
• utils.py (modified) (1 diff)

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

@@ -196 +196 @@
                     # no credits taken
                     return 'NER'
-            else:
-                if self.gpa_params[1] < 30:
-                    # credits taken below limit
-                    return 'NER'
+            elif self.gpa_params[1] < 30:
+                # credits taken below limit
+                return 'NER'
             if self.level_verdict in ('FRNS', 'NER', 'NYV'):
                 return self.level_verdict

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

@@ -80 +80 @@
                     # no credits taken
                     return 0
+            elif self.gpa_params[1] < 30:
+                # credits taken below limit
+                return 0
             failed_courses = level_obj.passed_params[4]
             not_taken_courses = level_obj.passed_params[5]