Changeset 6322 for main/waeup.sirp/trunk/src/waeup/sirp/applicants/workflow.py

Timestamp:

10 Jun 2011, 06:58:09 (13 years ago)

Author:

Henrik Bettermann

Message:

• Use user_data attribute to display more appropriate workflow messages.

• confirm_passport must not be an attribute of Applicant. Use confirm_passport only in form to allow submission.

• application_state must not be an attribute of Applicant.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/applicants/workflow.py (modified) (13 diffs)

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

@@ -25 +25 @@
         source = None,
         condition = NullCondition,
+        msg = 'appplication process initialized',
         destination = INITIALIZED)
 
@@ -30 +31 @@
         transition_id = 'start',
         title = 'Start application',
+        msg = 'appplication process started',
         source = INITIALIZED,
         destination = STARTED)
@@ -36 +38 @@
         transition_id = 'submit',
         title = 'Submit application',
+        msg = 'appplication record submitted',
         source = STARTED,
         destination = SUBMITTED)
@@ -42 +45 @@
         transition_id = 'admit',
         title = 'Admit applicant',
+        msg = 'appplicant admitted',
         source = SUBMITTED,
         destination = ADMITTED)
@@ -48 +52 @@
         transition_id = 'refuse1',
         title = 'Refuse application',
+        msg = 'appplication refused',
         source = SUBMITTED,
         destination = NOT_ADMITTED)
@@ -54 +59 @@
         transition_id = 'refuse2',
         title = 'Refuse application',
+        msg = 'appplication refused',
         source = ADMITTED,
         destination = NOT_ADMITTED)
@@ -60 +66 @@
         transition_id = 'create',
         title = 'Create student record',
+        msg = 'student record created',
         source = ADMITTED,
         destination = CREATED)
@@ -66 +73 @@
         transition_id = 'reset1',
         title = 'Reset application',
+        msg = 'appplication record reset',
         source = SUBMITTED,
         destination = STARTED)
@@ -72 +80 @@
         transition_id = 'reset2',
         title = 'Reset application',
+        msg = 'appplication record reset',
         source = ADMITTED,
         destination = STARTED)
@@ -78 +87 @@
         transition_id = 'reset3',
         title = 'Reset application',
+        msg = 'appplication record reset',
         source = NOT_ADMITTED,
         destination = STARTED)
@@ -84 +94 @@
         transition_id = 'reset4',
         title = 'Reset application',
+        msg = 'appplication record reset',
         source = CREATED,
         destination = STARTED)
@@ -161 +172 @@
     """
     timestamp = datetime.now().strftime("%d/%m/%Y %H:%M:%S")
-    comment = event.comment or '(no comment)'
     # XXX: `messages` is meta data which shouldn't really be part of
     #      the Applicant class. Furthermore we should not store HTML
@@ -169 +179 @@
     #      to finetune transitions instead of doing that manually in
     #      UI stuff.
-    msg = '%s - %s to %s: %s: %s' % (
-        timestamp, event.source, event.destination, event.transition.title,
-        comment)
+    msg = '%s - %s (new state: %s)' % (
+        timestamp, event.transition.user_data['msg'], event.destination)
     msgs = getattr(obj, 'messages', None)
-    if msgs != '':
+    if msgs:
         msgs += '<br />'
-    obj.messages += msg
+        msgs += msg
+    else:
+        msgs = msg
+    obj.messages = msgs
     return