Changeset 15099 for main/waeup.aaue/trunk/src

Timestamp:

6 Aug 2018, 06:48:42 (6 years ago)

Author:

Henrik Bettermann

Message:

Remove some fields from certificate application form.

Remove passport picture requirement.

Location:

main/waeup.aaue/trunk/src/waeup/aaue/applicants

Files:

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

main/waeup.aaue/trunk/src/waeup/aaue/applicants/browser.py

@@ -239 +239 @@
             form_fields = grok.AutoFields(ICertificateRequest).omit(
                 'locked', 'suspended')
-            form_fields['dispatch_address'].custom_widget = BytesDisplayWidget
-            form_fields['perm_address'].custom_widget = BytesDisplayWidget
+            #form_fields['dispatch_address'].custom_widget = BytesDisplayWidget
+            #form_fields['perm_address'].custom_widget = BytesDisplayWidget
             return form_fields
         # AAUE is using the same interface for all regular applications.
@@ -392 +392 @@
     def unremovable(self, ticket):
         return True
+
+    def dataNotComplete(self):
+        store = getUtility(IExtFileStore)
+        if not self.target[:4] in ('cert', 'tran'):
+            if store.getFileByContext(self.context, attr=u'passport.jpg'):
+                return _('No passport picture uploaded.')
+            if not self.request.form.get('confirm_passport', False):
+                return _('Passport picture confirmation box not ticked.')
+        return False
 
     # AAUE applicants never see the 'Remove Selected Tickets' button.

main/waeup.aaue/trunk/src/waeup/aaue/applicants/interfaces.py

@@ -747 +747 @@
         )
 
-    perm_address = schema.Text(
-        title = _(u'Current Local Address'),
-        required = False,
-        readonly = False,
-        )
-
-    dispatch_address = schema.Text(
-        title = _(u'Dispatch Addresses'),
-        description = u'Addresses to which certificate should be posted.',
-        required = False,
-        readonly = False,
-        )
-
     entry_session = schema.Choice(
         title = _(u'Entry Session'),
@@ -781 +768 @@
         )
 
-    no_copies = schema.Choice(
-        title = _(u'Number of Copies'),
-        description = u'Must correspond with the number of dispatch addresses above.',
-        values=[1, 2, 3, 4],
-        required = False,
-        readonly = False,
-        default = 1,
-        )
 
 class ICustomApplicant(ICustomUGApplicant, ICustomPGApplicant,

main/waeup.aaue/trunk/src/waeup/aaue/applicants/tests/test_browser.py

@@ -187 +187 @@
         self.browser.open(self.certapplicant_path)
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
-        self.assertTrue("Dispatch Address" in self.browser.contents)
+        #self.assertTrue("Dispatch Address" in self.browser.contents)
 
     def test_certificate_request_update(self):