Changeset 16708

Timestamp:

9 Nov 2021, 11:00:59 (3 years ago)

Author:

Henrik Bettermann

Message:

Further harmonise reports.

File:

• main/waeup.aaue/trunk/src/waeup/aaue/students/utils.py (modified) (2 diffs)

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

@@ -128 +128 @@
         certificate = getattr(level_obj.__parent__,'certificate', None)
         end_level = getattr(certificate, 'end_level', None)
-        if level_obj.gpa_params[1] < MINIMUM_UNITS_THRESHOLD:
-            # credits taken below limit
+        if level_obj.level_verdict in ('FRNS', 'NER', 'NYV'):
             return 0
         if end_level and level_obj.level >= end_level:
+            if level_obj.level > end_level:
+                # spill-over level
+                if level_obj.gpa_params[1] == 0:
+                    # no credits taken
+                    return 0
+            elif level_obj.gpa_params[1] < MINIMUM_UNITS_THRESHOLD:
+                # credits taken below limit
+                return 0
             failed_courses = level_obj.passed_params[4]
             not_taken_courses = level_obj.passed_params[5]
@@ -139 +146 @@
                 and not not_taken_courses == 'Nil':
                 return 0
-        if level_obj.level_verdict in ('FRNS', 'NER', 'NYV'):
+        elif level_obj.gpa_params[1] < MINIMUM_UNITS_THRESHOLD:
+            # credits taken below limit
             return 0
         # use gpa_boundaries above