Changeset 9209 for main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/students/workflow.py

Timestamp:

20 Sep 2012, 08:49:37 (12 years ago)

Author:

uli

Message:

Merge changes from update branch (includes trunk changes until r9107).

Location:

main/waeup.kofa/branches/uli-zc-async

Files:

• . (modified) (1 prop)
• src/waeup/kofa/students/workflow.py (modified) (18 diffs)

main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/students/workflow.py

@@ -2 +2 @@
 """
 import grok
+from datetime import datetime
 from zope.component import getUtility
 from hurry.workflow.workflow import Transition, WorkflowState, NullCondition
@@ -12 +13 @@
 from waeup.kofa.workflow import KofaWorkflow, KofaWorkflowInfo
 from waeup.kofa.students.interfaces import IStudent, IStudentsUtils
+from waeup.kofa.utils.helpers import get_current_principal
 
 
 IMPORTABLE_STATES = (ADMITTED, CLEARANCE, REQUESTED, CLEARED, PAID, RETURNING,
     REGISTERED, VALIDATED)
+
+FORBIDDEN_POSTGRAD_STATES = (RETURNING, REGISTERED, VALIDATED)
 
 REGISTRATION_TRANSITIONS = (
@@ -23 +27 @@
         source = None,
         condition = NullCondition,
-        msg = _('Student record created'),
+        msg = _('Record created'),
         destination = CREATED),
 
@@ -29 +33 @@
         transition_id = 'admit',
         title = _('Admit student'),
-        msg = _('Student admitted'),
+        msg = _('Admitted'),
         source = CREATED,
         destination = ADMITTED),
@@ -63 +67 @@
     Transition(
         transition_id = 'reset3',
-        title = _('Reset to clearance'),
-        msg = _("Reset to 'clearance'"),
+        title = _('Reset to clearance started'),
+        msg = _("Reset to 'clearance started'"),
         source = REQUESTED,
         destination = CLEARANCE),
@@ -77 +81 @@
     Transition(
         transition_id = 'reset4',
-        title = _('Reset to clearance'),
-        msg = _("Reset to 'clearance'"),
+        title = _('Reset to clearance started'),
+        msg = _("Reset to 'clearance started'"),
         source = CLEARED,
         destination = CLEARANCE),
@@ -85 +89 @@
         transition_id = 'pay_first_school_fee',
         title = _('Pay school fee'),
-        msg = _('School fee paid'),
+        msg = _('First school fee payment made'),
         source = CLEARED,
         destination = PAID),
@@ -92 +96 @@
         transition_id = 'approve_first_school_fee',
         title = _('Approve payment'),
-        msg = _('School fee payment approved'),
+        msg = _('First school fee payment approved'),
         source = CLEARED,
         destination = PAID),
@@ -106 +110 @@
         transition_id = 'pay_school_fee',
         title = _('Pay school fee'),
-        msg = _('Payment made'),
+        msg = _('School fee payment made'),
         source = RETURNING,
         destination = PAID),
@@ -112 +116 @@
     Transition(
         transition_id = 'pay_pg_fee',
-        title = _('Pay postgraduate school fee'),
-        msg = _('Payment made'),
+        title = _('Pay PG school fee'),
+        msg = _('PG school fee payment made'),
         source = PAID,
         destination = PAID),
@@ -119 +123 @@
     Transition(
         transition_id = 'approve_school_fee',
-        title = _('Approve payment'),
+        title = _('Approve school fee payment'),
         msg = _('School fee payment approved'),
         source = RETURNING,
@@ -126 +130 @@
     Transition(
         transition_id = 'approve_pg_fee',
-        title = _('Approve postgraduate payment'),
-        msg = _('School fee payment approved'),
+        title = _('Approve PG school fee payment'),
+        msg = _('PG school fee payment approved'),
         source = PAID,
         destination = PAID),
@@ -147 +151 @@
     Transition(
         transition_id = 'reset7',
-        title = _('Reset to paid'),
-        msg = _("Reset to 'paid'"),
+        title = _('Reset to school fee paid'),
+        msg = _("Reset to 'school fee paid'"),
         source = REGISTERED,
         destination = PAID),
@@ -161 +165 @@
     Transition(
         transition_id = 'reset8',
-        title = _('Reset to paid'),
-        msg = _("Reset to 'paid'"),
+        title = _('Reset to school fee paid'),
+        msg = _("Reset to 'school fee paid'"),
         source = VALIDATED,
         destination = PAID),
@@ -175 +179 @@
     Transition(
         transition_id = 'reset9',
-        title = _('Reset to validated'),
-        msg = _("Reset to 'validated'"),
+        title = _('Reset to courses validated'),
+        msg = _("Reset to 'courses validated'"),
         source = RETURNING,
         destination = VALIDATED),
@@ -183 +187 @@
 IMPORTABLE_TRANSITIONS = [i.transition_id for i in REGISTRATION_TRANSITIONS]
 
+FORBIDDEN_POSTGRAD_TRANS = ['reset6', 'register_courses']
 LOCK_CLEARANCE_TRANS = ('reset2', 'request_clearance')
 UNLOCK_CLEARANCE_TRANS = ('reset3', 'reset4', 'start_clearance')
@@ -212 +217 @@
 
     Lock and unlock clearance form.
-    Triger actions after school fee payment.
+    Trigger actions after school fee payment.
     """
 
@@ -231 +236 @@
         new_session = obj['studycourse'].current_session + 1
         obj['studycourse'].current_session = new_session
+    elif event.transition.transition_id == 'validate_courses':
+        current_level = obj['studycourse'].current_level
+        level_object = obj['studycourse'].get(str(current_level), None)
+        if level_object is not None:
+            user = get_current_principal()
+            if user is None:
+                usertitle = 'system'
+            else:
+                usertitle = getattr(user, 'public_name', None)
+                if not usertitle:
+                    usertitle = user.title
+            level_object.validated_by = usertitle
+            level_object.validation_date = datetime.utcnow()
+    elif event.transition.transition_id == 'reset8':
+        current_level = obj['studycourse'].current_level
+        level_object = obj['studycourse'].get(str(current_level), None)
+        if level_object is not None:
+            level_object.validated_by = None
+            level_object.validation_date = None
     # In some tests we don't have a students container
     try: