Changeset 6324 for main/waeup.sirp/trunk/src/waeup/sirp

Timestamp:

10 Jun 2011, 08:26:06 (14 years ago)

Author:

Henrik Bettermann

Message:

Provide application state as a (property) method of Applicant. This allows displaying the state of Applicant objects on ApplicantsContainer? form pages.

Location:

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

Files:

• applicants.py (modified) (1 diff)
• browser.py (modified) (2 diffs)
• browser_templates/applicantscontainermanagepage.pt (modified) (1 diff)
• browser_templates/form_display.pt (modified) (1 diff)
• browser_templates/form_edit.pt (modified) (1 diff)
• interfaces.py (modified) (1 diff)

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

@@ -50 +50 @@
         #Initialize workflow state...
         IWorkflowInfo(self).fireTransition('init')
+
+    @property
+    def getApplicationState(self):
+        state = IWorkflowState(self).getState()
+        return state
 
 # Set all attributes of Applicant required in IApplicant as field

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

@@ -470 +470 @@
         return 'not yet admitted'
 
-    @property
-    def getApplicationState(self):
-        state = IWorkflowState(self.context).getState()
-        return state
+    #@property
+    #def getApplicationState(self):
+    #    state = IWorkflowState(self.context).getState()
+    #    return state
 
 class ApplicantsManageActionButton(ManageActionButton):
@@ -522 +522 @@
         return transitions
 
-    @property
-    def getApplicationState(self):
-        state = IWorkflowState(self.context).getState()
-        return state
+    #@property
+    #def getApplicationState(self):
+    #    state = IWorkflowState(self.context).getState()
+    #    return state
 
     @grok.action('Save')

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

@@ -82 +82 @@
         </thead>
         <tbody>
-          <tr tal:repeat="appl context/values"> <td>
-              <input type="checkbox" name="val_id" tal:attributes="value appl/__name__" /> </td> <td>
+          <tr tal:repeat="appl context/values">
+            <td>
+              <input type="checkbox" name="val_id" tal:attributes="value appl/__name__" />
+            </td>
+            <td>
               <a tal:attributes="href python: view.url(appl)"
-                 tal:content="appl/__name__"> ID </a> </td> <td>
-              <span tal:condition="not: appl/locked">in progress
-              </span>
-              <span tal:condition="appl/locked">submitted
-              </span> </td>
+                 tal:content="appl/__name__"> ID </a>
+            </td>
+            <td>
+              <span tal:replace="appl/getApplicationState">state</span>
+            </td>
           </tr>
         </tbody>

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

@@ -3 +3 @@
     tal:content="view/label">Label</h2>
 
-<h2> ... <span tal:replace="view/getApplicationState">Application State</span> ... </h2>
+<h2> ... <span tal:replace="context/getApplicationState">Application State</span> ... </h2>
 
 <div class="workflow" tal:content="structure context/msgs">Application Workflow</div>

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

@@ -6 +6 @@
     tal:content="view/label">Label</h2>
 
-  <h2> ... <span tal:replace="view/getApplicationState">Application State</span> ... </h2>
+  <h2> ... <span tal:replace="context/getApplicationState">Application State</span> ... </h2>
 
   <div class="workflow" tal:content="structure context/msgs">Application Workflow</div>

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

@@ -389 +389 @@
         )
 
+    def getApplicationState():
+        """
+        Returns the application state of an applicant.
+        """
+
 class IApplicant(IApplicantBaseData):
     """An applicant.