Ignore:
Timestamp:
21 Dec 2015, 15:01:34 (9 years ago)
Author:
Henrik Bettermann
Message:

Add field programme_type.

Location:
main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/applicants
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/applicants/interfaces.py

    r13551 r13554  
    3939from kofacustom.nigeria.interfaces import MessageFactory as _
    4040from kofacustom.nigeria.payments.interfaces import INigeriaOnlinePayment
     41
     42programme_types_vocab = SimpleKofaVocabulary(
     43    (_('Post UTME'), 'putme'),
     44    (_('Post DE'), 'pude'),
     45    (_('not applicable'), 'na'),
     46    )
    4147
    4248jambsubjects = SimpleKofaVocabulary(
     
    9399
    94100# UG students are all undergraduate students.
    95 UG_OMIT_DISPLAY_FIELDS = OMIT_DISPLAY_FIELDS + ('jamb_subjects_list',)
     101UG_OMIT_DISPLAY_FIELDS = OMIT_DISPLAY_FIELDS + (
     102    'jamb_subjects_list', 'programme_type')
    96103UG_OMIT_PDF_FIELDS = UG_OMIT_DISPLAY_FIELDS + ('phone',)
    97 UG_OMIT_MANAGE_FIELDS = ('special_application','jamb_subjects_list',)
     104UG_OMIT_MANAGE_FIELDS = (
     105    'special_application',
     106    'jamb_subjects_list',
     107    'programme_type')
    98108UG_OMIT_EDIT_FIELDS = UG_OMIT_MANAGE_FIELDS + OMIT_DISPLAY_FIELDS + (
    99109    'student_id',
     
    113123    'hq_degree', 'hq_school',
    114124    'hq_session', 'hq_disc',
    115     'aggregate', 'jamb_subjects')
     125    'aggregate', 'jamb_subjects',
     126    'programme_type')
    116127CBT_OMIT_DISPLAY_FIELDS = OMIT_DISPLAY_FIELDS + CBT_OMIT_FIELDS
    117128CBT_OMIT_MANAGE_FIELDS = CBT_OMIT_FIELDS + ('special_application',)
     
    152163    'hq_type', 'hq_matric_no',
    153164    'hq_degree', 'hq_school',
    154     'hq_session', 'hq_disc', 'jamb_subjects_list')
     165    'hq_session', 'hq_disc',
     166    'jamb_subjects_list', 'programme_type')
    155167PUTME_OMIT_DISPLAY_FIELDS = OMIT_DISPLAY_FIELDS + PUTME_OMIT_FIELDS
    156168PUTME_OMIT_MANAGE_FIELDS = UG_OMIT_MANAGE_FIELDS + PUTME_OMIT_FIELDS
     
    168180# PUDE is a subgroup of UG with the same interface.
    169181PUDE_OMIT_FIELDS = (
    170     'jamb_subjects','jamb_score', 'jamb_age', 'aggregate', 'jamb_subjects_list')
     182    'jamb_subjects',
     183    'jamb_score',
     184    'jamb_age',
     185    'aggregate',
     186    'jamb_subjects_list',
     187    'programme_type')
    171188PUDE_OMIT_DISPLAY_FIELDS = OMIT_DISPLAY_FIELDS + PUDE_OMIT_FIELDS
    172189PUDE_OMIT_MANAGE_FIELDS = UG_OMIT_MANAGE_FIELDS + PUDE_OMIT_FIELDS
     
    199216    """
    200217
     218    programme_type = schema.Choice(
     219        title = _(u'Programme Type'),
     220        vocabulary = programme_types_vocab,
     221        required = False,
     222        )
     223
    201224    nationality = schema.Choice(
    202225        source = nats_vocab,
  • main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/applicants/tests/test_browser.py

    r13290 r13554  
    443443            'lastname,lga,locked,middlename,'
    444444            'nationality,notice,nysc_lga,nysc_year,password,phone,'
    445             'presently_inst,reg_number,result_uploaded,scd_sit_date,'
     445            'presently_inst,programme_type,reg_number,result_uploaded,scd_sit_date,'
    446446            'scd_sit_fname,scd_sit_no,scd_sit_results,scd_sit_type,'
    447447            'screening_date,screening_score,screening_venue,sex,special,'
     
    453453            ',,,,,,,,,,Line 1++Line 2,"[\'english_language\', \'fine_art\']",'
    454454            'Tester,,0,M.,NG,"Some notice\nin lines.",,,'
    455             'any password,+234-123-12345#,,123456,,,,,,,'
     455            'any password,+234-123-12345#,,,123456,,,,,,,'
    456456            '"Saturday, 16th June 2012 2:00:00 PM",98,Exam Room,f,,,'
    457457            'initialized,,0,initialized\r\n')
     
    473473            'lastname','lga','locked','middlename',
    474474            'nationality','notice','nysc_lga','nysc_year','password','phone',
    475             'presently_inst','reg_number','result_uploaded','scd_sit_date',
     475            'presently_inst','programme_type','reg_number','result_uploaded','scd_sit_date',
    476476            'scd_sit_fname','scd_sit_no','scd_sit_results','scd_sit_type',
    477477            'screening_date','screening_score','screening_venue','sex','special',
     
    502502            'lastname','lga','locked','middlename',
    503503            'nationality','notice','nysc_lga','nysc_year','password','phone',
    504             'presently_inst','reg_number','result_uploaded','scd_sit_date',
     504            'presently_inst','programme_type','reg_number','result_uploaded','scd_sit_date',
    505505            'scd_sit_fname','scd_sit_no','scd_sit_results','scd_sit_type',
    506506            'screening_date','screening_score','screening_venue','sex','special',
Note: See TracChangeset for help on using the changeset viewer.