Changeset 6742 for main/waeup.sirp/trunk

Timestamp:

13 Sep 2011, 09:25:33 (13 years ago)

Author:

Henrik Bettermann

Message:

Add school fee payment transitions.

Implement set_returning_data function which is triggered when payment transition is fired (returning students only).

Save integer values in session fields. This eases the numerical processing of session values.

Location:

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

Files:

• utils.py (modified) (1 diff)
• vocabularies.py (modified) (2 diffs)
• workflow.py (modified) (4 diffs)

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

@@ -13 +13 @@
         sid = u"%c%d" % (letter,r().randint(99999,1000000))
     return sid
+
+def set_returning_data(student):
+    student['studycourse'].current_level += 100
+    student['studycourse'].current_session += 1
+    verdict = student['studycourse'].current_verdict
+    student['studycourse'].current_verdict = ''
+    student['studycourse'].previous_verdict = verdict
+    return

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

@@ -17 +17 @@
     curr_year = datetime.now().year
     year_range = range(curr_year - 10, curr_year + 2)
-    return [('%s/%s' % (year,year+1), '%s' % year) for year in year_range]
+    return [('%s/%s' % (year,year+1), year) for year in year_range]
 
 entry_session_vocab = SimpleWAeUPVocabulary(*entry_sessions())
@@ -64 +64 @@
 
 verdicts = SimpleWAeUPVocabulary(
+    ('Not set',''),
     ('Successful student','A'),
     ('Student with carryover courses','B'),

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

@@ -5 +5 @@
 from hurry.workflow.workflow import Transition, WorkflowState, NullCondition
 from hurry.workflow.interfaces import IWorkflowState, IWorkflowTransitionEvent
-from waeup.sirp.students.interfaces import IStudent
 from waeup.sirp.interfaces import IObjectHistory, IWAeUPWorkflowInfo
 from waeup.sirp.workflow import WAeUPWorkflow, WAeUPWorkflowInfo
 from waeup.sirp.utils.helpers import get_current_principal
+from waeup.sirp.students.interfaces import IStudent
+from waeup.sirp.students.utils import set_returning_data
 
 CREATED = 'created'
@@ -15 +16 @@
 REQUESTED = 'clearance requested'
 CLEARED = 'cleared'
+PAID = 'school fee paid'
+RETURNING = 'returning'
 
 REGISTRATION_TRANSITIONS = (
@@ -80 +83 @@
         source = CLEARED,
         destination = CLEARANCE),
+
+    Transition(
+        transition_id = 'pay_first_school_fee',
+        title = 'Pay school fee',
+        msg = 'School fee paid',
+        source = CLEARED,
+        destination = PAID),
+
+    Transition(
+        transition_id = 'reset5',
+        title = 'Reset to cleared',
+        msg = 'Student record reset to cleared',
+        source = PAID,
+        destination = CLEARED),
+
+    Transition(
+        transition_id = 'pay_school_fee',
+        title = 'Pay school fee',
+        msg = 'School fee paid',
+        source = RETURNING,
+        destination = PAID),
+
+    Transition(
+        transition_id = 'reset6',
+        title = 'Reset to returning',
+        msg = 'Student record reset to returning',
+        source = PAID,
+        destination = RETURNING),
     )
 
@@ -117 +148 @@
     if event.transition.transition_id in UNLOCK_CLEARANCE_TRANS:
         obj.clearance_locked = False
+    # Student data don't change after first-time payment
+    if event.transition.transition_id == 'pay_first_school_fee':
+        pass
+    # School fee payment of returning students triggers the change of
+    # current session, current level, and current verdict
+    if event.transition.transition_id == 'pay_school_fee':
+        set_returning_data(obj)
     # In some tests we don't have a students container or a user
     try: