Changeset 12500

Timestamp:

20 Jan 2015, 17:31:11 (10 years ago)

Author:

Henrik Bettermann

Message:

Add interface and page for editing official use data. Adjust exporter.

Location:

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

Files:

• browser.py (modified) (1 diff)
• contracts.py (modified) (3 diffs)
• export.py (modified) (2 diffs)
• interfaces.py (modified) (3 diffs)
• tests/test_browser.py (modified) (1 diff)
• tests/test_export.py (modified) (4 diffs)
• viewlets.py (modified) (4 diffs)

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

@@ -1382 +1382 @@
 
 
+class ContractOfficialUsePage(IkobaEditFormPage):
+    """ Page to manage a official use data of contract
+    """
+    grok.context(IContract)
+    grok.name('official_use')
+    grok.require('waeup.manageCustomer')
+    grok.template('contracteditpage')
+    pnav = 4
+    deletion_warning = _('Are you sure?')
+
+    @property
+    def form_fields(self):
+        return grok.AutoFields(self.context.ou_form_fields_interface)
+
+    @property
+    def label(self):
+        return self.context.title
+
+    @action(_('Save'), style='primary')
+    def save(self, **data):
+        msave(self, **data)
+        return
+
+
 class ContractEditFormPage(ContractManageFormPage):
     """ Page to edit a contract by customer only

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

@@ -31 +31 @@
 from waeup.ikoba.customers.interfaces import (
     IContractsContainer, ICustomerNavigation,
-    IContract, IContractProcess, IContractSelectProduct, ICustomersUtils,
-    ISampleContract, ISampleContractProcess, ISampleContractEdit)
+    IContract, IContractSelectProduct, ICustomersUtils,
+    ISampleContract, ISampleContractProcess, ISampleContractEdit,
+    ISampleContractOfficialUse)
 from waeup.ikoba.customers.utils import generate_contract_id
 from waeup.ikoba.utils.helpers import attrs_to_fields
@@ -64 +65 @@
 
     grok.baseclass()
-
-    check_docs_interface = None
-
-    contract_category = None
-
-    form_fields_interface = None
-
-    edit_form_fields_interface = None
 
     def __init__(self):
@@ -186 +179 @@
     edit_form_fields_interface = ISampleContractEdit
 
+    ou_form_fields_interface = ISampleContractOfficialUse
+
     check_docs_interface = ISampleContract
 

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

@@ -28 +28 @@
 from waeup.ikoba.customers.interfaces import (
     ICustomer, ICSVCustomerExporter,
-    ICustomerSampleDocument, ISampleContract)
+    ICustomerSampleDocument, ISampleContractProcess)
 from waeup.ikoba.utils.batching import ExporterBase
 from waeup.ikoba.utils.helpers import iface_names, to_timezone
@@ -242 +242 @@
     """
     grok.name('samplecontracts')
-    iface = ISampleContract
+    iface = ISampleContractProcess
     class_name = 'SampleContract'
     title = _(u'Customer Sample Contracts')

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

@@ -321 +321 @@
 
 
-class IContractProcess(IContract):
+class IContractSelectProduct(Interface):
+    """Interface for for the ContractSelectProductPage.
+
+    """
+
+    product_object = schema.Choice(
+        title = _(u'Product'),
+        source = ConCatProductSource(),
+        required = True,
+        )
+
+
+class ISampleContract(IContract):
+    """A customer contract sample with document attached.
+
+    """
+
+    document_object = schema.Choice(
+        title = _(u'Document'),
+        source = CustomerDocumentSource(),
+        required = False,
+        )
+
+
+class ISampleContractOfficialUse(IIkobaObject):
+    """Interface for official use only.
+    """
+
+    comment = schema.Text(
+        title = _(u'Comment'),
+        required = False,
+        )
+
+
+class ISampleContractProcess(ISampleContract, ISampleContractOfficialUse):
     """Interface for processing contract data.
     """
