Changeset 17538 for main

Timestamp:

15 Aug 2023, 09:47:00 (17 months ago)

Author:

Henrik Bettermann

Message:

PT students have different fields and must fill JAMB reg number.

Location:

main/waeup.uniben/trunk/src/waeup/uniben/applicants

Files:

• browser.py (modified) (11 diffs)
• interfaces.py (modified) (3 diffs)
• utils.py (modified) (1 diff)

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

@@ -58 +58 @@
 from kofacustom.nigeria.applicants.interfaces import (
     OMIT_DISPLAY_FIELDS,
-#    UG_OMIT_DISPLAY_FIELDS,
-#    UG_OMIT_PDF_FIELDS,
-#    UG_OMIT_MANAGE_FIELDS,
-#    UG_OMIT_EDIT_FIELDS,
+    UG_OMIT_DISPLAY_FIELDS,
+    UG_OMIT_PDF_FIELDS,
+    UG_OMIT_MANAGE_FIELDS,
+    UG_OMIT_EDIT_FIELDS,
     CBT_OMIT_DISPLAY_FIELDS,
     CBT_OMIT_PDF_FIELDS,
@@ -75 +75 @@
     PG_OMIT_EDIT_FIELDS,
     PUTME_OMIT_DISPLAY_FIELDS,
-#    PUTME_OMIT_PDF_FIELDS,
-#    PUTME_OMIT_MANAGE_FIELDS,
-#    PUTME_OMIT_EDIT_FIELDS,
-#    PUTME_OMIT_RESULT_SLIP_FIELDS,
+    PUTME_OMIT_PDF_FIELDS,
+    PUTME_OMIT_MANAGE_FIELDS,
+    PUTME_OMIT_EDIT_FIELDS,
+    PUTME_OMIT_RESULT_SLIP_FIELDS,
     PUDE_OMIT_DISPLAY_FIELDS,
     PUDE_OMIT_PDF_FIELDS,
@@ -109 +109 @@
              'ACT','ENT','HRM','INS','MKT'] + PASTQ_ALL
 
