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

Timestamp:

5 Oct 2012, 05:42:19 (12 years ago)

Author:

Henrik Bettermann

Message:

Set validated_by when bypassing course validation. Declare validated_by and bypass_validation in IStudentVerdictUpdate.

File:

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

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

@@ -28 +28 @@
 from time import time
 from datetime import datetime
+from zope.i18n import translate
 from zope.interface import Interface
 from zope.schema import getFields
@@ -37 +38 @@
     IBatchProcessor, FatalCSVError, IObjectConverter, IUserAccount,
     IObjectHistory, VALIDATED, REGISTERED, IGNORE_MARKER)
+from waeup.kofa.interfaces import IKofaUtils
 from waeup.kofa.interfaces import MessageFactory as _
 from waeup.kofa.students.interfaces import (
@@ -721 +723 @@
         'current_session',
         'current_level',
-        'bypass_validation']
+        'bypass_validation',
+        'validated_by']
 
     def checkUpdateRequirements(self, obj, row, site):
@@ -741 +744 @@
             return 'Study level object is missing.'
         # Check if student is in state REGISTERED or VALIDATED
-        if row.get('bypass_validation') in ('1', 'True', 'TRUE', 'yes'):
+        if row.get('bypass_validation'):
             if obj.student.state not in (VALIDATED, REGISTERED):
                 return 'Student in wrong state.'
@@ -760 +763 @@
         level_string = str(obj.current_level)
         obj[level_string].level_verdict = row['current_verdict']
-        # Fire transition depending on student's state
+        # Fire transition and set studylevel attributes
+        # depending on student's state
         if obj.__parent__.state == REGISTERED:
+            validated_by = row.get('validated_by', '')
+            if validated_by in (IGNORE_MARKER, ''):
+                portal_language = getUtility(IKofaUtils).PORTAL_LANGUAGE
+                system = translate(_('System'),'waeup.kofa',
+                                  target_language=portal_language)
+                obj[level_string].validated_by = system
+            else:
+                obj[level_string].validated_by = validated_by
+            obj[level_string].validation_date = datetime.utcnow()
             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')