Changeset 6305 for main/waeup.sirp/trunk

Timestamp:

9 Jun 2011, 16:59:04 (14 years ago)

Author:

Henrik Bettermann

Message:

Fill message attribute with workflow messages and display on forms.

Location:

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

Files:

• browser.py (modified) (6 diffs)
• browser_templates/form_display.pt (modified) (1 diff)
• browser_templates/form_edit.pt (modified) (1 diff)

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

@@ -25 +25 @@
 import grok
 
+from datetime import datetime
 from zope.component import getUtility
 from zope.formlib.widget import CustomWidgetFactory
@@ -77 +78 @@
     MultiListDisplayWidget, subwidget=results_display_widget)
 
+TRANSITION_OBJECTS = create_workflow()
+
+TRANSITION_DICT = dict([
+    (transition_object.transition_id,transition_object.title)
+    for transition_object in TRANSITION_OBJECTS])
+
 class ApplicantsRootPage(WAeUPPage):
     grok.context(IApplicantsRoot)
@@ -416 +423 @@
         if state == INITIALIZED:
             IWorkflowInfo(self.context[pin]).fireTransition('start')
+            timestamp = datetime.now().strftime("%d/%m/%Y %H:%M")
+            transition_title = TRANSITION_DICT['start']
+            self.context[pin].messages += '<br />%s - %s' % (timestamp,transition_title)
         self.redirect(self.url(self.context[pin], 'edit'))
         return
@@ -507 +517 @@
     def getTransitions(self):
         allowed_transitions_ids = IWorkflowInfo(self.context).getManualTransitionIds()
-        transition_objects = create_workflow()
         null_transition = [{'name': '', 'title':'No transition'}]
         transitions = null_transition + [dict(
             name=transition_object.transition_id,
             title=transition_object.title)
-            for transition_object in transition_objects
+            for transition_object in TRANSITION_OBJECTS
             if transition_object.transition_id in allowed_transitions_ids]
         #import pdb; pdb.set_trace()
@@ -528 +537 @@
         form = self.request.form
         if form.has_key('transition') and form['transition']:
-            transition = form['transition']
-            IWorkflowInfo(self.context).fireTransition(transition)
+            transition_id = form['transition']
+            IWorkflowInfo(self.context).fireTransition(transition_id)
+            #import pdb; pdb.set_trace()
+            timestamp = datetime.now().strftime("%d/%m/%Y %H:%M")
+            transition_title = TRANSITION_DICT[transition_id]
+            self.context.messages += '<br />%s - %s' % (timestamp,transition_title)
         self.flash('Form has been saved.')
         return
@@ -594 +607 @@
             return
         IWorkflowInfo(self.context).fireTransition('submit')
+        timestamp = datetime.now().strftime("%d/%m/%Y %H:%M")
+        transition_title = TRANSITION_DICT['submit']
+        self.context.messages += '<br />%s - %s' % (timestamp,transition_title)
         self.context.locked = True
         self.flash('Form has been submitted.')

main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/form_display.pt

@@ -5 +5 @@
 <h3>Application Status:
   <span tal:replace="view/getApplicationState">Application State</span></h3>
+  <div class="workflow" tal:content="structure context/messages">Application Workflow</div>
 
 <table class="zebra">

main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/form_edit.pt

@@ -8 +8 @@
   <h3>Application Status:
     <span tal:replace="view/getApplicationState">Application State</span></h3>
+    <div class="workflow" tal:content="structure context/messages">Application Workflow</div>
 
   <div class="form-status"