-# UG students are all undergraduate students. Meanwhile
-# Uniben uses a customized version.
-
-UG_OMIT_DISPLAY_FIELDS = OMIT_DISPLAY_FIELDS + (
-    'jamb_subjects_list', 'programme_type')
-UG_OMIT_PDF_FIELDS = UG_OMIT_DISPLAY_FIELDS + ('phone',)
-UG_OMIT_MANAGE_FIELDS = (
-    'special_application',
-    'jamb_subjects_list',
-    'programme_type')
-UG_OMIT_EDIT_FIELDS = UG_OMIT_MANAGE_FIELDS + OMIT_DISPLAY_FIELDS + (
+PT_OMIT_FIELDS = (
     'student_id',
     'notice',
@@ -128 +118 @@
     'jamb_subjects',
     'jamb_score',
-#    'jamb_reg_number',
-    'aggregate')
-
-# PUTME is a subgroup of UG with the same interface. Meanwhile
-# Uniben uses a customized version.
-
-PUTME_OMIT_FIELDS = (
+    #'jamb_reg_number',
+    'aggregate',
     'hq_type', 'hq_matric_no',
     'hq_degree', 'hq_school',
@@ -140 +125 @@
     'jamb_subjects_list', 'programme_type')
 
-PUTME_OMIT_DISPLAY_FIELDS = OMIT_DISPLAY_FIELDS + PUTME_OMIT_FIELDS
-
-PUTME_OMIT_MANAGE_FIELDS = UG_OMIT_MANAGE_FIELDS + PUTME_OMIT_FIELDS
-
-PUTME_OMIT_EDIT_FIELDS = UG_OMIT_EDIT_FIELDS + PUTME_OMIT_FIELDS
-
-PUTME_OMIT_PDF_FIELDS = PUTME_OMIT_DISPLAY_FIELDS + ('phone',)
-PUTME_OMIT_RESULT_SLIP_FIELDS = PUTME_OMIT_DISPLAY_FIELDS + (
+PT_OMIT_DISPLAY_FIELDS = OMIT_DISPLAY_FIELDS + PT_OMIT_FIELDS
+
+PT_OMIT_MANAGE_FIELDS = UG_OMIT_MANAGE_FIELDS + PT_OMIT_FIELDS
+
+PT_OMIT_EDIT_FIELDS = UG_OMIT_MANAGE_FIELDS + OMIT_DISPLAY_FIELDS + PT_OMIT_FIELDS
+
+PT_OMIT_PDF_FIELDS = PT_OMIT_DISPLAY_FIELDS + ('phone',)
+PT_OMIT_RESULT_SLIP_FIELDS = PT_OMIT_DISPLAY_FIELDS + (
     'phone',
     'date_of_birth', 'sex',
@@ -342 +327 @@
             for field in PUTME_OMIT_DISPLAY_FIELDS:
                 form_fields = form_fields.omit(field)
+        elif self.target is not None and self.target.startswith('pt'):
+            form_fields = grok.AutoFields(ICustomUGApplicant)
+            for field in PT_OMIT_DISPLAY_FIELDS:
+                form_fields = form_fields.omit(field)
         elif self.target is not None and self.target.startswith('pude'):
             form_fields = grok.AutoFields(ICustomUGApplicant)
@@ -351 +340 @@
                 form_fields = form_fields.omit(field)
         #form_fields['perm_address'].custom_widget = BytesDisplayWidget
-        form_fields['notice'].custom_widget = BytesDisplayWidget
+        try:
+            form_fields['notice'].custom_widget = BytesDisplayWidget
+        except:
+            pass
         if not getattr(self.context, 'student_id'):
             form_fields = form_fields.omit('student_id')
@@ -537 +529 @@
             for field in PUTME_OMIT_MANAGE_FIELDS:
                 form_fields = form_fields.omit(field)
+        elif self.target is not None and self.target.startswith('pt'):
+            form_fields = grok.AutoFields(ICustomUGApplicant)
+            for field in PT_OMIT_MANAGE_FIELDS:
+                form_fields = form_fields.omit(field)
         elif self.target is not None and self.target.startswith('pude'):
             form_fields = grok.AutoFields(ICustomUGApplicant)
@@ -545 +541 @@
             for field in UG_OMIT_MANAGE_FIELDS:
                 form_fields = form_fields.omit(field)
-        form_fields['student_id'].for_display = True
-        form_fields['applicant_id'].for_display = True
+        try:
+            form_fields['student_id'].for_display = True
+        except:
+            pass
+        try:
+            form_fields['applicant_id'].for_display = True
+        except:
+            pass
         return form_fields
 
@@ -621 +623 @@
             form_fields = grok.AutoFields(IPUTMEApplicantEdit)
             for field in PUTME_OMIT_EDIT_FIELDS:
+                form_fields = form_fields.omit(field)
+        elif self.target is not None and self.target.startswith('pt'):
+            form_fields = grok.AutoFields(IPUTMEApplicantEdit)
+            for field in PT_OMIT_EDIT_FIELDS:
                 form_fields = form_fields.omit(field)
         elif self.target is not None and self.target.startswith('pude'):
@@ -766 +772 @@
             else:
                 for field in PUTME_OMIT_PDF_FIELDS:
+                    form_fields = form_fields.omit(field)
+        elif self.target is not None and self.target.startswith('pt'):
+            form_fields = grok.AutoFields(ICustomUGApplicant)
+            if self._reduced_slip():
+                for field in PT_OMIT_RESULT_SLIP_FIELDS:
+                    form_fields = form_fields.omit(field)
+            else:
+                for field in PT_OMIT_PDF_FIELDS:
                     form_fields = form_fields.omit(field)
         elif self.target is not None and self.target.startswith('pude'):

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

@@ -722 +722 @@
         defaultFactory=list,
         )
+    jamb_reg_number = schema.TextLine(
+        title = _(u'JAMB Registration Number'),
+        required = False,
+        )
     jamb_subjects = schema.Text(
         title = _(u'Subjects and Scores'),
@@ -743 +747 @@
     #    required = False,
     #    )
-    jamb_reg_number = schema.TextLine(
-        title = _(u'JAMB Registration Number'),
+    course_admitted = schema.Choice(
+        title = _(u'Admitted Course of Study'),
+        source = CertificateSource(),
         required = False,
         )
@@ -777 +782 @@
         required = False,
         readonly = False,
-        )
-    course_admitted = schema.Choice(
-        title = _(u'Admitted Course of Study'),
-        source = CertificateSource(),
-        required = False,
         )
     locked = schema.Bool(

main/waeup.uniben/trunk/src/waeup/uniben/applicants/utils.py

@@ -77 +77 @@
         'form.nysc_year': _(u'NYSC Information'),
         'form.employer': _(u'Employment History'),
-        'form.jamb_subjects': _(u'JAMB Data'),
-        'form.jamb_subjects_list': _(u'JAMB Data'),
-        'form.notice': _(u'Application Process Information'),
+        'form.jamb_reg_number': _(u'JAMB Data'),
+        'form.course_admitted': _(u'Application Process Information'),
         'form.pp_school': _(u'Post Primary School Qualification'),
         'form.presently_inst': _(u'Presently attending a course or programme'),