Changeset 16763 for main/waeup.aaue/trunk/src/waeup/aaue/applicants/browser.py

Timestamp:

31 Jan 2022, 09:14:15 (3 years ago)

Author:

Henrik Bettermann

Message:

Implement new pg application form.

File:

• main/waeup.aaue/trunk/src/waeup/aaue/applicants/browser.py (modified) (7 diffs)

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

@@ -51 +51 @@
 from waeup.aaue.applicants.interfaces import (
     ICustomUGApplicant,
+    ICustomPGApplicant,
     ICustomUGApplicantEdit,
+    ICustomPGApplicantEdit,
     ITranscriptApplicant,
     ICertificateRequest,
@@ -155 +157 @@
 
 PG_OMIT_FIELDS = (
-    'fst_sit_fname',
-    'fst_sit_no',
-    'fst_sit_date',
-    'fst_sit_type',
-    'fst_sit_results',
-    'scd_sit_fname',
-    'scd_sit_no',
-    'scd_sit_date',
-    'scd_sit_type',
-    'scd_sit_results',
-    #'programme_type',
-    'jamb_age',
-    'jamb_subjects',
-    'jamb_score',
-    'jamb_reg_number',
-    'aggregate'
+
     )
 PG_OMIT_DISPLAY_FIELDS = OMIT_DISPLAY_FIELDS + (
-    'jamb_subjects_list',) + PG_OMIT_FIELDS
+    ) + PG_OMIT_FIELDS
 PG_OMIT_PDF_FIELDS = PG_OMIT_DISPLAY_FIELDS + PG_OMIT_FIELDS + (
-      'reg_number','alr_fname', 'alr_no', 'alr_date',
-      'alr_results', 'notice',
-      'nysc_year',
-      'nysc_location',
-      'nysc_lga',
-      'former_matric',
       )
 PG_OMIT_MANAGE_FIELDS = (
-    'special_application','jamb_subjects_list',) + PG_OMIT_FIELDS
+    ) + PG_OMIT_FIELDS
 PG_OMIT_EDIT_FIELDS = PG_OMIT_MANAGE_FIELDS + OMIT_DISPLAY_FIELDS + (
-    'student_id',
-    'notice',
     )
 
@@ -269 +248 @@
             form_fields = grok.AutoFields(ICertificateRequest).omit(
                 'locked', 'suspended')
-            #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.
-        form_fields = grok.AutoFields(ICustomUGApplicant)
-        if self.target is not None and self.target.startswith('pg'):
+            return form_fields
+        if self.target is not None and self.target in ('ptee','dsh',):
+            form_fields = grok.AutoFields(ICustomUGApplicant)
+            for field in PTEE_OMIT_DISPLAY_FIELDS:
+                form_fields = form_fields.omit(field)
+        elif self.target is not None and self.target in ('bridge', 'ude',):
+            form_fields = grok.AutoFields(ICustomUGApplicant)
+            for field in UDE_OMIT_DISPLAY_FIELDS:
+                form_fields = form_fields.omit(field)
+        elif self.target is not None and self.target.startswith('pg'):
+            form_fields = grok.AutoFields(ICustomPGApplicant)
             for field in PG_OMIT_DISPLAY_FIELDS:
                 form_fields = form_fields.omit(field)
-        elif self.target is not None and self.target in ('ptee','dsh',):
-            for field in PTEE_OMIT_DISPLAY_FIELDS:
-                form_fields = form_fields.omit(field)
-        elif self.target is not None and self.target in ('bridge', 'ude',):
-            for field in UDE_OMIT_DISPLAY_FIELDS:
-                form_fields = form_fields.omit(field)
         else:
+            form_fields = grok.AutoFields(ICustomUGApplicant)
             for field in UG_OMIT_DISPLAY_FIELDS:
                 form_fields = form_fields.omit(field)
-        form_fields['perm_address'].custom_widget = BytesDisplayWidget
-        form_fields['notice'].custom_widget = BytesDisplayWidget
         if not getattr(self.context, 'student_id'):
             form_fields = form_fields.omit('student_id')
@@ -367 +344 @@
         if self.target is not None and self.target.startswith('pg'):
             for field in PG_OMIT_PDF_FIELDS:
+                form_fields = grok.AutoFields(ICustomPGApplicant)
                 form_fields = form_fields.omit(field)
         elif self.target is not None and self.target in ('ptee', 'dsh',):
@@ -400 +378 @@
         if not getattr(self.context, 'screening_date'):
             form_fields = form_fields.omit('screening_date')
+        hqfields = ('hq_type', 'hq_fname', 'hq_matric_no',
+                    'hq_degree', 'hq_school', 'hq_session', 'hq_disc')
+        if not getattr(self.context, 'hq_type'):
+            for hq in hqfields:
+                form_fields = form_fields.omit(hq)
+        if not getattr(self.context, 'hq_type2'):
+            for hq in hqfields:
+                form_fields = form_fields.omit(hq + '2')
+        if not getattr(self.context, 'hq_type3'):
+            for hq in hqfields:
+                form_fields = form_fields.omit(hq + '3')
+        if not getattr(self.context, 'hq_type4'):
+            for hq in hqfields:
+                form_fields = form_fields.omit(hq + '4')
         return form_fields
 
@@ -444 +436 @@
         form_fields = grok.AutoFields(ICustomUGApplicant)
         if self.target is not None and self.target.startswith('pg'):
+            form_fields = grok.AutoFields(ICustomPGApplicant)
             for field in PG_OMIT_MANAGE_FIELDS:
                 form_fields = form_fields.omit(field)
@@ -579 +572 @@
         form_fields = grok.AutoFields(ICustomUGApplicantEdit)
         if self.target is not None and self.target.startswith('pg'):
+            form_fields = grok.AutoFields(ICustomPGApplicantEdit)
             for field in PG_OMIT_EDIT_FIELDS:
                 form_fields = form_fields.omit(field)