Changeset 14089 for main/waeup.aaue/trunk/src/waeup/aaue

Timestamp:

18 Aug 2016, 07:42:10 (8 years ago)

Author:

Henrik Bettermann

Message:

No probation levels in AAUE.

Location:

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

Files:

• tests/test_utils.py (modified) (1 diff)
• utils.py (modified) (1 diff)

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

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

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

@@ -116 +116 @@
         prev_level = student['studycourse'].current_level
         cur_verdict = student['studycourse'].current_verdict
-        if cur_verdict in ('A','B','L','M','N','Z',):
+        if cur_verdict in ('A','B','C', 'L','M','N','Z',):
             # Successful student
             new_level = divmod(int(prev_level),100)[0]*100 + 100
-        elif cur_verdict == 'C':
-            # Student on probation
-            new_level = int(prev_level) + 10
+        #elif cur_verdict == 'C':
+        #    # Student on probation
+        #    new_level = int(prev_level) + 10
         else:
             # Student is somehow in an undefined state.