Changeset 6471 for main/waeup.sirp/trunk/src/waeup/sirp/applicants

Timestamp:

23 Jun 2011, 15:29:31 (14 years ago)

Author:

Henrik Bettermann

Message:

Produce more user friendly and shorter object history messages.

Location:

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

Files:

• browser.py (modified) (1 diff)
• workflow.py (modified) (12 diffs)

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

@@ -429 +429 @@
             pass
         else:
-            comment = u"Invalidated by applicant"
+            comment = u"AC invalidated"
             # Here we know that the ac is in state initialized so we do not
             # expect an exception
-            invalidate_accesscode(pin, comment)
+            invalidate_accesscode(pin,comment)
 
         if not pin in self.context.keys():

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

@@ -22 +22 @@
         source = None,
         condition = NullCondition,
-        msg = 'application process initialized',
+        msg = 'Application initialized',
         destination = INITIALIZED),
 
@@ -28 +28 @@
         transition_id = 'start',
         title = 'Start application',
-        msg = 'application process started',
+        msg = 'Application started',
         source = INITIALIZED,
         destination = STARTED),
@@ -35 +35 @@
         transition_id = 'submit',
         title = 'Submit application',
-        msg = 'application record submitted',
+        msg = 'Application submitted',
         source = STARTED,
         destination = SUBMITTED),
@@ -42 +42 @@
         transition_id = 'admit',
         title = 'Admit applicant',
-        msg = 'applicant admitted',
+        msg = 'Applicant admitted',
         source = SUBMITTED,
         destination = ADMITTED),
@@ -49 +49 @@
         transition_id = 'refuse1',
         title = 'Refuse application',
-        msg = 'application refused',
+        msg = 'Application refused',
         source = SUBMITTED,
         destination = NOT_ADMITTED),
@@ -56 +56 @@
         transition_id = 'refuse2',
         title = 'Refuse application',
-        msg = 'application refused',
+        msg = 'Application refused',
         source = ADMITTED,
         destination = NOT_ADMITTED),
@@ -63 +63 @@
         transition_id = 'create',
         title = 'Create student record',
-        msg = 'student record created',
+        msg = 'Student record created',
         source = ADMITTED,
         destination = CREATED),
@@ -70 +70 @@
         transition_id = 'reset1',
         title = 'Reset application',
-        msg = 'application record reset',
+        msg = 'Application reset',
         source = SUBMITTED,
         destination = STARTED),
@@ -77 +77 @@
         transition_id = 'reset2',
         title = 'Reset application',
-        msg = 'application record reset',
+        msg = 'Application reset',
         source = ADMITTED,
         destination = STARTED),
@@ -84 +84 @@
         transition_id = 'reset3',
         title = 'Reset application',
-        msg = 'application record reset',
+        msg = 'Application reset',
         source = NOT_ADMITTED,
         destination = STARTED),
@@ -91 +91 @@
         transition_id = 'reset4',
         title = 'Reset application',
-        msg = 'application record reset',
+        msg = 'Application reset',
         source = CREATED,
         destination = STARTED),
@@ -119 +119 @@
 @grok.subscribe(IApplicantBaseData, IWorkflowTransitionEvent)
 def handle_applicant_transition_event(obj, event):
-    """Append message to applicant when transition happened.
+    """Append message to applicant history when transition happened.
     """
-    timestamp = datetime.now().strftime("%d/%m/%Y %H:%M:%S")
-    msg = '%s - %s (new state: %s)' % (
-        timestamp, event.transition.user_data['msg'], event.destination)
+    msg = '%s' % event.transition.user_data['msg']
     history = IObjectHistory(obj)
     history.addMessage(msg)