Changeset 14475

Timestamp:

27 Jan 2017, 16:52:40 (8 years ago)

Author:

Henrik Bettermann

Message:

Activate verdict 'D' and use for level reports.

Location:

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

Files:

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

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

@@ -213 +213 @@
             return 'N/A'
         # returning student remark
+        if self.level_verdict in ('FRNS', 'NEOR', 'NEOV'):
+            return 'Probation'
+        if self.level_verdict == 'D':
+            return 'Withdrawn'
         if self.gpa_params[1] < 30:
             # credits taken below limit
-            return 'Probation'
-        if self.level_verdict in ('FRNS', 'NEOR', 'NEOV'):
             return 'Probation'
         if self.cumulative_params[0] < failed_limit:

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

@@ -157 +157 @@
         'B': 'Student with carryover courses',
         'C': 'Student on probation',
-        #'D': 'Withdrawn from the faculty',
+        'D': 'Withdrawn from the faculty',
         #'E': 'Student who were previously on probation',
         #'F': 'Medical case',