Changeset 9282

Timestamp:

3 Oct 2012, 20:46:34 (12 years ago)

Author:

Henrik Bettermann

Message:

Check if new verdict is provided.

Location:

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

Files:

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

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

@@ -732 +732 @@
         if obj.student.state != VALIDATED:
             return 'Student in wrong state.'
+        # Check if new verdict is provided
+        if row['current_verdict'] in (IGNORE_MARKER, ''):
+            return 'Verdict is missing.'
         return None
 

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

@@ -4 +4 @@
 ,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
+X888888,Alfons,Meier,5,1990-01-02,100004,aa@aa.ng,1234,m,courses validated

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

@@ -5 +5 @@
 1,,CERT1,2008,100
 4,,CERT1,2008,200
+5,,CERT1,2008,200

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

@@ -4 +4 @@
 100002,2007,200,C
 100003,2008,200,A
+100004,2008,200,

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

@@ -360 +360 @@
             self.csv_file, STUDENT_HEADER_FIELDS)
         self.assertEqual(num_warns,0)
-        assert len(self.app['students'].keys()) == 5
+        assert len(self.app['students'].keys()) == 6
         self.assertEqual(self.app['students']['X666666'].reg_number,'1')
         self.assertEqual(
@@ -605 +605 @@
         num, num_warns, fin_file, fail_file = self.processor.doImport(
             self.csv_file, VERDICT_HEADER_FIELDS,'update')
-        self.assertEqual(num_warns,3)
+        self.assertEqual(num_warns,4)
         studycourse = self.processor.getEntry(dict(matric_number='100000'),
                                               self.app)
@@ -620 +620 @@
             '2007,C,100002,200,Current session does not correspond.\r\n'
             '2008,A,100003,200,Student in wrong state.\r\n'
+            '2008,<IGNORE>,100004,200,Verdict is missing.\r\n'
             )
         shutil.rmtree(os.path.dirname(fin_file))