Changeset 14150 for main

Timestamp:

2 Sep 2016, 09:03:03 (8 years ago)

Author:

Henrik Bettermann

Message:

Omit certain fields only if application is in update mode (= ude, utme).

Location:

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

Files:

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

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

@@ -89 +89 @@
     'jamb_reg_number',
     'aggregate',
-
-    'firstname',
-    'middlename',
-    'lastname',
-    'sex',
-    'lga',
-    'course1',
     'master_sheet_number',
     'screening_venue',
@@ -179 +172 @@
     )
 
+UPDATE_OMIT_FIELDS = (
+    'firstname',
+    'middlename',
+    'lastname',
+    'sex',
+    'lga',
+    'course1',
+    )
+
 class CustomApplicantDisplayFormPage(NigeriaApplicantDisplayFormPage):
     """A display view for applicant data.
@@ -196 +198 @@
             for field in PG_OMIT_DISPLAY_FIELDS:
                 form_fields = form_fields.omit(field)
-        elif self.target is not None and self.target in ('ptee', 'ude'):
+        elif self.target is not None and self.target in ('ptee',):
             for field in PTEE_OMIT_DISPLAY_FIELDS:
                 form_fields = form_fields.omit(field)
@@ -258 +260 @@
             for field in PG_OMIT_PDF_FIELDS:
                 form_fields = form_fields.omit(field)
-        elif self.target is not None and self.target in ('ptee', 'ude'):
+        elif self.target is not None and self.target in ('ptee',):
             for field in PTEE_OMIT_PDF_FIELDS:
                 form_fields = form_fields.omit(field)
@@ -289 +291 @@
             for field in PG_OMIT_MANAGE_FIELDS:
                 form_fields = form_fields.omit(field)
-        elif self.target is not None and self.target in ('ptee', 'ude'):
+        elif self.target is not None and self.target in ('ptee',):
             for field in PTEE_OMIT_MANAGE_FIELDS:
                 form_fields = form_fields.omit(field)
@@ -340 +342 @@
             for field in PG_OMIT_EDIT_FIELDS:
                 form_fields = form_fields.omit(field)
-        elif self.target is not None and self.target in ('ptee', 'ude'):
+        elif self.target is not None and self.target in ('ptee',):
             for field in PTEE_OMIT_EDIT_FIELDS:
                 form_fields = form_fields.omit(field)
@@ -346 +348 @@
             for field in UG_OMIT_EDIT_FIELDS:
                 form_fields = form_fields.omit(field)
+        # Additional omissions
+        if self.target is not None and self.target in ('ude', 'utme'):
+            for field in UPDATE_OMIT_FIELDS:
+                form_fields[field].for_display = True
         form_fields['applicant_id'].for_display = True
         form_fields['reg_number'].for_display = True

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

@@ -62 +62 @@
         #self.browser.getControl(name="form.programme_type").value = ['regular']
         self.browser.getControl(name="form.nationality").value = ['NG']
+        self.browser.getControl(name="form.sex").value = ['m']
+        self.browser.getControl(name="form.lastname").value = 'Merkel'
         self.browser.getControl("Save").click()
         self.browser.getControl("Add online payment ticket").click()