Changeset 12351 for main/waeup.ikoba/trunk

Timestamp:

31 Dec 2014, 12:53:13 (10 years ago)

Author:

Henrik Bettermann

Message:

Customers must be able to proceed to contract submission without interaction by officers.

Show only the first 6 uid digits in breadcrumbs and in select boxes.

Location:

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

Files:

• browser.py (modified) (9 diffs)
• tests/test_browser.py (modified) (1 diff)
• tests/test_interfaces.py (modified) (1 diff)
• utils.py (modified) (1 diff)
• viewlets.py (modified) (1 diff)
• vocabularies.py (modified) (1 diff)

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

@@ -61 +61 @@
 grok.context(IIkobaObject)
 
-WARNING = _('You can not edit your document after final submission.'
+WARNING_CUST = _('You can not edit some data after final submission.'
+            ' You really want to submit?')
+
+WARNING_DOC = _('You can not edit your document after final submission.'
+            ' You really want to submit?')
+
+WARNING_CON = _('You can not edit your contract after final submission.'
             ' You really want to submit?')
 
@@ -310 +316 @@
         return _('unset')
 
+    @property
+    def is_requestable(self):
+        if self.context.state in (REQUESTED, APPROVED):
+            return False
+        return True
+
 
 class ContactCustomerForm(ContactAdminForm):
@@ -678 +690 @@
     grok.name('edit_base')
     grok.require('waeup.handleCustomer')
-    label = _('Edit base data')
-    pnav = 4
+    pnav = 4
+
+    @property
+    def label(self):
+        if self.is_requestable():
+            return _('Edit base data and request registration')
+        return _('Edit base data')
 
     @property
@@ -693 +710 @@
         return
 
-    def is_editable(self, action):
+    def is_requestable(self, action=None):
         if self.context.state in (REQUESTED, APPROVED):
             return False
         return True
 
-    @action(_('Request registration now'), warning=WARNING, condition=is_editable)
+    @action(_('Request registration now'),
+            warning=WARNING_CUST, condition=is_requestable)
     def finalsubmit(self, **data):
         msave(self, **data)
@@ -773 +791 @@
     @property
     def title(self):
-        return self.context.document_id
+        return "%s..." % self.context.document_id[:6]
 
 
@@ -941 +959 @@
         return
 
-    @action(_('Final Submit'), warning=WARNING)
+    @action(_('Final Submit'), warning=WARNING_DOC)
     def finalsubmit(self, **data):
         msave(self, **data)
@@ -1119 +1137 @@
     @property
     def title(self):
-        return self.context.contract_id
+        return "%s..." % self.context.contract_id[:6]
 
 
@@ -1325 +1343 @@
         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 ContractEditFormPage(ContractManageFormPage):
@@ -1350 +1360 @@
         return
 
-    @action(_('Apply now (final submit)'), warning=WARNING)
+    @action(_('Apply now (final submit)'), warning=WARNING_CON)
     def finalsubmit(self, **data):
         msave(self, **data)

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

@@ -1178 +1178 @@
 
         # Contract can be edited
-        self.browser.getLink(conid).click()
+        self.browser.getLink(conid[:6]).click()
         self.browser.getLink("Manage").click()
         self.browser.getControl(name="form.product_object").value = ['SAM']

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

@@ -107 +107 @@
         source = CustomerDocumentSource()
         result = source.factory.getTitle(object(), self.document)
-        self.assertEqual(result, u'DOC1 - My Sample Document')
+        self.assertEqual(result, u'DOC1... - My Sample Document')
 

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

@@ -290 +290 @@
     CUSTMANAGE_CUSTOMER_STATES = (STARTED,)
 
-    DOCMANAGE_CUSTOMER_STATES = (APPROVED,)
+    DOCMANAGE_CUSTOMER_STATES = (REQUESTED, APPROVED,)
 
     DOCMANAGE_DOCUMENT_STATES = (CREATED,)

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

@@ -275 +275 @@
     grok.view(CustomerBaseDisplayFormPage)
     grok.require('waeup.handleCustomer')
-    text = _('Edit')
     target = 'edit_base'
+
+    @property
+    def text(self):
+        if self.view.is_requestable:
+            return _('Edit and request registration')
+        return _('Edit')
 
 

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

@@ -162 +162 @@
 
     def getTitle(self, context, value):
-        return "%s - %s" % (value.document_id, value.title)
+        return "%s... - %s" % (value.document_id[:6], value.title)