Changeset 6471 for main/waeup.sirp/trunk

Timestamp:

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

Author:

Henrik Bettermann

Message:

Produce more user friendly and shorter object history messages.

Location:

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

Files:

• accesscodes/browser.py (modified) (2 diffs)
• accesscodes/tests/test_accesscodes.py (modified) (2 diffs)
• accesscodes/workflow.py (modified) (1 diff)
• applicants/browser.py (modified) (1 diff)
• applicants/workflow.py (modified) (12 diffs)
• objecthistory.py (modified) (1 diff)
• tests/test_objecthistory.py (modified) (2 diffs)

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

@@ -139 +139 @@
             if 'disable' in form:
                 try:
-                    comment = u"Disabled by %s" % self.request.principal.id
+                    comment = u"AC disabled"
                     self.context.disable(entry, comment)
                     self.flash('%s disabled.' % entry)
@@ -146 +146 @@
             elif 'enable' in form:
                 try:
-                    comment = u"Re-enabled by %s" % self.request.principal.id
+                    comment = u"AC re-enabled"
                     self.context.enable(entry, comment)
                     self.flash('%s (re-)enabled.' % entry)

main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/tests/test_accesscodes.py

@@ -192 +192 @@
         history = IObjectHistory(self.ac1)
         msgs = history.messages
-        assert msgs[-1].endswith('Used by system')
+        assert msgs[-1].endswith('AC used by system')
 
 class AccessCodeTests(FunctionalTestCase):
@@ -236 +236 @@
         # Access codes have a history.
         match = re.match(
-            '^../../.... ..:..:.. - Initialized by system',
+            '^....-..-.. ..:..:.. - AC initialized by system',
             self.ac1.history)
         assert match is not None

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

@@ -120 +120 @@
 def handle_accesscode_transition_event(obj, event):
     # append message to history
-    timestamp = datetime.now().strftime("%d/%m/%Y %H:%M:%S")
-    msg = '%s -' % timestamp
     if event.comment is not None:
-        msg = '%s %s' % (msg, event.comment)
+        msg = '%s' % event.comment
     else:
-        msg = '%s %s by system' % (msg,event.destination.title())
+        msg = 'AC %s' % event.destination
 
     history = IObjectHistory(obj)

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)

main/waeup.sirp/trunk/src/waeup/sirp/objecthistory.py

@@ -64 +64 @@
         if user is None:
             user = 'system'
+        elif user.title == 'Applicant':
+            user = 'applicant'
         else:
-            user = '%s (%s)' % (user.id, user.title)
-        msg = '%s - %s - %s' % (timestamp, user, msg)
+            user = user.id
+        msg = '%s - %s by %s' % (timestamp, msg, user)
         msgs.append(msg)
         self._annotations[self.history_key] = msgs

main/waeup.sirp/trunk/src/waeup/sirp/tests/test_objecthistory.py

@@ -63 +63 @@
         hist.addMessage('blah')
         result = ''.join(hist.messages)
-        self.assertMatches('<YYYY-MM-DD hh:mm:ss> - system - blah', result)
+        self.assertMatches('<YYYY-MM-DD hh:mm:ss> - blah by system', result)
 
     def test_add_messages_existing_principal(self):
@@ -72 +72 @@
         hist.addMessage('blah')
         result = ''.join(hist.messages)
-        self.assertMatches('<YYYY-MM-DD hh:mm:ss> - bob (Bob) - blah', result)
+        self.assertMatches('<YYYY-MM-DD hh:mm:ss> - blah by bob', result)
 
     def test_messages(self):