Ignore:
Timestamp:
12 Jul 2012, 20:59:40 (12 years ago)
Author:
Henrik Bettermann
Message:

Merged with waeup.uniben 8987:8988.

Location:
main/waeup.futminna/trunk/src/waeup/futminna
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • main/waeup.futminna/trunk/src/waeup/futminna

  • main/waeup.futminna/trunk/src/waeup/futminna/applicants/tests/test_browser.py

    r8932 r8989  
    345345            'nysc_year,password,perm_address,phone,pp_school,presently_inst,'
    346346            'reg_number,result_uploaded,screening_date,screening_score,screening_venue,sex,'
    347             'state,student_id,'
     347            'state,student_id,suspended,'
    348348            'container_code'
    349349            in result)
     
    352352            '"Some notice\nin lines.",,,any password,,+234-123-12345,,,'
    353353            '123456,,"Saturday, 16th June 2012 2:00:00 PM",98,Exam Room,f,'
    354             'initialized,,dp2011'
     354            'initialized,,0,dp2011'
    355355            in result)
    356356        # We can import the same file if we ignore some columns.
     
    371371            'reg_number','result_uploaded',
    372372            'screening_date','screening_score','screening_venue','sex',
    373             'state','student_id','container_code'],
     373            'state','student_id','suspended','container_code'],
    374374            mode='create')
    375375        num_succ, num_fail, finished_path, failed_path = result
     
    395395            'reg_number','result_uploaded','screening_date','screening_score',
    396396            'screening_venue','sex',
    397             'state','student_id','ignore_container_code'],
     397            'state','student_id','suspended','ignore_container_code'],
    398398            mode='update')
    399399        num_succ, num_fail, finished_path, failed_path = result
  • main/waeup.futminna/trunk/src/waeup/futminna/students/student.py

    r8869 r8989  
    2222from zope.interface import implementedBy
    2323from waeup.kofa.utils.helpers import attrs_to_fields
    24 from waeup.kofa.students.student import Student, StudentFactory
     24from waeup.kofa.students.student import StudentFactory
    2525from waeup.kofa.students.interfaces import IStudentNavigation
     26from kofacustom.nigeria.students.student import NigeriaStudent
    2627from waeup.futminna.students.interfaces import ICustomStudent
    2728
    2829
    29 class CustomStudent(Student):
     30class CustomStudent(NigeriaStudent):
    3031    """This is a student container for the various objects
    3132    owned by students.
Note: See TracChangeset for help on using the changeset viewer.