Changeset 9923 for main/waeup.fceokene/trunk

Timestamp:

29 Jan 2013, 11:22:29 (12 years ago)

Author:

Henrik Bettermann

Message:

Do not increase session for NCE III repeaters.

Location:

main/waeup.fceokene/trunk/src/waeup/fceokene/students

Files:

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

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

@@ -209 +209 @@
         self.student['studycourse'].current_verdict = 'D'
         self.assertEqual(utils.getReturningData(self.student),(2005, 100))
+        self.student['studycourse'].current_verdict = 'O'
+        self.assertEqual(utils.getReturningData(self.student),(2004, 110))
         return
 

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

@@ -46 +46 @@
             # Successful student
             new_level = divmod(int(prev_level),100)[0]*100 + 100
-        elif cur_verdict == 'C':
+        elif cur_verdict in ('C','O'):
             # Student on probation
             new_level = int(prev_level) + 10
@@ -53 +53 @@
             # Level has to be set manually.
             new_level = prev_level
-        new_session = student['studycourse'].current_session + 1
+        if cur_verdict == 'O':
+            new_session = student['studycourse'].current_session
+        else:
+            new_session = student['studycourse'].current_session + 1
         return new_session, new_level