Changeset 12336 for main

Timestamp:

29 Dec 2014, 16:12:24 (10 years ago)

Author:

Henrik Bettermann

Message:

Define contract title in product. Customers must not be able to edit contract titles.

Location:

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

Files:

• customers/contracts.py (modified) (1 diff)
• customers/interfaces.py (modified) (2 diffs)
• customers/tests/sample_contract_data.csv (modified) (1 diff)
• customers/tests/test_batching.py (modified) (4 diffs)
• customers/tests/test_browser.py (modified) (9 diffs)
• customers/tests/test_catalog.py (modified) (3 diffs)
• customers/tests/test_export.py (modified) (3 diffs)
• customers/tests/test_interfaces.py (modified) (3 diffs)
• products/interfaces.py (modified) (1 diff)
• products/product.py (modified) (1 diff)
• products/tests/test_export.py (modified) (2 diffs)

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

@@ -110 +110 @@
 
     @property
+    def title(self):
+        return getattr(
+            getattr(self, 'product_object', None),
+            'contract_autotitle', None)
+
+    @property
     def customer(self):
         try:

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

@@ -294 +294 @@
     translated_class_name = Attribute('Translatable class name')
     user_id = Attribute('Id of a user, actually the id of the customer')
+    title = Attribute('Title generated by the associated product')
 
     contract_id = schema.TextLine(
@@ -299 +300 @@
         required = False,
         constraint=validate_uuid,
-        )
-
-    title = schema.TextLine(
-        title = _(u'Contract Title'),
-        required = True,
         )
 

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/sample_contract_data.csv

@@ -1 @@
-class_name,contract_id,reg_number,title,product_object,document_object,product_options
-SampleContract,c3,1,My first contract,SAM,DOC1,"[('Base Fee', '800.6', 'usd')]"
-SampleContract,c4,2,My second contract,SAM,DOC1,[]
-SampleContract,c5,3,My third contract,SAM,DOC1,[]
-SampleContract,,1,My 4th contract,SAM,DOC1,[]
-SampleContract,c5,2,My stolen contract,SAM,DOC1,[]
-SampleContract,c6,3,My 5th contract,SAM,NONEXISTENT,[]
-SampleContract,c7,3,My sixt contract,NONEXISTENT,DOC1,[]
+class_name,contract_id,reg_number,product_object,document_object,product_options
+SampleContract,c3,1,SAM,DOC1,"[('Base Fee', '800.6', 'usd')]"
+SampleContract,c4,2,SAM,DOC1,[]
+SampleContract,c5,3,SAM,DOC1,[]
+SampleContract,,1,SAM,DOC1,[]
+SampleContract,c5,2,SAM,DOC1,[]
+SampleContract,c6,3,SAM,NONEXISTENT,[]
+SampleContract,c7,3,NONEXISTENT,DOC1,[]

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

@@ -99 +99 @@
         self.product = createObject('waeup.Product')
         self.product.product_id = u'SAM'
-        self.product.title = u'Our Samle Product'
+        self.product.title = u'Our Sample Product'
         self.product.contract_category = u'sample'
         option = ProductOption()
@@ -145 +145 @@
         # Add contract
         contract = createObject('waeup.SampleContract')
-        contract.title = u'My Contract'
         contract.contract_id = u'CON1'
         contract.product_object = self.product
