Changeset 9295

Timestamp:

4 Oct 2012, 20:40:29 (12 years ago)

Author:

Henrik Bettermann

Message:

Set validation_date and validated_by in study level objects when importing verdicts.

Location:

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

Files:

• batching.py (modified) (2 diffs)
• tests/test_batching.py (modified) (1 diff)
• workflow.py (modified) (1 diff)

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

@@ -27 +27 @@
 import csv
 from time import time
+from datetime import datetime
 from zope.interface import Interface
 from zope.schema import getFields
@@ -762 +763 @@
         if obj.__parent__.state == REGISTERED:
             IWorkflowInfo(obj.__parent__).fireTransition('bypass_validation')
+            obj[level_string].validated_by = _('System')
+            obj[level_string].validation_date = datetime.utcnow()
         else:
             IWorkflowInfo(obj.__parent__).fireTransition('return')

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

@@ -988 +988 @@
         student = self.processor.getParent(
             dict(matric_number='100005'), self.app)
-        self.assertEqual(studycourse.current_verdict, '0')
         self.assertEqual(student.state, 'returning')
+        self.assertEqual(student['studycourse'].current_verdict, 'A')
         self.assertEqual(studycourse.current_level, 200)
+        self.assertEqual(student['studycourse']['200'].validated_by, 'System')
+        self.assertTrue(isinstance(
+            student['studycourse']['200'].validation_date, datetime.datetime))
         content = open(fail_file).read()
         self.assertEqual(

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

@@ -166 +166 @@
         transition_id = 'bypass_validation',
         title = _('Return and bypass validation'),
-        msg = _("Returned"),
+        msg = _("Course validation bypassed"),
         source = REGISTERED,
         destination = RETURNING),