@@ -334 +368 @@
 
 
-class IContractSelectProduct(Interface):
-    """Interface for for the ContractSelectProductPage.
-
-    """
-
-    product_object = schema.Choice(
-        title = _(u'Product'),
-        source = ConCatProductSource(),
-        required = True,
-        )
-
-
-class ISampleContract(IContract):
-    """A customer contract sample with document attached.
+class ISampleContractEdit(ISampleContract):
+    """Interface for editing sample contract data by customers.
 
     """
@@ -354 +376 @@
         title = _(u'Document'),
         source = CustomerDocumentSource(),
-        required = False,
-        )
-
-
-class ISampleContractProcess(ISampleContract):
-    """Interface for processing contract data.
-    """
-
-    product_options = schema.List(
-        title = _(u'Options/Fees'),
-        value_type = ProductOptionField(),
-        required = False,
-        readonly = False,
-        default = [],
-        )
-
-
-class ISampleContractEdit(ISampleContract):
-    """Interface for editing sample contract data by customers.
-
-    """
-
-    document_object = schema.Choice(
-        title = _(u'Document'),
-        source = CustomerDocumentSource(),
-        required = True,
-        )
+        required = True,
+        )

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

@@ -1215 +1215 @@
         self.assertEqual(contract.state, 'approved')
 
+        # Even in state approved the official use data can be edited
+        self.browser.open(self.contracts_path + '/%s/index' % conid)
+        self.browser.getLink("Manage official data").click()
+        self.browser.getControl(name="form.comment").value = u'Nice place'
+        self.browser.getControl("Save").click()
+        self.assertEqual(contract.comment, 'Nice place')
+        self.assertTrue('Form has been saved.' in self.browser.contents)
+
         # Contracts can be removed
         self.browser.getLink("Contracts").click()

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

@@ -255 +255 @@
         self.assertEqual(
             result,
-            'class_name,contract_category,contract_id,document_object,'
+            'class_name,comment,contract_category,contract_id,document_object,'
             'history,last_product_id,'
             'product_object,product_options,state,tc_dict,title,user_id\r\n'
 
-            'SampleContract,sample,CON1,,[],,,[],,{},,\r\n'
+            'SampleContract,,sample,CON1,,[],,,[],,{},,\r\n'
             )
         return
@@ -271 +271 @@
         result = open(self.outfile, 'rb').read()
         self.assertMatches(
-            'class_name,contract_category,contract_id,document_object,'
+            'class_name,comment,contract_category,contract_id,document_object,'
             'history,last_product_id,'
             'product_object,product_options,state,tc_dict,title,user_id\r\n'
 
-            'SampleContract,sample,CON1,DOC1,[u\'2014-12-04 12:10:46 UTC - '
+            'SampleContract,,sample,CON1,DOC1,[u\'2014-12-04 12:10:46 UTC - '
             'Contract created by system\'],,'
             'SAM,"[(u\'Base Fee\', u\'800.6\', u\'USD\')]",'
@@ -291 +291 @@
         result = open(self.outfile, 'rb').read()
         self.assertMatches(
-            'class_name,contract_category,contract_id,document_object,'
+            'class_name,comment,contract_category,contract_id,document_object,'
             'history,last_product_id,'
             'product_object,product_options,state,tc_dict,title,user_id\r\n'
 
-            'SampleContract,sample,CON1,DOC1,[u\'2014-12-04 12:10:46 UTC - '
+            'SampleContract,,sample,CON1,DOC1,[u\'2014-12-04 12:10:46 UTC - '
             'Contract created by system\'],,'
             'SAM,"[(u\'Base Fee\', u\'800.6\', u\'USD\')]",'
@@ -311 +311 @@
         result = open(self.outfile, 'rb').read()
         self.assertMatches(
-            'class_name,contract_category,contract_id,document_object,'
+            'class_name,comment,contract_category,contract_id,document_object,'
             'history,last_product_id,'
             'product_object,product_options,state,tc_dict,title,user_id\r\n'
 
-            'SampleContract,sample,CON1,DOC1,[u\'2014-12-04 12:10:46 UTC - '
+            'SampleContract,,sample,CON1,DOC1,[u\'2014-12-04 12:10:46 UTC - '
             'Contract created by system\'],,'
             'SAM,"[(u\'Base Fee\', u\'800.6\', u\'USD\')]",'

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

@@ -35 +35 @@
     DocumentsManageFormPage, DocumentDisplayFormPage, DocumentManageFormPage,
     ContractsFormPage, ContractDisplayFormPage,
-    ContractManageFormPage)
+    ContractManageFormPage,
+    ContractOfficialUsePage)
 
 grok.context(IIkobaObject)  # Make IIkobaObject the default context
@@ -405 +406 @@
 
 
+class ContractOUActionButton(ManageActionButton):
+    grok.order(2)
+    grok.context(IContract)
+    grok.view(ContractDisplayFormPage)
+    grok.require('waeup.manageCustomer')
+    text = _('Manage official data')
+    target = 'official_use'
+
+
 class ContractEditActionButton(ManageActionButton):
     grok.order(1)
@@ -421 +431 @@
 
 class ContractTrigTransActionButton(ManageActionButton):
-    grok.order(2)
+    grok.order(3)
     grok.context(IContract)
     grok.view(ContractDisplayFormPage)
@@ -440 +450 @@
 
 
+class ContractViewActionButton2(ContractViewActionButton):
+    grok.view(ContractOfficialUsePage)
+
+
 class PDFContractSlipActionButton(ManageActionButton):
-    grok.order(3)
+    grok.order(4)
     grok.context(IContract)
     grok.view(ContractDisplayFormPage)