Changeset 8991

Timestamp:

12 Jul 2012, 21:00:03 (12 years ago)

Author:

Henrik Bettermann

Message:

Merged with waeup.uniben 8987:8988.

Location:

main/waeup.aaue/trunk/src/waeup/aaue

Files:

• . (modified) (1 prop)
• applicants/tests/test_browser.py (modified) (4 diffs)
• students/student.py (modified) (1 diff)

main/waeup.aaue/trunk/src/waeup/aaue/applicants/tests/test_browser.py

@@ -345 +345 @@
             'nysc_year,password,perm_address,phone,pp_school,presently_inst,'
             'reg_number,result_uploaded,screening_date,screening_score,screening_venue,sex,'
-            'state,student_id,'
+            'state,student_id,suspended,'
             'container_code'
             in result)
@@ -352 +352 @@
             '"Some notice\nin lines.",,,any password,,+234-123-12345,,,'
             '123456,,"Saturday, 16th June 2012 2:00:00 PM",98,Exam Room,f,'
-            'initialized,,dp2011'
+            'initialized,,0,dp2011'
             in result)
         # We can import the same file if we ignore some columns.
@@ -371 +371 @@
             'reg_number','result_uploaded',
             'screening_date','screening_score','screening_venue','sex',
-            'state','student_id','container_code'],
+            'state','student_id','suspended','container_code'],
             mode='create')
         num_succ, num_fail, finished_path, failed_path = result
@@ -395 +395 @@
             'reg_number','result_uploaded','screening_date','screening_score',
             'screening_venue','sex',
-            'state','student_id','ignore_container_code'],
+            'state','student_id','suspended','ignore_container_code'],
             mode='update')
         num_succ, num_fail, finished_path, failed_path = result

main/waeup.aaue/trunk/src/waeup/aaue/students/student.py

@@ -22 +22 @@
 from zope.interface import implementedBy
 from waeup.kofa.utils.helpers import attrs_to_fields
-from waeup.kofa.students.student import Student, StudentFactory
+from waeup.kofa.students.student import StudentFactory
 from waeup.kofa.students.interfaces import IStudentNavigation
+from kofacustom.nigeria.students.student import NigeriaStudent
 from waeup.aaue.students.interfaces import ICustomStudent
 
 
-class CustomStudent(Student):
+class CustomStudent(NigeriaStudent):
     """This is a student container for the various objects
     owned by students.