Changeset 14487

Timestamp:

1 Feb 2017, 09:17:31 (8 years ago)

Author:

Henrik Bettermann

Message:

Replace 'NEOR' and 'NEOV'.

Location:

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

Files:

• students/studylevel.py (modified) (2 diffs)
• students/tests/test_utils.py (modified) (1 diff)
• students/utils.py (modified) (2 diffs)
• utils/utils.py (modified) (1 diff)

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

@@ -185 +185 @@
                 if self.gpa_params[1] == 0:
                     # no credits taken
-                    return 'NEOR'
+                    return 'NER'
             else:
                 if self.gpa_params[1] < 30:
                     # credits taken below limit
-                    return 'NEOR'
-            if self.level_verdict in ('FRNS', 'NEOR', 'NEOV'):
+                    return 'NER'
+            if self.level_verdict in ('FRNS', 'NER', 'NYV'):
                 return self.level_verdict
             if '_m' in self.passed_params[4]:
@@ -213 +213 @@
             return 'N/A'
         # returning student remark
-        if self.level_verdict in ('FRNS', 'NEOR', 'NEOV'):
+        if self.level_verdict in ('FRNS', 'NER', 'NYV'):
             return 'Probation'
         if self.level_verdict == 'D':

main/waeup.aaue/trunk/src/waeup/aaue/students/tests/test_utils.py

@@ -33 +33 @@
         self.student['studycourse'].current_verdict = 'C'
         self.assertEqual(utils.getReturningData(self.student),(2005, 200))
-        self.student['studycourse'].current_verdict = 'NEOR'
+        self.student['studycourse'].current_verdict = 'NER'
         self.assertEqual(utils.getReturningData(self.student),(2005, 100))
         return

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

@@ -35 +35 @@
     PORTRAIT_CHANGE_STATES = (ADMITTED,)
 
-    gpa_boundaries = ((1, 'FRNS / NEOR / NEOV'),
+    gpa_boundaries = ((1, 'FRNS / NER / NYV'),
                       (1.5, 'Pass'),
                       (2.4, '3rd Class Honours'),
@@ -90 +90 @@
             # credits taken below limit
             return 0
-        if level_obj.level_verdict in ('FRNS', 'NEOR', 'NEOV'):
+        if level_obj.level_verdict in ('FRNS', 'NER', 'NYV'):
             return 0
         # use gpa_boundaries above

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

@@ -180 +180 @@
         #'A7': 'Credit',
         #'A8': 'Merit',
-        'NEOR': 'No evidence of registration',
-        'NEOV': 'No evidence of verification',
+        'NER': 'No evidence of registration',
+        'NYV': 'Not yet verified',
         'FRNS': 'Faculty requirements not satisfied',
         }