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

Timestamp:

21 Sep 2012, 08:19:35 (12 years ago)

Author:

uli

Message:

Rollback r9209. Looks like multiple merges from trunk confuse svn when merging back into trunk.

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
@@ -13 +12 @@
 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 = (
@@ -27 +23 @@
         source = None,
         condition = NullCondition,
-        msg = _('Record created'),
+        msg = _('Student record created'),
         destination = CREATED),
 
@@ -33 +29 @@
         transition_id = 'admit',
         title = _('Admit student'),
-        msg = _('Admitted'),
+        msg = _('Student admitted'),
         source = CREATED,
         destination = ADMITTED),
@@ -67 +63 @@
     Transition(
         transition_id = 'reset3',
-        title = _('Reset to clearance started'),
-        msg = _("Reset to 'clearance started'"),
+        title = _('Reset to clearance'),
+        msg = _("Reset to 'clearance'"),
         source = REQUESTED,
         destination = CLEARANCE),
@@ -81 +77 @@
     Transition(
         transition_id = 'reset4',
-        title = _('Reset to clearance started'),
-        msg = _("Reset to 'clearance started'"),
+        title = _('Reset to clearance'),
+        msg = _("Reset to 'clearance'"),
         source = CLEARED,
         destination = CLEARANCE),
@@ -89 +85 @@
         transition_id = 'pay_first_school_fee',
         title = _('Pay school fee'),
-        msg = _('First school fee payment made'),
+        msg = _('School fee paid'),
         source = CLEARED,
         destination = PAID),
@@ -96 +92 @@
         transition_id = 'approve_first_school_fee',
         title = _('Approve payment'),
-        msg = _('First school fee payment approved'),
+        msg = _('School fee payment approved'),
         source = CLEARED,
         destination = PAID),
@@ -110 +106 @@
         transition_id = 'pay_school_fee',
         title = _('Pay school fee'),
-        msg = _('School fee payment made'),
+        msg = _('Payment made'),
         source = RETURNING,
         destination = PAID),
@@ -116 +112 @@
     Transition(
         transition_id = 'pay_pg_fee',
-        title = _('Pay PG school fee'),
-        msg = _('PG school fee payment made'),
+        title = _('Pay postgraduate school fee'),
+        msg = _('Payment made'),
         source = PAID,
         destination = PAID),
@@ -123 +119 @@
     Transition(
         transition_id = 'approve_school_fee',
-        title = _('Approve school fee payment'),
+        title = _('Approve payment'),
         msg = _('School fee payment approved'),
         source = RETURNING,
@@ -130 +126 @@
     Transition(
         transition_id = 'approve_pg_fee',
-        title = _('Approve PG school fee payment'),
-        msg = _('PG school fee payment approved'),
+        title = _('Approve postgraduate payment'),
+        msg = _('School fee payment approved'),
         source = PAID,
         destination = PAID),
@@ -151 +147 @@
     Transition(
         transition_id = 'reset7',
-        title = _('Reset to school fee paid'),
-        msg = _("Reset to 'school fee paid'"),
+        title = _('Reset to paid'),
+        msg = _("Reset to 'paid'"),
         source = REGISTERED,
         destination = PAID),
@@ -165 +161 @@
     Transition(
         transition_id = 'reset8',
-        title = _('Reset to school fee paid'),
-        msg = _("Reset to 'school fee paid'"),
+        title = _('Reset to paid'),
+        msg = _("Reset to 'paid'"),
         source = VALIDATED,
         destination = PAID),
@@ -179 +175 @@
     Transition(
         transition_id = 'reset9',
-        title = _('Reset to courses validated'),
-        msg = _("Reset to 'courses validated'"),
+        title = _('Reset to validated'),
+        msg = _("Reset to 'validated'"),
         source = RETURNING,
         destination = VALIDATED),
@@ -187 +183 @@
 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')
@@ -217 +212 @@
 
     Lock and unlock clearance form.
-    Trigger actions after school fee payment.
+    Triger actions after school fee payment.
     """
 
@@ -236 +231 @@
         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: