Changeset 8284

Timestamp:

26 Apr 2012, 11:30:32 (13 years ago)

Author:

Henrik Bettermann

Message:

Allow empty reg_state cells. This is necessary particularly during mixed updates.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/students

Files:

• batching.py (modified) (2 diffs)
• tests/sample_student_data.csv (modified) (1 diff)
• tests/sample_student_data_migration.csv (modified) (1 diff)
• tests/sample_student_data_update.csv (modified) (1 diff)
• tests/test_batching.py (modified) (5 diffs)

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

@@ -166 +166 @@
 
         # Update registration state
-        if 'reg_state' in row.keys(): # and row['reg_state'] not in (IGNORE_MARKER, ''):
+        reg_state = row.get('reg_state', IGNORE_MARKER)
+        if reg_state not in (IGNORE_MARKER, ''):
             value = row['reg_state']
             IWorkflowState(obj).setState(value)
@@ -220 +221 @@
         if row.has_key('reg_state') and \
             not row['reg_state'] in IMPORTABLE_STATES:
-            if row['reg_state'] != '':
+            if row['reg_state'] not in (IGNORE_MARKER, ''):
                 errs.append(('reg_state','not allowed'))
-            else:
-                errs.append(('reg_state','no value provided'))
+            #else:
+            #    errs.append(('reg_state','no value provided'))
         return errs, inv_errs, conv_dict
 

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

@@ -1 +1 @@
 student_id,firstname,lastname,reg_number,date_of_birth,matric_number,email,phone,sex,reg_state
 X666666,Aaren,Pieri,1,1990-01-02,100000,aa@aa.ng,1234,m,courses validated
-,Claus,Finau,2,1990-01-03,100001,aa@aa.ng,1234,m,courses validated
+Y777777,Claus,Finau,2,1990-01-03,100001,aa@aa.ng,1234,m,courses validated
 ,Susann,Berson,3,1990-01-04,100002,aa@aa.ng,1234,f,courses validated
 ,Else,Mueller,4,1990-01-05,100003,aa@aa.ng,1234,f,courses registered

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/sample_student_data_migration.csv

@@ -4 +4 @@
 C123456,Aaren,Berson,3,1990-01-04,100002,aa@aa.ng,1234,mypw1,m,admitted
 D123456,John,Wolter,4,1990-01-05,100003,aa@aa.ng,1234,mypw1,m,nonsense
-E123456,John,Kennedy,5,1990-01-06,100004,aa@aa.ng,1234,,x
+E123456,John,Kennedy,5,1990-01-06,100004,aa@aa.ng,1234,,x,
+F123456,Frank,Meyer,5,1990-01-06,100004,aa@aa.ng,1234,,m,

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/sample_student_data_update.csv

@@ -1 @@
-reg_number,date_of_birth,matric_number
-1,1980-01-02,10
-2,1980-01-03,11
-3,1980-01-04,12
+reg_number,date_of_birth,matric_number,reg_state
+1,1980-01-02,10,admitted
+2,1980-01-03,11,
+3,1980-01-04,12,

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

@@ -222 +222 @@
             dict(reg_number='1', reg_state='admitted'))
         self.assertEqual(len(errs),0)
+        # Empty reg_state is allowed
         errs, inv_errs, conv_dict = self.processor.checkConversion(
             dict(reg_number='1', reg_state=''))
-        self.assertEqual(len(errs),1)
-        self.assertTrue(('reg_state', 'no value provided') in errs)
+        self.assertEqual(len(errs),0)
+        #self.assertTrue(('reg_state', 'no value provided') in errs)
         errs, inv_errs, conv_dict = self.processor.checkConversion(
             dict(reg_number='1', reg_state='nonsense'))
@@ -243 +244 @@
         assert len(self.app['students'].keys()) == 5
         self.assertEqual(self.app['students']['X666666'].reg_number,'1')
+        self.assertEqual(self.app['students']['X666666'].state,'courses validated')
         shutil.rmtree(os.path.dirname(fin_file))
 
@@ -252 +254 @@
             self.csv_file_update, STUDENT_HEADER_FIELDS_UPDATE, 'update')
         self.assertEqual(num_warns,0)
+        # reg_state has changed
+        self.assertEqual(self.app['students']['X666666'].state,'admitted')
+        # reg_state has not changed
+        self.assertEqual(self.app['students']['Y777777'].state,'courses validated')
         shutil.rmtree(os.path.dirname(fin_file))
 
@@ -290 +296 @@
         num, num_warns, fin_file, fail_file = self.processor.doImport(
             self.csv_file_migration, STUDENT_HEADER_FIELDS_MIGRATION)
+        content = open(fail_file).read()
         self.assertEqual(num_warns,2)
-        assert len(self.app['students'].keys()) == 4
-        content = open(fail_file).read()
+        assert len(self.app['students'].keys()) == 5
         self.assertEqual(
             content,
             'reg_number,firstname,student_id,sex,email,phone,date_of_birth,reg_state,lastname,password,matric_number,--ERRORS--\r\n'
             '4,John,D123456,m,aa@aa.ng,1234,1990-01-05,nonsense,Wolter,mypw1,100003,reg_state: not allowed\r\n'
-            '5,John,E123456,x,aa@aa.ng,1234,1990-01-06,,Kennedy,,100004,sex: Invalid value; reg_state: not allowed\r\n'
+            '5,John,E123456,x,aa@aa.ng,1234,1990-01-06,,Kennedy,,100004,sex: Invalid value\r\n'
             )
         self.assertTrue('A123456' in self.app['students'].keys())
@@ -311 +317 @@
         self.assertTrue(
             "State 'clearance started' set by system" in history)
+        # reg_state was empty and student is thus in state created
+        self.assertEqual(self.app['students']['F123456'].state,'created')
         shutil.rmtree(os.path.dirname(fin_file))