@@ -490 +489 @@
         fail_file = open(fail_file).read()
         self.assertEqual(fail_file,
-            'reg_number,contract_id,title,class_name,product_object,document_object,product_options,--ERRORS--\r\n'
-            '2,c5,My stolen contract,SampleContract,SAM,DOC1,[],This object already exists. Skipping.\r\n'
-            '3,c6,My 5th contract,SampleContract,SAM,NONEXISTENT,[],document_object: Invalid value\r\n'
-            '3,c7,My sixt contract,SampleContract,NONEXISTENT,DOC1,[],product_object: Invalid value\r\n'
+            'reg_number,contract_id,class_name,product_object,document_object,product_options,--ERRORS--\r\n'
+            '2,c5,SampleContract,SAM,DOC1,[],This object already exists. Skipping.\r\n'
+            '3,c6,SampleContract,SAM,NONEXISTENT,[],document_object: Invalid value\r\n'
+            '3,c7,SampleContract,NONEXISTENT,DOC1,[],product_object: Invalid value\r\n'
             )
         contract = self.processor.getEntry(dict(reg_number='1',
@@ -514 +513 @@
         self.assertTrue(
             'INFO - system - Customer Sample Contract Processor - sample_contract_data - '
-            'X666666 - %s - updated: title=My 4th contract, '
-            'product_object=SAM, document_object=DOC1' % conid
+            'X666666 - %s - updated: product_object=SAM, document_object=DOC1, '
+            'product_options=[]' % conid
             in logcontent)
 

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

@@ -102 +102 @@
         self.product = createObject('waeup.Product')
         self.product.product_id = u'SAM'
-        self.product.title = u'Our Samle Product'
+        self.product.title = u'Our Sample Product'
         self.product.contract_category = u'sample'
         self.app['products'].addProduct(self.product)
@@ -125 +125 @@
         self.customer['documents'].addDocument(self.document)
         self.contract = createObject('waeup.SampleContract')
-        self.contract.title = u'My first contract'
         self.contract.contract_id = u'CON1'
         self.assertRaises(
@@ -1163 +1162 @@
         self.browser.getControl("Add contract").click()
         self.browser.getControl(name="contype").value = ['SampleContract']
-        self.browser.getControl(name="form.title").value = 'My Sample Contract'
         self.browser.getControl("Add contract").click()
         self.assertTrue('Sample Contract added.' in self.browser.contents)
@@ -1173 +1171 @@
         self.browser.getLink("Manage").click()
         self.browser.getControl(name="form.product_object").value = ['SAM']
-        self.browser.getControl(name="form.title").value = 'My second contract'
         self.browser.getControl("Save").click()
         self.assertTrue('Form has been saved.' in self.browser.contents)
@@ -1206 +1203 @@
             '- K1000000 - added: Sample Contract %s'
             % contract.contract_id in logcontent)
-        self.assertTrue(
-            'INFO - zope.mgr - customers.browser.ContractManageFormPage '
-            '- K1000000 - %s - saved: title' % conid
-            in logcontent)
         self.assertTrue(
             'INFO - zope.mgr - K1000000 - %s - Submitted for approval' % conid
@@ -1238 +1231 @@
         self.browser.getControl("Add contract").click()
         self.browser.getControl(name="contype").value = ['SampleContract']
-        self.browser.getControl(name="form.title").value = 'My Sample Contract'
         self.browser.getControl("Add contract").click()
         self.assertTrue('Sample Contract added.' in self.browser.contents)
@@ -1250 +1242 @@
         IWorkflowState(self.customer).setState(APPROVED)
         self.browser.open(self.contracts_path + '/%s/edit' % conid)
-        self.browser.getControl(name="form.title").value = 'My second contract'
         # SAM is in the correct contract_category ...
         self.assertTrue('<option value="SAM">' in self.browser.contents)
@@ -1268 +1259 @@
         self.browser.getControl(name="form.product_object").value = ['SAM']
         self.browser.getControl(name="form.document_object").value = ['DOC1']
-        self.browser.getControl(name="form.title").value = 'My second contract'
         self.browser.getControl("Save").click()
         # After saving the form, last_product_id and other attributes are set
         self.assertTrue('Form has been saved.' in self.browser.contents)
         self.assertEqual(self.customer['contracts'][conid].last_product_id, 'SAM')
-        self.assertEqual(contract.title, 'My second contract')
+        self.assertEqual(contract.title, 'Our Sample Product')
         self.assertEqual(contract.product_object, self.product)
         self.assertEqual(contract.document_object, self.document)
         # Saving the form again does not unset last_product_id
-        self.browser.getControl(name="form.title").value = 'My third contract'
         self.browser.getControl("Save").click()
         self.assertEqual(self.customer['contracts'][conid].last_product_id, 'SAM')
@@ -1291 +1280 @@
         # Customer can submit the form. The form is also saved.
         self.browser.getLink("Edit").click()
-        self.browser.getControl(name="form.title").value = 'My fourth contract'
-        self.browser.getControl("Apply now").click()
-        self.assertEqual(contract.title, 'My fourth contract')
+        self.browser.getControl("Apply now").click()
         self.assertEqual(contract.state, 'submitted')
         self.assertTrue('Contract State: submitted for approval' in self.browser.contents)

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

@@ -62 +62 @@
         product = createObject('waeup.Product')
         product.product_id = u'SAM'
-        product.title = u'Our Samle Product'
+        product.title = u'Our Sample Product'
         product.contract_category = u'sample'
         self.app['products'].addProduct(product)
@@ -69 +69 @@
 
         document = createObject('waeup.CustomerSampleDocument')
-        document.title = u'My Samle Document'
+        document.title = u'My Sample Document'
         IWorkflowState(document).setState(VERIFIED)
         self.customer['documents'].addDocument(document)
@@ -76 +76 @@
 
         contract = createObject('waeup.SampleContract')
-        contract.title = u'My Samle Contract'
         contract.contract_id = u'CON1'
         contract.product_object = product

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

@@ -278 +278 @@
             'Contract created by system\'],,'
             'SAM,"[(u\'Base Fee\', u\'800.6\', u\'usd\')]",'
-            'created,My Contract,A111111\r\n',
+            'created,Our Sample Product,A111111\r\n',
             result
             )
@@ -298 +298 @@
             'Contract created by system\'],,'
             'SAM,"[(u\'Base Fee\', u\'800.6\', u\'usd\')]",'
-            'created,My Contract,A111111\r\n',
+            'created,Our Sample Product,A111111\r\n',
             result
             )
@@ -318 +318 @@
             'Contract created by system\'],,'
             'SAM,"[(u\'Base Fee\', u\'800.6\', u\'usd\')]",'
-            'created,My Contract,A111111\r\n',
-            result
-            )
-        return
-
+            'created,Our Sample Product,A111111\r\n',
+            result
+            )
+        return
+

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

