Changeset 6801

Timestamp:

20 Sep 2011, 06:07:14 (13 years ago)

Author:

Henrik Bettermann

Message:

Complete student workflow.

Location:

main/waeup.sirp/trunk/src/waeup/sirp/students

Files:

• tests/test_browser.py (modified) (2 diffs)
• workflow.py (modified) (2 diffs)

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

@@ -364 +364 @@
         self.browser.getControl(name="transition").value = ['reset6']
         self.browser.getControl("Save").click()
-        # The pay_school_fee transition triggers some changes of previously
-        # set attributes
+        # In state returning the pay_school_fee transition triggers some 
+        # changes of attributes
         student['studycourse'].certificate = self.certificate
         student['studycourse'].current_session = 2004
@@ -372 +372 @@
         self.browser.getControl(name="transition").value = ['pay_school_fee']
         self.browser.getControl("Save").click()
-        self.assertEqual(student['studycourse'].current_session, 2005)
-        self.assertEqual(student['studycourse'].current_level, 200)
-        self.assertEqual(student['studycourse'].current_verdict, '')
+        self.assertEqual(student['studycourse'].current_session, 2005) # +1
+        self.assertEqual(student['studycourse'].current_level, 200) # +100
+        self.assertEqual(student['studycourse'].current_verdict, '') # empty
         self.assertEqual(student['studycourse'].previous_verdict, 'A')
+        self.browser.getControl(name="transition").value = ['register_courses']
+        self.browser.getControl("Save").click()
+        self.browser.getControl(name="transition").value = ['validate_courses']
+        self.browser.getControl("Save").click()
+        self.browser.getControl(name="transition").value = ['return']
+        self.browser.getControl("Save").click()
         return
 

main/waeup.sirp/trunk/src/waeup/sirp/students/workflow.py

@@ -18 +18 @@
 PAID = 'school fee paid'
 RETURNING = 'returning'
+REGISTERED = 'courses registered'
+VALIDATED = 'courses validated'
 
 REGISTRATION_TRANSITIONS = (
@@ -111 +113 @@
         source = PAID,
         destination = RETURNING),
+
+    Transition(
+        transition_id = 'register_courses',
+        title = 'Register courses',
+        msg = 'Courses registered',
+        source = PAID,
+        destination = REGISTERED),
+
+    Transition(
+        transition_id = 'reset7',
+        title = 'Reset to paid',
+        msg = 'Student record reset to paid',
+        source = REGISTERED,
+        destination = PAID),
+
+    Transition(
+        transition_id = 'validate_courses',
+        title = 'Validate courses',
+        msg = 'Courses validated',
+        source = REGISTERED,
+        destination = VALIDATED),
+
+    Transition(
+        transition_id = 'reset8',
+        title = 'Reset to paid',
+        msg = 'Student record reset to paid',
+        source = VALIDATED,
+        destination = PAID),
+
+    Transition(
+        transition_id = 'return',
+        title = 'Return',
+        msg = 'Returned',
+        source = VALIDATED,
+        destination = RETURNING),
+
+    Transition(
+        transition_id = 'reset9',
+        title = 'Reset to validated',
+        msg = 'Student record reset to validated',
+        source = RETURNING,
+        destination = VALIDATED),
     )