Changeset 14412

Timestamp:

17 Jan 2017, 06:16:51 (8 years ago)

Author:

Henrik Bettermann

Message:

Use level_verdict to hide end level gpa and display FRNS as remark.

File:

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

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

@@ -179 +179 @@
         # final level student remark
         if end_level and self.level >= end_level:
-            failed_courses = self.passed_params[4]
-            if '_m' in failed_courses \
-                or not self.cumulative_params[0] or len(self.passed_params[5]):
+            if '_m' in self.passed_params[4]:
+                return 'FRNS'
+            if not self.cumulative_params[0]:
+                return 'FRNS'
+            if len(self.passed_params[5]):
+                return 'FRNS'
+            if self.level_verdict == 'FRNS':
                 return 'FRNS'
             if self.cumulative_params[0] < failed_limit: