Changeset 10656

Timestamp:

27 Sep 2013, 09:52:51 (11 years ago)

Author:

Henrik Bettermann

Message:

Customize verdicts.

Location:

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

Files:

• tests/test_browser.py (modified) (2 diffs)
• utils.py (modified) (1 diff)

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

@@ -96 +96 @@
         self.assertEqual(self.student['studycourse']['100'].gpa_params[2], 82.0)
         # sgpa = 82 / 23
-        self.assertEqual(self.student['studycourse']['100'].gpa_params[0], 3.57)
+        self.assertEqual(self.student['studycourse']['100'].gpa_params[0], 3.565)
         return
 
@@ -264 +264 @@
         self.student['studycourse'].current_verdict = 'C'
         self.assertEqual(utils.getReturningData(self.student),(2005, 110))
-        self.student['studycourse'].current_verdict = 'D'
+        self.student['studycourse'].current_verdict = 'NEOR'
         self.assertEqual(utils.getReturningData(self.student),(2005, 100))
         return

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

@@ -28 +28 @@
 
     """
+
+    VERDICTS_DICT = {
+        '0': 'not yet',
+        'A': 'Successful student',
+        'B': 'Student with carryover courses',
+        'C': 'Student on probation',
+        #'D': 'Withdrawn from the faculty',
+        #'E': 'Student who were previously on probation',
+        #'F': 'Medical case',
+        #'G': 'Absent from examination',
+        #'H': 'Withheld results',
+        #'I': 'Expelled/rusticated/suspended student',
+        #'J': 'Temporary withdrawn from the university',
+        #'K': 'Unregistered student',
+        #'L': 'Referred student',
+        #'M': 'Reinstatement',
+        #'N': 'Student on transfer',
+        #'O': 'NCE-III repeater',
+        #'Y': 'No previous verdict',
+        #'X': 'New 300 level student',
+        'Z': 'Successful student (provisional)',
+        #'A1': 'First Class',
+        #'A2': 'Second Class Upper',
+        #'A3': 'Second Class Lower',
+        #'A4': 'Third Class',
+        #'A5': 'Pass',
+        #'A6': 'Distinction',
+        #'A7': 'Credit',
+        #'A8': 'Merit',
+        'NEOR': 'No evidence of registration',
+        'NEOV': 'No evidence of verification',
+        'FRNS': 'Faculty requirements not satisfied',
+        }
 
     gpa_boundaries = ((1, 'FRNS'),