Changeset 17719 for main

Timestamp:

15 Mar 2024, 12:57:36 (9 months ago)

Author:

Henrik Bettermann

Message:

Add new application form and change existing ones.

Location:

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

Files:

• applicants/applicant.py (modified) (2 diffs)
• applicants/browser.py (modified) (5 diffs)
• applicants/interfaces.py (modified) (2 diffs)
• applicants/utils.py (modified) (1 diff)
• interswitch/browser.py (modified) (1 diff)

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

@@ -29 +29 @@
     ICustomApplicant, ICustomUGApplicantEdit, ICustomPGApplicantEdit,
     IPUTMEApplicantEdit, ITranscriptApplicant, ICertificateRequest,
-    IFedexRequest, IRecruitment, ICustomApplicantRefereeReport)
+    IFedexRequest, IRecruitment, ICustomApplicantRefereeReport,
+    IResultReissuanceRequest)
 
 class CustomApplicant(NigeriaApplicant):
@@ -36 +37 @@
         ICustomPGApplicantEdit, IPUTMEApplicantEdit,
         ITranscriptApplicant, ICertificateRequest,
-        IFedexRequest, IRecruitment)
+        IFedexRequest, IRecruitment,
+        IResultReissuanceRequest)
     grok.provides(ICustomApplicant)
 

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

@@ -70 +70 @@
     ICustomApplicantOnlinePayment,
     ICustomApplicantRefereeReport,
+    IResultReissuanceRequest,
     )
 
@@ -253 +254 @@
             form_fields['body_address'].custom_widget = BytesDisplayWidget
             return form_fields
+        if self.target is not None and self.target == 'res':
+            form_fields = grok.AutoFields(IResultReissuanceRequest).omit(
+                'locked', 'suspended')
+            form_fields['body_address'].custom_widget = BytesDisplayWidget
+            return form_fields
         if self.target is not None and self.target == 'cert':
             form_fields = grok.AutoFields(ICertificateRequest).omit(
@@ -368 +374 @@
         elif self.target is not None and self.target == 'send':
             form_fields = grok.AutoFields(ISendByEmailRequest).omit(
+                'locked', 'suspended')
+        if self.target is not None and self.target == 'res':
+            form_fields = grok.AutoFields(IResultReissuanceRequest).omit(
                 'locked', 'suspended')
         elif self.target is not None and self.target == 'cert':
@@ -433 +442 @@
             form_fields['applicant_id'].for_display = True
             return form_fields
+        if self.target is not None and self.target == 'res':
+            form_fields = grok.AutoFields(IResultReissuanceRequest)
+            form_fields['applicant_id'].for_display = True
+            return form_fields
         if self.target is not None and self.target == 'fedex':
             form_fields = grok.AutoFields(IFedexRequest)
@@ -565 +578 @@
             form_fields = grok.AutoFields(ISendByEmailRequest).omit(
                 'locked', 'suspended')
-            form_fields['applicant_id'].for_display = True
+            return form_fields
+        if self.target is not None and self.target == 'res':
+            form_fields = grok.AutoFields(IResultReissuanceRequest).omit(
+                'locked', 'suspended')
             return form_fields
         if self.target is not None and self.target == 'fedex':

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

@@ -81 +81 @@
     (_('Attestation'), 'attest'),
     (_('Proficiency in English Language'), 'english'),
+    (_('Introduction Letter'), 'introduction'),
+    (_('Certification'), 'certification'),
+    )
+
+request_types_vocab_2 = SimpleKofaVocabulary(
+    (_('Issuance of Post-Graduate Statement of Result'), 'statement_of_result'),
+    (_('Re-Issuance of Results'), 'results'),
+    (_('Correction of Result'), 'correction'),
     )
 
@@ -1549 +1557 @@
         )
 
+class IResultReissuanceRequest(ISendByEmailRequest):
+    """A applicant asking for sending an email.
+    """
+
+    request_type = schema.Choice(
+        title = _(u'Request Type'),
+        vocabulary = request_types_vocab_2,
+        required = True,
+        )
+IResultReissuanceRequest['request_type'].order = ISendByEmailRequest[
+    'request_type'].order
+
 class ICustomApplicant(ICustomUGApplicant, ICustomPGApplicant,
                        ITranscriptApplicant, ICertificateRequest,
                        IVerificationRequest, ISendByEmailRequest,
-                       IFedexRequest, IRecruitment):
+                       IFedexRequest, IRecruitment, IResultReissuanceRequest):
     """An interface for all types of applicants.
 

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

@@ -49 +49 @@
         'fedex': ['Payment for Courier (Fedex)', 'FED'],
         'rec': ['AAU Recruitment', 'REC'],
+        'res': ['Result Re-Issuance Request', 'RE'],
         }
 

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

@@ -165 +165 @@
         xmldict = {}
         provider_amt = 2000.0
-        if self.applicant.__parent__.code in ('ver2019', 'send2019'):
-            provider_amt = 0.0
+        xmldict['institution_acct'] = '2043582644'
+        xmldict['institution_bank_id'] = '8'
+        if self.applicant.__parent__.code in ('ver2019', 'send2019', 'res2024'):
+            provider_amt = 3000.0
+            xmldict['institution_acct'] = '2043583005'
+            xmldict['institution_bank_id'] = '8'
         elif self.applicant.__parent__.code.startswith('cert'):
             provider_amt = 3000.0
         elif self.applicant.__parent__.code.startswith('trans'):
             provider_amt = 3000.0
-        xmldict['institution_acct'] = '2043582644'
-        xmldict['institution_bank_id'] = '8'
+
         if self.applicant.applicant_id.startswith('dsh'):
             xmldict['institution_acct'] = '1014847058'