Changeset 12797

Timestamp:

19 Mar 2015, 16:50:54 (10 years ago)

Author:

Henrik Bettermann

Message:

Move res_address to customer.

Location:

main/ikobacustom.pcn/trunk/src/ikobacustom/pcn/customers

Files:

• interfaces.py (modified) (10 diffs)
• tests/test_browser.py (modified) (9 diffs)

main/ikobacustom.pcn/trunk/src/ikobacustom/pcn/customers/interfaces.py

@@ -25 +25 @@
     validate_email)
 from waeup.ikoba.customers.vocabularies import (
-    ConCatProductSource, CustomerDocumentSource, nats_vocab)
+    ConCatProductSource,
+    CustomerDocumentSource,
+    RefereeSourceFactory,
+    nats_vocab,
+    )
 from waeup.ikoba.schema import TextLineChoice, FormattedDate, PhoneNumber
 from waeup.ikoba.products.productoptions import ProductOptionField
@@ -64 +68 @@
         )
 
+    res_address = schema.Text(
+        title = _(u'Residential Address'),
+        required = True,
+        )
+
 # Customer document interfaces
 
@@ -100 +109 @@
         required = True,
         values = year_range(),
-        )
-
-    res_address = schema.Text(
-        title = _(u'Residential Address'),
-        required = True,
         )
 
@@ -207 +211 @@
         )
 
-    res_address = schema.Text(
-        title = _(u'Residential Address'),
-        required = False,
-        )
-
     last_license_number = schema.TextLine(
         title = _(u'Last Annual License Number'),
@@ -300 +299 @@
         vocabulary = nats_vocab,
         title = _(u'State of Origin'),
-        required = False,
-        )
-
-    res_address = schema.Text(
-        title = _(u'Residential Address'),
         required = False,
         )
@@ -436 +430 @@
         )
 
-    res_address = schema.Text(
-        title = _(u'Residential Address'),
-        required = False,
-        )
-
     qualifications = schema.Text(
         title = _(u'Qualifications'),
@@ -562 +551 @@
     """
 
-    res_address = schema.Text(
-        title = _(u'Residential Address'),
-        required = False,
-        )
-
     occupation = schema.TextLine(
         title = _(u'Occupation'),
@@ -741 +725 @@
     """
 
-    res_address = schema.Text(
-        title = _(u'Residential Address'),
-        required = False,
-        )
-
     occupation = schema.TextLine(
         title = _(u'Occupation'),
@@ -1053 +1032 @@
     home_address = schema.Text(
         title = _(u'Permanent Home Address'),
-        required = False,
-        )
-
-    res_address = schema.Text(
-        title = _(u'Residential Address'),
         required = False,
         )
@@ -1154 +1128 @@
         )
 
-    res_address = schema.Text(
-        title = _(u'Residential Address'),
-        required = False,
-        )
-
     employment = schema.Text(
         title = _('Employment'),

main/ikobacustom.pcn/trunk/src/ikobacustom/pcn/customers/tests/test_browser.py

@@ -63 +63 @@
         customer.sex = u'f'
         customer.email = u'aa@aa.aa'
+        customer.res_address = u'My address'
         customer.date_of_birth = datetime.date(1981, 2, 4)
         IWorkflowState(customer).setState('started')
@@ -95 +96 @@
         self.assertEqual(result,
             'customer_id,date_of_birth,email,firstname,lastname,middlename,phone,'
-            'reg_number,sex,suspended,suspended_comment,password,state,history\r\n'
-            'K1000000,1981-02-04#,aa@aa.aa,Beate,Mueller,,,123,f,0,,,started,[]\r\n')
+            'reg_number,res_address,sex,suspended,suspended_comment,password,state,history\r\n'
+            'K1000000,1981-02-04#,aa@aa.aa,Beate,Mueller,,,123,My address,f,0,,,started,[]\r\n')
         # We can reimport the file ...
         processor = PCNCustomerProcessor()
@@ -102 +103 @@
             self.outfile,
             ['customer_id','date_of_birth','email','firstname','lastname','middlename','phone',
-            'reg_number','sex','suspended','suspended_comment','password','state'],
+            'reg_number','res_address','sex','suspended','suspended_comment','password','state'],
             mode='create')
         num, num_fail, finished_path, failed_path = result
@@ -111 +112 @@
             self.outfile,
             ['customer_id','date_of_birth','email','firstname','lastname','middlename','phone',
-            'reg_number','sex','suspended','suspended_comment','password','state'],
+            'reg_number','res_address','sex','suspended','suspended_comment','password','state'],
             mode='create')
         num_succ, num_fail, finished_path, failed_path = result
@@ -120 +121 @@
             self.outfile,
             ['customer_id','date_of_birth','xx_email','firstname','lastname','middlename','phone',
-            'xx_reg_number','sex','suspended','suspended_comment','password','state'],
+            'xx_reg_number','res_address','sex','suspended','suspended_comment','password','state'],
             mode='update')
         num_succ, num_fail, finished_path, failed_path = result
@@ -225 +226 @@
             'categories_practice,class_name,comment,contract_category,contract_id,'
             'fee_based,history,last_product_id,lga,product_object,'
-            'product_options,res_address,state,state_of_origin,superintendent,'
+            'product_options,state,state_of_origin,superintendent,'
             'tc_dict,title,user_id,valid_from,valid_to,work_address,work_email,work_phone,'
             'year_qualification\r\n'
             '[],RONContract,,ron,%s,0,'
             '[u\'2015-01-18 16:40:01 WAT - License created by system\'],,,,'
-            '[],,created,,,{\'en\': u\'Hello World\'},,K1000000,,,,,,\r\n'
+            '[],created,,,{\'en\': u\'Hello World\'},,K1000000,,,,,,\r\n'
             % self.contract1.contract_id)
         # We can reimport the file if we change the header
@@ -286 +287 @@
             'last_product_id,official_in_state,other_directors,'
             'pharmacists_directors,premises_address,premises_certificate,'
-            'product_object,product_options,recommended,res_address,'
+            'product_object,product_options,recommended,'
             'state,superintendent,tc_dict,title,user_id,valid_from,valid_to,'
             'work_address\r\n'
@@ -292 +293 @@
             '[],ROPContract,rop,%s,,0,'
             '[u\'2015-01-20 18:51:03 WAT - License created by system\']'
-            ',,,,,,,,,,[],,,created,,{\'en\': u\'Hello World\'},,K1000000,,,\r\n'
+            ',,,,,,,,,,[],,created,,{\'en\': u\'Hello World\'},,K1000000,,,\r\n'
             % self.contract2.contract_id)
         # We can reimport the file if we change the header
@@ -357 +358 @@
         self.browser.getLink("Edit").click()
         self.browser.getControl(name="form.email").value = 'new_email@aa.ng'
+        self.browser.getControl(name="form.res_address").value = 'My address'
         self.browser.getControl("Save", index=0).click()
         self.assertMatches('...Form has been saved...',