Changeset 13142 for main/kofacustom.nigeria/trunk/src/kofacustom/nigeria
- Timestamp:
- 6 Jul 2015, 10:43:26 (9 years ago)
- Location:
- main/kofacustom.nigeria/trunk/src/kofacustom/nigeria
- Files:
-
- 5 edited
-
applicants/browser.py (modified) (5 diffs)
-
applicants/interfaces.py (modified) (3 diffs)
-
applicants/tests/test_browser.py (modified) (3 diffs)
-
applicants/utils.py (modified) (1 diff)
-
utils/utils.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/applicants/browser.py
r13140 r13142 43 43 UG_OMIT_MANAGE_FIELDS, 44 44 UG_OMIT_EDIT_FIELDS, 45 CBT_OMIT_DISPLAY_FIELDS, 46 CBT_OMIT_PDF_FIELDS, 47 CBT_OMIT_MANAGE_FIELDS, 48 CBT_OMIT_EDIT_FIELDS, 45 49 PG_OMIT_DISPLAY_FIELDS, 46 50 PG_OMIT_PDF_FIELDS, … … 93 97 for field in PG_OMIT_DISPLAY_FIELDS: 94 98 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) 95 103 elif self.target is not None and self.target.startswith('putme'): 96 104 form_fields = grok.AutoFields(INigeriaUGApplicant) … … 138 146 for field in PG_OMIT_PDF_FIELDS: 139 147 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) 140 152 elif self.target is not None and self.target.startswith('putme'): 141 153 form_fields = grok.AutoFields(INigeriaUGApplicant) … … 182 194 for field in PG_OMIT_MANAGE_FIELDS: 183 195 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) 184 200 elif self.target is not None and self.target.startswith('putme'): 185 201 form_fields = grok.AutoFields(INigeriaUGApplicant) … … 211 227 form_fields = grok.AutoFields(INigeriaPGApplicant) 212 228 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: 213 233 form_fields = form_fields.omit(field) 214 234 elif self.target is not None and self.target.startswith('putme'): -
main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/applicants/interfaces.py
r13140 r13142 45 45 UG_OMIT_MANAGE_FIELDS = ('special_application',) 46 46 UG_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. 59 CBT_OMIT_FIELDS = ( 60 'hq_type', 'hq_matric_no', 61 'hq_degree', 'hq_school', 62 'hq_session', 'hq_disc',) 63 CBT_OMIT_DISPLAY_FIELDS = OMIT_DISPLAY_FIELDS + CBT_OMIT_FIELDS 64 CBT_OMIT_MANAGE_FIELDS = UG_OMIT_MANAGE_FIELDS + CBT_OMIT_FIELDS 65 CBT_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') 76 CBT_OMIT_PDF_FIELDS = CBT_OMIT_DISPLAY_FIELDS + ('phone',) 51 77 52 78 # PUTME is a subgroup of UG with the same interface. … … 159 185 jamb_subjects = schema.Text( 160 186 title = _(u'Subjects and Scores'), 187 description = _(u'(one subject with score per line)'), 161 188 required = False, 162 189 ) … … 165 192 required = False, 166 193 ) 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'), 169 200 required = False, 170 201 ) -
main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/applicants/tests/test_browser.py
r13092 r13142 365 365 'display_fullname,email,emp2_end,emp2_position,emp2_reason,' 366 366 '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 374 377 ',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') 380 384 # We can import the same file if we ignore some columns. 381 385 # Since the applicants_catalog hasn't been notified, the same … … 386 390 ['aggregate','ignore_applicant_id','application_date','ignore_application_number', 387 391 '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', 389 393 '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', 396 403 'translated_state'], 397 404 mode='create') … … 410 417 ['aggregate','ignore_applicant_id','application_date','ignore_application_number', 411 418 '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', 413 420 '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', 420 430 'translated_state'], 421 431 mode='update') -
main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/applicants/utils.py
r13140 r13142 41 41 'pgft': ['Postgraduate Full-Time Programmes', 'PG'], 42 42 'pgpt': ['Postgraduate Part-Time Programmes', 'PG'], 43 'pre': ['Pre-Degree Studies', 'PRE'], 44 'cbt': ['Post-UTME CBT Praxis Test', 'CBT'], 43 45 } 44 46 -
main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/utils/utils.py
r13126 r13142 261 261 'sandwich': 'Sandwich', 262 262 'cest': 'Part-Time, Diploma, Certificate', 263 'pre': 'Pre-Degree Studies', 264 'cbt': 'Post-UTME CBT Praxis Test', 263 265 } 264 266
Note: See TracChangeset for help on using the changeset viewer.