@@ -68 +68 @@
 
         contract = createObject('waeup.SampleContract')
-        contract.title = u'My Samle Contract'
         contract.product = product
         contract.last_product_id = product.product_id
@@ -76 +75 @@
 
         document = createObject('waeup.CustomerSampleDocument')
-        document.title = u'My Samle Document'
+        document.title = u'My Sample Document'
         document.document_id = u'DOC1'
         self.customer['documents'].addDocument(document)
@@ -108 +107 @@
         source = CustomerDocumentSource()
         result = source.factory.getTitle(object(), self.document)
-        self.assertEqual(result, u'DOC1 - My Samle Document')
+        self.assertEqual(result, u'DOC1 - My Sample Document')
 

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

@@ -57 +57 @@
         )
 
+    contract_title = schema.TextLine(
+        title = _(u'Product Title'),
+        description = _('Product title if empty'),
+        required = False,
+        )
+
     contract_category = schema.Choice(
         title = _(u'Contract Category'),

main/waeup.ikoba/trunk/src/waeup/ikoba/products/product.py

@@ -51 +51 @@
         return cc_dict[self.contract_category]
 
+    @property
+    def contract_autotitle(self):
+        if self.contract_title:
+            return self.contract_title
+        return self.title
+
 Product = attrs_to_fields(Product)
 

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

@@ -62 +62 @@
         result = open(self.outfile, 'rb').read()
         self.assertTrue(
-            'contract_category,options,product_id,title,users_with_local_roles\r\n'
-            'license,"[(u\'Base Fee\', u\'800.6\', u\'usd\')]",LIC,Unnamed,'
+            'contract_category,contract_title,options,'
+            'product_id,title,users_with_local_roles\r\n'
+            'license,,"[(u\'Base Fee\', u\'800.6\', u\'usd\')]",LIC,Unnamed,'
             '"[{\'user_name\': u\'john\', \'local_role\': '
             'u\'johnsrole\'}]"\r\n'
@@ -76 +77 @@
         result = open(self.outfile, 'rb').read()
         self.assertTrue(
-            'contract_category,options,product_id,title,users_with_local_roles\r\n'
-            'license,"[(u\'Base Fee\', u\'800.6\', u\'usd\')]",LIC,Unnamed,'
+            'contract_category,contract_title,options,'
+            'product_id,title,users_with_local_roles\r\n'
+            'license,,"[(u\'Base Fee\', u\'800.6\', u\'usd\')]",LIC,Unnamed,'
             '"[{\'user_name\': u\'john\', \'local_role\': '
             'u\'johnsrole\'}]"\r\n'