Changeset 14313 for main/ikobacustom.aaue

Timestamp:

6 Dec 2016, 07:46:48 (8 years ago)

Author:

Henrik Bettermann

Message:

Add customer fields.

Location:

main/ikobacustom.aaue/trunk/src/ikobacustom/aaue/customers

Files:

• browser.py (modified) (2 diffs)
• interfaces.py (modified) (1 diff)
• tests/test_browser.py (modified) (2 diffs)

main/ikobacustom.aaue/trunk/src/ikobacustom/aaue/customers/browser.py

@@ -17 +17 @@
 ##
 
+import grok
 from zope.component import getUtility
 from waeup.ikoba.interfaces import IIkobaUtils, IExtFileStore
@@ -38 +39 @@
 
     def dataNotComplete(self):
-        store = getUtility(IExtFileStore)
-        error = ''
-        if not store.getFileByContext(self.context, attr=u'passport.jpg'):
-            error += _('Passport picture is missing.')
-        if error:
-            return error
         return
+
+    @property
+    def form_fields(self):
+        if not self.is_requestable():
+            return grok.AutoFields(
+                self.context.form_fields_interface).select(
+                    'email', 'phone', 'inst', 'postal_address')
+        return grok.AutoFields(self.context.form_fields_interface).omit(
+            'suspended', 'suspended_comment', 'reg_number', 'customer_id')

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

@@ -31 +31 @@
 
     """
+
+    inst = schema.TextLine(
+        title = _(u'Institution'),
+        required = False,
+        )
+
+    postal_address = schema.Text(
+        title = _(u'Postal Address'),
+        required = False,
+        )
 
 # Customer document interfaces

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

@@ -81 +81 @@
         result = open(self.outfile, 'rb').read()
         self.assertEqual(result,
-            'customer_id,email,firstname,lastname,middlename,phone,'
+            'customer_id,email,firstname,inst,lastname,middlename,phone,postal_address,'
             'reg_number,sex,suspended,suspended_comment,password,state,history\r\n'
-            'K1000000,aa@aa.aa,Beate,Mueller,,,123,f,0,,,started,[]\r\n')
+            'K1000000,aa@aa.aa,Beate,,Mueller,,,,123,f,0,,,started,[]\r\n')
         # We can reimport the file ...
         processor = AAUECustomerProcessor()
@@ -317 +317 @@
         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.open(
+            self.customer_path + '/contracts/%s' % self.contract.contract_id)
         self.browser.getLink("Download contract slip").click()
         self.assertEqual(self.browser.headers['Status'], '200 Ok')