Changeset 8584

Timestamp:

31 May 2012, 20:34:44 (12 years ago)

Author:

Henrik Bettermann

Message:

Update according to r8577 - r8582.

Location:

main/waeup.fceokene/trunk/src/waeup/fceokene

Files:

• applicants/batching.py (modified) (2 diffs)
• applicants/interfaces.py (modified) (5 diffs)
• applicants/tests.py (modified) (4 diffs)
• students/batching.py (modified) (2 diffs)
• students/interfaces.py (modified) (1 diff)

main/waeup.fceokene/trunk/src/waeup/fceokene/applicants/batching.py

@@ -21 +21 @@
 from waeup.kofa.utils.batching import BatchProcessor
 from waeup.kofa.applicants.batching import ApplicantProcessor
-from waeup.fceokene.applicants.interfaces import ICustomApplicant
+from waeup.fceokene.applicants.interfaces import (
+    ICustomApplicant, ICustomApplicantUpdateByRegNo)
 
 class CustomApplicantProcessor(ApplicantProcessor):
@@ -36 +37 @@
     """
     iface = ICustomApplicant
+    iface_byregnumber = ICustomApplicantUpdateByRegNo

main/waeup.fceokene/trunk/src/waeup/fceokene/applicants/interfaces.py

@@ -38 +38 @@
 UG_OMIT_MANAGE_FIELDS = ()
 UG_OMIT_EDIT_FIELDS = UG_OMIT_MANAGE_FIELDS + ('locked', 'course_admitted',
-    'student_id', 'screening_score', 'screening_venue', 'notice')
+    'student_id', 'screening_score', 'screening_venue', 'notice',
+    'screening_date')
 PUTME_OMIT_EDIT_FIELDS = UG_OMIT_EDIT_FIELDS + (
     'firstname', 'middlename', 'lastname', 'sex',
@@ -48 +49 @@
 PG_OMIT_EDIT_FIELDS = PG_OMIT_MANAGE_FIELDS + (
     'locked', 'course_admitted',
-    'student_id', 'screening_score', 'screening_venue', 'notice')
+    'student_id', 'screening_score', 'screening_venue', 'notice',
+    'screening_date')
 
 class IUGApplicant(IApplicantBaseData):
@@ -96 +98 @@
     screening_venue = schema.TextLine(
         title = _(u'Screening Venue'),
+        required = False,
+        )
+    screening_date = schema.TextLine(
+        title = _(u'Screening Date'),
         required = False,
         )
@@ -271 +277 @@
         readonly = False,
         )
+    screening_date = schema.TextLine(
+        title = _(u'Screening Date'),
+        required = False,
+        )
     screening_score = schema.Int(
         title = _(u'Screening Score'),
@@ -361 +371 @@
 IPUTMEApplicantEdit[
     'email'].order =  IUGApplicant['email'].order
+
+class ICustomApplicantUpdateByRegNo(ICustomApplicant):
+    """Representation of an applicant.
+
+    Skip regular reg_number validation if reg_number is used for finding
+    the applicant object.
+    """
+    reg_number = schema.TextLine(
+        title = u'Registration Number',
+        required = False,
+        )

main/waeup.fceokene/trunk/src/waeup/fceokene/applicants/tests.py

@@ -36 +36 @@
 from waeup.fceokene.testing import FunctionalLayer
 from waeup.fceokene.applicants.export import CustomApplicantsExporter
+from waeup.fceokene.applicants.batching import CustomApplicantProcessor
 
 
@@ -235 +236 @@
         applicant.screening_score = 98
         applicant.screening_venue = u'Exam Room'
+        applicant.screening_date = u'Saturday, 16th June 2012 2:00:00 PM'
         applicant.password = 'any password'
         return applicant
 
-    def test_export_all(self):
+    def test_export_reimport_all(self):
         # we can export all applicants in a portal
         # set values we can expect in export file
@@ -257 +259 @@
             'nationality,notice,nysc_lga,'
             'nysc_year,password,perm_address,phone,pp_school,presently_inst,'
-            'reg_number,screening_score,screening_venue,sex,state,student_id,'
+            'reg_number,screening_date,screening_score,screening_venue,sex,'
+            'state,student_id,'
             'container_code'
             in result)
@@ -263 +266 @@
             'Application initialized by system\'],,,,,,,,,Tester,,0,M.,,'
             '"Some notice\nin lines.",,,any password,,+234-123-12345,,,'
-            '123456,98,Exam Room,f,initialized,,dp2011' in result)
-        return
+            '123456,"Saturday, 16th June 2012 2:00:00 PM",98,Exam Room,f,'
+            'initialized,,dp2011' in result)
+        # We can import the same file with if we ignore some columns.
+        # Since the applicants_catalog hasn't been notified, the same
+        # record with same reg_number can be imported twice.
+        processor = CustomApplicantProcessor()
+        result = processor.doImport(
+            self.outfile,
+            ['ignore1','application_date','ignore2','course1','course2',''
+            'course_admitted','date_of_birth','ignore3','email','emp2_end',''
+            'emp2_position','emp2_reason','emp2_start','emp_end','emp_position',''
+            'emp_reason','emp_start','employer','employer2','firstname','ignore4',''
+            'hq_degree','hq_disc','hq_matric_no','hq_school','hq_session','hq_type',''
+            'jamb_score','jamb_subjects','lastname','lga','locked','middlename',''
+            'nationality','notice','nysc_lga',''
+            'nysc_year','password','perm_address','phone','pp_school','presently_inst',''
+            'reg_number','screening_date','screening_score','screening_venue','sex',''
+            'state','student_id','container_code'],
+            mode='create')
+        num_succ, num_fail, finished_path, failed_path = result
+        self.assertEqual(num_succ,1)
+        self.assertEqual(num_fail,0)
+        return

main/waeup.fceokene/trunk/src/waeup/fceokene/students/batching.py

@@ -25 +25 @@
 """
 from waeup.fceokene.students.interfaces import (
-    ICustomStudent,
+    ICustomStudent, ICustomStudentUpdateByRegNo,
+    ICustomStudentUpdateByMatricNo
     )
 from waeup.kofa.students.batching import StudentProcessor
@@ -33 +34 @@
     """
     iface = ICustomStudent
+    iface_byregnumber = ICustomStudentUpdateByRegNo
+    iface_bymatricnumber = ICustomStudentUpdateByMatricNo

main/waeup.fceokene/trunk/src/waeup/fceokene/students/interfaces.py

@@ -382 +382 @@
 
     """
+
+class ICustomStudentUpdateByRegNo(ICustomStudent):
+    """Representation of a student. Skip regular reg_number validation.
+
+    """
+    reg_number = schema.TextLine(
+        title = _(u'Registration Number'),
+        required = False,
+        )
+
+class ICustomStudentUpdateByMatricNo(ICustomStudent):
+    """Representation of a student. Skip regular matric_number validation.
+
+    """
+    matric_number = schema.TextLine(
+        title = _(u'Matriculation Number'),
+        required = False,
+        )