Changeset 13142


Ignore:
Timestamp:
6 Jul 2015, 10:43:26 (9 years ago)
Author:
Henrik Bettermann
Message:

Implement CBT application (Uniben).
Extend ug application interface. Redefine omit tuples.
Remove jamb_age field.

Location:
main/kofacustom.nigeria/trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • main/kofacustom.nigeria/trunk/CHANGES.txt

    r13015 r13142  
    441.2 (unreleased)
    55================
     6
     7- Implement CBT application (Uniben).
     8  Extend ug application interface. Redefine omit tuples.
     9  Remove `jamb_age` field.
     10
     11- Implement JUPEB pre-studies application (Uniben).
     12  Extend pg application interface.
    613
    714- Payment tickets must not be submitted to Interswitch if they
     
    1724  (mutltiples of Kobos) not floats.
    1825
    19 - Add 'jamb_age' field.
     26- Add `jamb_age` field.
    2027
    21 - Check if same payment has been made before calling 'goto_interswitch'.
     28- Check if same payment has been made before calling `goto_interswitch`.
    2229
    2330- Add interswitch browser tests and add/modify components which are needed
     
    3441  sitting exam type.
    3542
    36 - Add LGA 'Akwa Ibom / Nsit-Atai'.
     43- Add LGA `Akwa Ibom / Nsit-Atai`.
    3744
    3845- Do not show current current level in student base data section on
  • main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/applicants/browser.py

    r13140 r13142  
    4343    UG_OMIT_MANAGE_FIELDS,
    4444    UG_OMIT_EDIT_FIELDS,
     45    CBT_OMIT_DISPLAY_FIELDS,
     46    CBT_OMIT_PDF_FIELDS,
     47    CBT_OMIT_MANAGE_FIELDS,
     48    CBT_OMIT_EDIT_FIELDS,
    4549    PG_OMIT_DISPLAY_FIELDS,
    4650    PG_OMIT_PDF_FIELDS,
     
    9397            for field in PG_OMIT_DISPLAY_FIELDS:
    9498                form_fields = form_fields.omit(field)
     99        elif self.target is not None and self.target.startswith('cbt'):
     100            form_fields = grok.AutoFields(INigeriaUGApplicant)
     101            for field in CBT_OMIT_DISPLAY_FIELDS:
     102                form_fields = form_fields.omit(field)
    95103        elif self.target is not None and self.target.startswith('putme'):
    96104            form_fields = grok.AutoFields(INigeriaUGApplicant)
     
    138146            for field in PG_OMIT_PDF_FIELDS:
    139147                form_fields = form_fields.omit(field)
     148        elif self.target is not None and self.target.startswith('cbt'):
     149            form_fields = grok.AutoFields(INigeriaUGApplicant)
     150            for field in CBT_OMIT_PDF_FIELDS:
     151                form_fields = form_fields.omit(field)
    140152        elif self.target is not None and self.target.startswith('putme'):
    141153            form_fields = grok.AutoFields(INigeriaUGApplicant)
     
    182194            for field in PG_OMIT_MANAGE_FIELDS:
    183195                form_fields = form_fields.omit(field)
     196        elif self.target is not None and self.target.startswith('cbt'):
     197            form_fields = grok.AutoFields(INigeriaUGApplicant)
     198            for field in CBT_OMIT_MANAGE_FIELDS:
     199                form_fields = form_fields.omit(field)
    184200        elif self.target is not None and self.target.startswith('putme'):
    185201            form_fields = grok.AutoFields(INigeriaUGApplicant)
     
    211227            form_fields = grok.AutoFields(INigeriaPGApplicant)
    212228            for field in PG_OMIT_EDIT_FIELDS:
     229                form_fields = form_fields.omit(field)
     230        elif self.target is not None and self.target.startswith('cbt'):
     231            form_fields = grok.AutoFields(INigeriaUGApplicant)
     232            for field in CBT_OMIT_EDIT_FIELDS:
    213233                form_fields = form_fields.omit(field)
    214234        elif self.target is not None and self.target.startswith('putme'):
  • main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/applicants/interfaces.py

    r13140 r13142  
    4545UG_OMIT_MANAGE_FIELDS = ('special_application',)
    4646UG_OMIT_EDIT_FIELDS = UG_OMIT_MANAGE_FIELDS + OMIT_DISPLAY_FIELDS + (
    47     'student_id', 'notice',
    48     'screening_score', 'screening_venue',
    49     'screening_date', 'jamb_age', 'jamb_subjects',
    50     'jamb_score', 'aggregate')
     47    'student_id',
     48    'notice',
     49    'screening_score',
     50    'screening_venue',
     51    'screening_date',
     52    #'jamb_age',
     53    'jamb_subjects',
     54    'jamb_score',
     55    'jamb_reg_number',
     56    'aggregate')
     57
     58# CBT is a subgroup of UG with the same interface.
     59CBT_OMIT_FIELDS = (
     60    'hq_type', 'hq_matric_no',
     61    'hq_degree', 'hq_school',
     62    'hq_session', 'hq_disc',)
     63CBT_OMIT_DISPLAY_FIELDS = OMIT_DISPLAY_FIELDS + CBT_OMIT_FIELDS
     64CBT_OMIT_MANAGE_FIELDS = UG_OMIT_MANAGE_FIELDS + CBT_OMIT_FIELDS
     65CBT_OMIT_EDIT_FIELDS = UG_OMIT_MANAGE_FIELDS + OMIT_DISPLAY_FIELDS + CBT_OMIT_FIELDS + (
     66    'student_id',
     67    'notice',
     68    'screening_score',
     69    'screening_venue',
     70    'screening_date',
     71    #'jamb_age',
     72    #'jamb_subjects',
     73    #'jamb_score',
     74    #'jamb_reg_number',
     75    'aggregate')
     76CBT_OMIT_PDF_FIELDS = CBT_OMIT_DISPLAY_FIELDS + ('phone',)
    5177
    5278# PUTME is a subgroup of UG with the same interface.
     
    159185    jamb_subjects = schema.Text(
    160186        title = _(u'Subjects and Scores'),
     187        description = _(u'(one subject with score per line)'),
    161188        required = False,
    162189        )
     
    165192        required = False,
    166193        )
    167     jamb_age = schema.Int(
    168         title = _(u'Age (provided by JAMB)'),
     194    #jamb_age = schema.Int(
     195    #    title = _(u'Age (provided by JAMB)'),
     196    #    required = False,
     197    #    )
     198    jamb_reg_number = schema.TextLine(
     199        title = _(u'JAMB Registration Number'),
    169200        required = False,
    170201        )
  • main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/applicants/tests/test_browser.py

    r13092 r13142  
    365365            'display_fullname,email,emp2_end,emp2_position,emp2_reason,'
    366366            'emp2_start,emp_end,emp_position,emp_reason,emp_start,employer,'
    367             'employer2,firstname,history,hq_degree,hq_disc,hq_matric_no,'
    368             'hq_school,hq_session,hq_type,jamb_age,jamb_score,jamb_subjects,'
    369             'lastname,lga,locked,middlename,nationality,notice,nysc_lga,'
    370             'nysc_year,password,phone,pp_school,presently_inst,reg_number,'
    371             'result_uploaded,screening_date,screening_score,screening_venue,'
    372             'sex,special,special_application,state,student_id,suspended,'
    373             'translated_state\r\n'
     367            'employer2,firstname,fst_sit_date,fst_sit_fname,fst_sit_no,'
     368            'fst_sit_results,fst_sit_type,history,hq_degree,hq_disc,'
     369            'hq_matric_no,hq_school,hq_session,hq_type,jamb_reg_number,'
     370            'jamb_score,jamb_subjects,lastname,lga,locked,middlename,'
     371            'nationality,notice,nysc_lga,nysc_year,password,phone,'
     372            'presently_inst,reg_number,result_uploaded,scd_sit_date,'
     373            'scd_sit_fname,scd_sit_no,scd_sit_results,scd_sit_type,'
     374            'screening_date,screening_score,screening_venue,sex,special,'
     375            'special_application,state,student_id,suspended,translated_state\r\n'
     376
    374377            ',dp2011_654321,,654321,dp2011,CERT1,CERT1,CERT1,1981-02-04#,'
    375             'Anna M. Tester,anna@sample.com,,,,,,,,,,,Anna,'
    376             '[u\'2015-06-23 07:31:05 WAT - Application initialized by system\']'
    377             ',,,,,,,,,,Tester,,0,M.,NG,"Some notice in lines.",,,any password,'
    378             '+234-123-12345#,,,123456,,"Saturday, 16th June 2012 2:00:00 PM",'
    379             '98,Exam Room,f,,,initialized,,0,initialized\r\n')
     378            'Anna M. Tester,anna@sample.com,,,,,,,,,,,Anna,,,,,,'
     379            '[u\'2015-07-06 11:21:22 WAT - Application initialized by system\']'
     380            ',,,,,,,,,,Tester,,0,M.,NG,"Some notice\nin lines.",,,'
     381            'any password,+234-123-12345#,,123456,,,,,,,'
     382            '"Saturday, 16th June 2012 2:00:00 PM",98,Exam Room,f,,,'
     383            'initialized,,0,initialized\r\n')
    380384        # We can import the same file if we ignore some columns.
    381385        # Since the applicants_catalog hasn't been notified, the same
     
    386390            ['aggregate','ignore_applicant_id','application_date','ignore_application_number',
    387391            'container_code','course1','course2','course_admitted','date_of_birth',
    388             'ignore_display_fullname','email','emp2_end','emp2_position','emp2_reason',
     392            'display_fullname','email','emp2_end','emp2_position','emp2_reason',
    389393            'emp2_start','emp_end','emp_position','emp_reason','emp_start','employer',
    390             'employer2','firstname','ignore_history','hq_degree','hq_disc','hq_matric_no',
    391             'hq_school','hq_session','hq_type','jamb_age','jamb_score','jamb_subjects',
    392             'lastname','lga','locked','middlename','nationality','notice','nysc_lga',
    393             'nysc_year','password','phone','pp_school','presently_inst','reg_number',
    394             'result_uploaded','screening_date','screening_score','screening_venue',
    395             'sex','ignore_special','special_application','state','student_id','suspended',
     394            'employer2','firstname','fst_sit_date','fst_sit_fname','fst_sit_no',
     395            'fst_sit_results','fst_sit_type','history','hq_degree','hq_disc',
     396            'hq_matric_no','hq_school','hq_session','hq_type','jamb_reg_number',
     397            'jamb_score','jamb_subjects','lastname','lga','locked','middlename',
     398            'nationality','notice','nysc_lga','nysc_year','password','phone',
     399            'presently_inst','reg_number','result_uploaded','scd_sit_date',
     400            'scd_sit_fname','scd_sit_no','scd_sit_results','scd_sit_type',
     401            'screening_date','screening_score','screening_venue','sex','special',
     402            'special_application','state','student_id','suspended',
    396403            'translated_state'],
    397404            mode='create')
     
    410417            ['aggregate','ignore_applicant_id','application_date','ignore_application_number',
    411418            'ignore_container_code','course1','course2','course_admitted','date_of_birth',
    412             'ignore_display_fullname','email','emp2_end','emp2_position','emp2_reason',
     419            'display_fullname','email','emp2_end','emp2_position','emp2_reason',
    413420            'emp2_start','emp_end','emp_position','emp_reason','emp_start','employer',
    414             'employer2','firstname','ignore_history','hq_degree','hq_disc','hq_matric_no',
    415             'hq_school','hq_session','hq_type','jamb_age','jamb_score','jamb_subjects',
    416             'lastname','lga','locked','middlename','nationality','notice','nysc_lga',
    417             'nysc_year','password','phone','pp_school','presently_inst','reg_number',
    418             'result_uploaded','screening_date','screening_score','screening_venue',
    419             'sex','ignore_special','special_application','state','student_id','suspended',
     421            'employer2','firstname','fst_sit_date','fst_sit_fname','fst_sit_no',
     422            'fst_sit_results','fst_sit_type','history','hq_degree','hq_disc',
     423            'hq_matric_no','hq_school','hq_session','hq_type','jamb_reg_number',
     424            'jamb_score','jamb_subjects','lastname','lga','locked','middlename',
     425            'nationality','notice','nysc_lga','nysc_year','password','phone',
     426            'presently_inst','reg_number','result_uploaded','scd_sit_date',
     427            'scd_sit_fname','scd_sit_no','scd_sit_results','scd_sit_type',
     428            'screening_date','screening_score','screening_venue','sex','special',
     429            'special_application','state','student_id','suspended',
    420430            'translated_state'],
    421431            mode='update')
  • main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/applicants/utils.py

    r13140 r13142  
    4141        'pgft': ['Postgraduate Full-Time Programmes', 'PG'],
    4242        'pgpt': ['Postgraduate Part-Time Programmes', 'PG'],
     43        'pre': ['Pre-Degree Studies', 'PRE'],
     44        'cbt': ['Post-UTME CBT Praxis Test', 'CBT'],
    4345        }
    4446
  • main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/utils/utils.py

    r13126 r13142  
    261261        'sandwich': 'Sandwich',
    262262        'cest': 'Part-Time, Diploma, Certificate',
     263        'pre': 'Pre-Degree Studies',
     264        'cbt': 'Post-UTME CBT Praxis Test',
    263265        }
    264266
Note: See TracChangeset for help on using the changeset viewer.