Changeset 12580

Timestamp:

10 Feb 2015, 13:22:23 (10 years ago)

Author:

Henrik Bettermann

Message:

Title must be stored with the contract. Otherwise no title will be displayed if product is removed.

Location:

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

Files:

• browser.py (modified) (1 diff)
• contracts.py (modified) (2 diffs)
• tests/sample_contract_data.csv (modified) (1 diff)
• tests/test_batching.py (modified) (2 diffs)
• tests/test_browser.py (modified) (1 diff)
• tests/test_export.py (modified) (3 diffs)

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

@@ -1337 +1337 @@
     def save(self, **data):
         msave(self, **data)
+        self.context.title = self.context.product_object.contract_autotitle
         self.context.tc_dict = self.context.product_object.tc_dict
         isCustomer = getattr(

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

@@ -75 +75 @@
         self.last_product_id = None
         self.tc_dict = {}
+        self.title = None
         return
 
@@ -105 +106 @@
         except IndexError:
             return
-
-    @property
-    def title(self):
-        return getattr(
-            getattr(self, 'product_object', None),
-            'contract_autotitle', None)
 
     @property

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

@@ -1 @@
-class_name,contract_id,reg_number,product_object,document_object,product_options,tc_dict
-SampleContract,c3,1,SAM,DOC1,"[('Base Fee', '800.6', 'USD')]",{'en':'Hello World'}
-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,[],{}
+class_name,contract_id,reg_number,product_object,document_object,product_options,tc_dict,title
+SampleContract,c3,1,SAM,DOC1,"[('Base Fee', '800.6', 'USD')]",{'en':'Hello World'},Nice Contract
+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

@@ -498 +498 @@
         fail_file = open(fail_file).read()
         self.assertEqual(fail_file,
-            'reg_number,contract_id,class_name,product_object,tc_dict,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'
+            'reg_number,contract_id,title,class_name,product_object,tc_dict,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',
@@ -523 +523 @@
         self.assertTrue(
             'INFO - system - Customer Sample Contract Processor - sample_contract_data - '
-            'X666666 - %s - updated: product_object=SAM, tc_dict={}, document_object=DOC1, '
+            'X666666 - %s - updated: title=, product_object=SAM, tc_dict={}, document_object=DOC1, '
             'product_options=[]' % conid
             in logcontent)

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

@@ -1440 +1440 @@
         self.contract.product_object = self.product
         self.contract.tc_dict = {'en': u'<strong>Hello world</strong>'}
+        self.contract.title = u'Contract Title'
         self.browser.open(self.customer_path + '/contracts/CON1')
         self.browser.getLink("Download contract slip").click()

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,{\'en\': u\'Hello world\'},Our Sample Product,A111111\r\n',
+            'created,{\'en\': u\'Hello world\'},,A111111\r\n',
             result
             )
@@ -298 +298 @@
             'Contract created by system\'],,'
             'SAM,"[(u\'Base Fee\', u\'800.6\', u\'USD\')]",'
-            'created,{\'en\': u\'Hello world\'},Our Sample Product,A111111\r\n',
+            'created,{\'en\': u\'Hello world\'},,A111111\r\n',
             result
             )
@@ -318 +318 @@
             'Contract created by system\'],,'
             'SAM,"[(u\'Base Fee\', u\'800.6\', u\'USD\')]",'
-            'created,{\'en\': u\'Hello world\'},Our Sample Product,A111111\r\n',
-            result
-            )
-        return
-
+            'created,{\'en\': u\'Hello world\'},,A111111\r\n',
+            result
+            )
+        return
+