Changeset 9284 for main/waeup.kofa/trunk/src/waeup/kofa/students/batching.py

Timestamp:

4 Oct 2012, 05:38:17 (12 years ago)

Author:

Henrik Bettermann

Message:

Extend verdict processor. Allow bypassing course validation if rowbypass_validation? is 'True' or '1'.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/students/batching.py (modified) (4 diffs)

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

@@ -35 +35 @@
 from waeup.kofa.interfaces import (
     IBatchProcessor, FatalCSVError, IObjectConverter, IUserAccount,
-    IObjectHistory, VALIDATED, IGNORE_MARKER)
+    IObjectHistory, VALIDATED, REGISTERED, IGNORE_MARKER)
 from waeup.kofa.interfaces import MessageFactory as _
 from waeup.kofa.students.interfaces import (
@@ -717 +717 @@
     factory_name = 'waeup.StudentStudyCourse'
 
-    additional_fields = ['current_session', 'current_level']
+    additional_fields = [
+        'current_session',
+        'current_level',
+        'bypass_validation']
 
     def checkUpdateRequirements(self, obj, row, site):
@@ -729 +732 @@
         if obj.current_session != row['current_session']:
             return 'Current session does not correspond.'
-        # Check if student is in state REGISTERED
-        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.'
+        # Check if student is in state REGISTERED or VALIDATED
+        if row.get('bypass_validation') in ('1', 'True', 'TRUE', 'yes'):
+            if obj.student.state not in (VALIDATED, REGISTERED):
+                return 'Student in wrong state.'
+        else:
+            if obj.student.state != VALIDATED:
+                return 'Student in wrong state.'
         return None
 
@@ -749 +756 @@
             '%s - Verdict updated: %s'
             % (parent.student_id, items_changed))
-        # Fire transition
-        IWorkflowInfo(obj.__parent__).fireTransition('return')
+        # Fire transition depending on student's state
+        if obj.__parent__.state == REGISTERED:
+            IWorkflowInfo(obj.__parent__).fireTransition('bypass_validation')
+        else:
+            IWorkflowInfo(obj.__parent__).fireTransition('return')
         # Update the students_catalog
         notify(grok.ObjectModifiedEvent(obj.__parent__))