Changeset 7615 for main

Timestamp:

9 Feb 2012, 06:22:43 (13 years ago)

Author:

Henrik Bettermann

Message:

Convert function set_returning_data into utility method. This method is for demonstration purposes only. It has to be customized.

Location:

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

Files:

• utils.py (modified) (2 diffs)
• workflow.py (modified) (2 diffs)

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

@@ -82 +82 @@
     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 = '0'
-    student['studycourse'].previous_verdict = verdict
-    return
-
 def set_up_widgets(view, ignore_request=False):
     view.adapters = {}
@@ -172 +164 @@
     grok.implements(IStudentsUtils)
 
-    def getPaymentDetails(self,category, student):
+    def setReturningData(self, student):
+        student['studycourse'].current_level += 100
+        student['studycourse'].current_session += 1
+        verdict = student['studycourse'].current_verdict
+        student['studycourse'].current_verdict = '0'
+        student['studycourse'].previous_verdict = verdict
+        return
+
+    def getPaymentDetails(self, category, student):
         d = {}
         d['p_item'] = u''

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

@@ -2 +2 @@
 """
 import grok
+from zope.component import getUtility
 from hurry.workflow.workflow import Transition, WorkflowState, NullCondition
 from hurry.workflow.interfaces import IWorkflowState, IWorkflowTransitionEvent
 from waeup.sirp.interfaces import (
-    IObjectHistory, ISIRPWorkflowInfo,
+    IObjectHistory, ISIRPWorkflowInfo, 
     CREATED, ADMITTED, CLEARANCE, REQUESTED, CLEARED, PAID, RETURNING,
     REGISTERED, VALIDATED)
 from waeup.sirp.workflow import SIRPWorkflow, SIRPWorkflowInfo
 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
+from waeup.sirp.students.interfaces import IStudent, IStudentsUtils
+
 
 IMPORTABLE_STATES = (ADMITTED, CLEARANCE, REQUESTED, CLEARED, PAID, RETURNING,
@@ -195 +196 @@
     # current session, current level, and current verdict
     if event.transition.transition_id == 'pay_school_fee':
-        set_returning_data(obj)
+        getUtility(IStudentsUtils).setReturningData(obj)
     # In some tests we don't have a students container or a user
     try: