Changeset 17278


Ignore:
Timestamp:
13 Jan 2023, 08:31:28 (21 months ago)
Author:
Henrik Bettermann
Message:

Add IJMB IJMB (Foundation Programme) .

Location:
main/kofacustom.unidel/trunk/src/kofacustom/unidel
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • main/kofacustom.unidel/trunk/src/kofacustom/unidel/applicants/utils.py

    r17206 r17278  
    3434        'ase': ['Admission Screening Exercise', 'ASE'], # successor of putme
    3535        'ugpt': ['Undergraduate Part-Time Programmes', 'PT'],
    36         'jupeb': ['JUPEB Pre-Degree (Foundation) Studies', 'PRE'],
     36        'jupeb': ['JUPEB Pre-Degree (Foundation) Programmes', 'PRE'],
     37        'ijmb': ['IJMB Foundation School Programmes', 'IJMB'],
    3738        'pre': ['Pre-Degree (Foundation) Studies', 'PRE'],
    3839        'dpft': ['Diploma Programmes Full-Time Programmes', 'DP'],

  • main/kofacustom.unidel/trunk/src/kofacustom/unidel/interswitch/browser.py

    r17203 r17278  
    9191            xmldict['institution_acct'] = '1216063205'
    9292            xmldict['institution_bank_id'] = '117'
    93             if student.is_jupeb:
    94                 xmldict['institution_acct'] = '1011431799'
    95             elif student.faccode == 'PRE':
     93            if student.faccode in ('PRE', 'JUPEB'):
    9694                xmldict['institution_acct'] = '1011431799'
    9795        if self.context.p_category == 'schoolfee':
    … …  
    10098            xmldict['institution_acct'] = '1011739172'
    10199            xmldict['institution_bank_id'] = '117'
    102             if student.is_jupeb or student.faccode == 'PRE':
     100            if student.faccode in ('PRE', 'JUPEB'):
    103101                xmldict['institution_acct'] = '2001627961'
    104102                xmldict['institution_bank_id'] = '8'
    … …  
    192190        xmldict['institution_bank_id'] = '117'
    193191        if self.context.__parent__.__parent__.prefix in (
    194                                     'pre', 'jupeb', 'dpft', 'dppt', 'ugpt'):
     192                                    'pre', 'jupeb', 'dpft', 'dppt',
     193                                    'ugpt', 'ijmb'):
    195194            xmldict['institution_acct'] = '1011431799'
    196195            xmldict['institution_bank_id'] = '117'

  • main/kofacustom.unidel/trunk/src/kofacustom/unidel/students/student.py

    r17114 r17278  
    3939    def transcript_enabled(self):
    4040        user = get_current_principal()
    41         if user.id in ('admin', 'isouaba', 'niyi', 'delejason'):
    42             return True
    43         return False
    44 
    45     @property
    46     def is_jupeb(self):
    47         if self.faccode.startswith('JUPEB'):
     41        if user.id in ('admin', ):
    4842            return True
    4943        return False

  • main/kofacustom.unidel/trunk/src/kofacustom/unidel/students/tests/test_export.py

    r16721 r17278  
    104104        self.assertMatches(
    105105            'ac,amount_auth,creation_date,gateway_amt,net_amt,'
    106             'p_category,p_combi,p_current,'
     106            'p_category,p_combi,p_currency,p_current,'
    107107            'p_id,p_item,p_level,p_option,p_session,p_state,payment_date,provider_amt,'
    108108            'r_amount_approved,r_card_num,r_code,r_company,r_desc,'
    109             'r_pay_reference,thirdparty_amt,student_id,state,'
     109            'r_pay_reference,r_payment_link,thirdparty_amt,student_id,state,'
    110110            'current_session\r\n'
    111             '666,12.12,%s-04-01 13:12:01#,,,schoolfee,[],1,my-id,p-item,'
     111            '666,12.12,%s-04-01 13:12:01#,,,schoolfee,[],,1,my-id,p-item,'
    112112            '100,,%s,paid,%s-04-01 14:12:01#,,12.12,'
    113             '789,r-code,interswatch,,,,A111111,created,2012\r\n'
     113            '789,r-code,interswatch,,,,,A111111,created,2012\r\n'
    114114            % (curr_year-6, curr_year-6, curr_year-6), result
    115115            )

  • main/kofacustom.unidel/trunk/src/kofacustom/unidel/students/utils.py

    r17202 r17278  
    9090                    amount = getattr(certificate, 'school_fee_2', 0.0)
    9191            else:
    92                 if student.is_jupeb:
     92                if student.faccode == 'JUPEB':
    9393                    if not self._clearancePaymentMade(student):
    9494                        return _(u'Acceptance fee must be paid first.'), None
    … …  
    118118                            ), None
    119119                    amount = getattr(certificate, 'school_fee_2', 0.0)
    120             if amount and not local(student) and not student.is_jupeb \
    121                 and student.faccode != 'PRE':
     120            if amount and not local(student) and not student.faccode in ('PRE', 'JUPEB'):
    122121                amount += 40000
    123122        elif category == 'clearance':
    … …  
    133132            if student.faccode == 'PRE':
    134133                amount = 20000.0
    135             if student.is_jupeb:
     134            if student.faccode == 'JUPEB':
    136135                amount = 25000.0
    137136        elif category == 'bed_allocation':

  • main/kofacustom.unidel/trunk/src/kofacustom/unidel/utils/utils.py

    r17204 r17278  
    7070        'basic_de': 'UAS, PUTME, PUDE, PCE, PRENCE',
    7171        'no': 'No Application',
    72         'pre': 'Pre-Degree Studies',
    73         'jupeb': 'JUPEB Pre-Degree (Foundation) Studies',
     72        'pre': 'Pre-Degree Programmes',
     73        'jupeb': 'JUPEB Pre-Degree (Foundation) Programmes',
     74        'ijmb': 'IJMB Foundation School Programmes',
    7475        'dp_ft': 'Full-Time Diploma Programmes',
    7576        'dp_pt': 'Part-Time Diploma Programmes',
Note: See TracChangeset for help on using the changeset viewer.