Changeset 12034

Timestamp:

22 Nov 2014, 07:23:05 (10 years ago)

Author:

Henrik Bettermann

Message:

Add 'final submit' action.

Location:

main/waeup.ikoba/trunk/src/waeup/ikoba/customers

Files:

• browser.py (modified) (2 diffs)
• browser_templates/documentpage.pt (modified) (1 diff)
• tests/test_browser.py (modified) (1 diff)

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/browser.py

@@ -52 +52 @@
 
 grok.context(IIkobaObject)
+
+WARNING = _('You can not edit your document after final submission.'
+            ' You really want to submit?')
 
 
@@ -806 +809 @@
         return super(DocumentEditFormPage, self).update()
 
+    @action(_('Save'), style='primary')
+    def save(self, **data):
+        msave(self, **data)
+        return
+
+    @action(_('Final Submit'), warning=WARNING)
+    def finalsubmit(self, **data):
+        msave(self, **data)
+        IWorkflowInfo(self.context).fireTransition('submit')
+        self.flash(_('Form has been submitted.'))
+        self.redirect(self.url(self.context))
+        return
+
 
 class DocumentTriggerTransitionFormPage(IkobaEditFormPage):

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/browser_templates/documentpage.pt

@@ -1 +1 @@
 <div class="wfstatus-sub"  i18n:domain="waeup.kofa">
-  Document State:
-  <span tal:replace="context/translated_state">
-    VERIFICATIONSTATE
-  </span>
+  Document State: <span tal:replace="context/translated_state">
+    VERIFICATIONSTATE</span>
 </div>
 

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/test_browser.py

@@ -860 +860 @@
         self.browser.getControl(name="form.title").value = 'My second doc'
         self.browser.getControl("Save").click()
+        self.assertEqual(document.title, 'My second doc')
         self.assertTrue('Form has been saved.' in self.browser.contents)
         self.browser.getLink("View").click()
         self.assertEqual(self.browser.url, self.documents_path + '/d102/index')
-        # Customer can't edit the document once it has been verified
-        IWorkflowState(document).setState(VERIFIED)
+        # Costumer can submit the form. The form is also saved.
+        self.browser.getLink("Edit").click()
+        self.browser.getControl(name="form.title").value = 'My third doc'
+        self.browser.getControl("Final Submit").click()
+        self.assertEqual(document.title, 'My third doc')
+        self.assertEqual(document.state, 'submitted')
+        self.assertTrue('Document State: submitted for verification' in self.browser.contents)
+        # Customer can't edit the document once it has been submitted
         self.browser.open(self.documents_path + '/d102/edit')
         self.assertTrue('The requested form is locked' in self.browser.contents)