Changeset 7643

Timestamp:

14 Feb 2012, 09:32:28 (13 years ago)

Author:

Henrik Bettermann

Message:

Enable mixed imports of rows with or without student_id.

Location:

main/waeup.sirp/trunk/src/waeup/sirp/students

Files:

• batching.py (modified) (3 diffs)
• tests/sample_student_data.csv (modified) (1 diff)
• tests/test_batching.py (modified) (1 diff)

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

@@ -156 +156 @@
         """Update obj to the values given in row.
         """
+        # Remove student_id from row if empty
+        if row.has_key('student_id') and row['student_id'] is None:
+            row.pop('student_id')
         for key, value in row.items():
             # Set student password and all fields declared in interface.
@@ -188 +191 @@
         """Validates all values in row.
         """
+        iface = self.iface
         if mode in ['update', 'remove']:
             if self.getLocator(row) == 'reg_number':
@@ -193 +197 @@
             elif self.getLocator(row) == 'matric_number':
                 iface = IStudentUpdateByMatricNo
-        else:
-            iface = self.iface
         converter = IObjectConverter(iface)
         errs, inv_errs, conv_dict =  converter.fromStringDict(

main/waeup.sirp/trunk/src/waeup/sirp/students/tests/sample_student_data.csv

@@ -1 @@
-firstname,lastname,reg_number,date_of_birth,matric_number,email,phone
-Aaren,Pieri,1,1990-01-02,100000,aa@aa.ng,1234
-Aaren,Finau,2,1990-01-03,100001,aa@aa.ng,1234
-Aaren,Berson,3,1990-01-04,100002,aa@aa.ng,1234
+student_id,firstname,lastname,reg_number,date_of_birth,matric_number,email,phone
+X666666,Aaren,Pieri,1,1990-01-02,100000,aa@aa.ng,1234
+,Aaren,Finau,2,1990-01-03,100001,aa@aa.ng,1234
+,Aaren,Berson,3,1990-01-04,100002,aa@aa.ng,1234

main/waeup.sirp/trunk/src/waeup/sirp/students/tests/test_batching.py

@@ -201 +201 @@
         self.assertEqual(num_warns,0)
         assert len(self.app['students'].keys()) == 4
+        self.assertEqual(self.app['students']['X666666'].reg_number,'1')
         shutil.rmtree(os.path.dirname(fin_file))