Changeset 17719


Ignore:
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:
5 edited

Legend:

Unmodified
Added
Removed
  • main/waeup.aaue/trunk/src/waeup/aaue/applicants/applicant.py

    r16786 r17719  
    2929    ICustomApplicant, ICustomUGApplicantEdit, ICustomPGApplicantEdit,
    3030    IPUTMEApplicantEdit, ITranscriptApplicant, ICertificateRequest,
    31     IFedexRequest, IRecruitment, ICustomApplicantRefereeReport)
     31    IFedexRequest, IRecruitment, ICustomApplicantRefereeReport,
     32    IResultReissuanceRequest)
    3233
    3334class CustomApplicant(NigeriaApplicant):
     
    3637        ICustomPGApplicantEdit, IPUTMEApplicantEdit,
    3738        ITranscriptApplicant, ICertificateRequest,
    38         IFedexRequest, IRecruitment)
     39        IFedexRequest, IRecruitment,
     40        IResultReissuanceRequest)
    3941    grok.provides(ICustomApplicant)
    4042
  • main/waeup.aaue/trunk/src/waeup/aaue/applicants/browser.py

    r17675 r17719  
    7070    ICustomApplicantOnlinePayment,
    7171    ICustomApplicantRefereeReport,
     72    IResultReissuanceRequest,
    7273    )
    7374
     
    253254            form_fields['body_address'].custom_widget = BytesDisplayWidget
    254255            return form_fields
     256        if self.target is not None and self.target == 'res':
     257            form_fields = grok.AutoFields(IResultReissuanceRequest).omit(
     258                'locked', 'suspended')
     259            form_fields['body_address'].custom_widget = BytesDisplayWidget
     260            return form_fields
    255261        if self.target is not None and self.target == 'cert':
    256262            form_fields = grok.AutoFields(ICertificateRequest).omit(
     
    368374        elif self.target is not None and self.target == 'send':
    369375            form_fields = grok.AutoFields(ISendByEmailRequest).omit(
     376                'locked', 'suspended')
     377        if self.target is not None and self.target == 'res':
     378            form_fields = grok.AutoFields(IResultReissuanceRequest).omit(
    370379                'locked', 'suspended')
    371380        elif self.target is not None and self.target == 'cert':
     
    433442            form_fields['applicant_id'].for_display = True
    434443            return form_fields
     444        if self.target is not None and self.target == 'res':
     445            form_fields = grok.AutoFields(IResultReissuanceRequest)
     446            form_fields['applicant_id'].for_display = True
     447            return form_fields
    435448        if self.target is not None and self.target == 'fedex':
    436449            form_fields = grok.AutoFields(IFedexRequest)
     
    565578            form_fields = grok.AutoFields(ISendByEmailRequest).omit(
    566579                'locked', 'suspended')
    567             form_fields['applicant_id'].for_display = True
     580            return form_fields
     581        if self.target is not None and self.target == 'res':
     582            form_fields = grok.AutoFields(IResultReissuanceRequest).omit(
     583                'locked', 'suspended')
    568584            return form_fields
    569585        if self.target is not None and self.target == 'fedex':
  • main/waeup.aaue/trunk/src/waeup/aaue/applicants/interfaces.py

    r17632 r17719  
    8181    (_('Attestation'), 'attest'),
    8282    (_('Proficiency in English Language'), 'english'),
     83    (_('Introduction Letter'), 'introduction'),
     84    (_('Certification'), 'certification'),
     85    )
     86
     87request_types_vocab_2 = SimpleKofaVocabulary(
     88    (_('Issuance of Post-Graduate Statement of Result'), 'statement_of_result'),
     89    (_('Re-Issuance of Results'), 'results'),
     90    (_('Correction of Result'), 'correction'),
    8391    )
    8492
     
    15491557        )
    15501558
     1559class IResultReissuanceRequest(ISendByEmailRequest):
     1560    """A applicant asking for sending an email.
     1561    """
     1562
     1563    request_type = schema.Choice(
     1564        title = _(u'Request Type'),
     1565        vocabulary = request_types_vocab_2,
     1566        required = True,
     1567        )
     1568IResultReissuanceRequest['request_type'].order = ISendByEmailRequest[
     1569    'request_type'].order
     1570
    15511571class ICustomApplicant(ICustomUGApplicant, ICustomPGApplicant,
    15521572                       ITranscriptApplicant, ICertificateRequest,
    15531573                       IVerificationRequest, ISendByEmailRequest,
    1554                        IFedexRequest, IRecruitment):
     1574                       IFedexRequest, IRecruitment, IResultReissuanceRequest):
    15551575    """An interface for all types of applicants.
    15561576
  • main/waeup.aaue/trunk/src/waeup/aaue/applicants/utils.py

    r17668 r17719  
    4949        'fedex': ['Payment for Courier (Fedex)', 'FED'],
    5050        'rec': ['AAU Recruitment', 'REC'],
     51        'res': ['Result Re-Issuance Request', 'RE'],
    5152        }
    5253
  • main/waeup.aaue/trunk/src/waeup/aaue/interswitch/browser.py

    r17702 r17719  
    165165        xmldict = {}
    166166        provider_amt = 2000.0
    167         if self.applicant.__parent__.code in ('ver2019', 'send2019'):
    168             provider_amt = 0.0
     167        xmldict['institution_acct'] = '2043582644'
     168        xmldict['institution_bank_id'] = '8'
     169        if self.applicant.__parent__.code in ('ver2019', 'send2019', 'res2024'):
     170            provider_amt = 3000.0
     171            xmldict['institution_acct'] = '2043583005'
     172            xmldict['institution_bank_id'] = '8'
    169173        elif self.applicant.__parent__.code.startswith('cert'):
    170174            provider_amt = 3000.0
    171175        elif self.applicant.__parent__.code.startswith('trans'):
    172176            provider_amt = 3000.0
    173         xmldict['institution_acct'] = '2043582644'
    174         xmldict['institution_bank_id'] = '8'
     177
    175178        if self.applicant.applicant_id.startswith('dsh'):
    176179            xmldict['institution_acct'] = '1014847058'
Note: See TracChangeset for help on using the changeset viewer.