Changeset 9161

Timestamp:

6 Sep 2012, 07:43:51 (12 years ago)

Author:

Henrik Bettermann

Message:

In contrast to the comment of the last revision: We need to store validation_date and validated_by also in Kofa. They have to be set by the workflow transition events. They must not be editable (but importable and exportable).

Location:

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

Files:

• batching.py (modified) (1 diff)
• browser.py (modified) (2 diffs)
• interfaces.py (modified) (2 diffs)
• studylevel.py (modified) (1 diff)
• tests/test_browser.py (modified) (4 diffs)
• tests/test_export.py (modified) (4 diffs)
• workflow.py (modified) (3 diffs)

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

@@ -470 +470 @@
     location_fields = []
 
-    # Validation fields can be removed after data migration from SRP.
-    additional_fields = ['level',
-        'validated_by', 'validation_date']
+    additional_fields = ['level']
     additional_headers = ['level']
 

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

@@ -850 +850 @@
     grok.require('waeup.viewStudent')
     form_fields = grok.AutoFields(IStudentStudyLevel)
+    form_fields[
+        'validation_date'].custom_widget = FriendlyDatetimeDisplayWidget('le')
     grok.template('studylevelpage')
     pnav = 4
@@ -945 +947 @@
     grok.require('waeup.manageStudent')
     grok.template('studylevelmanagepage')
-    form_fields = grok.AutoFields(IStudentStudyLevel)
+    form_fields = grok.AutoFields(IStudentStudyLevel).omit(
+        'validation_date', 'validated_by')
     pnav = 4
     taboneactions = [_('Save'),_('Cancel')]

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

@@ -426 +426 @@
     """
     level = Attribute('The level code')
-    validation_date = Attribute('The date of validation')
-    validated_by = Attribute('User Id of course adviser')
 
     level_session = schema.Choice(
@@ -440 +438 @@
         default = '0',
         required = False,
+        )
+
+    validated_by = schema.TextLine(
+        title = _(u'Validated by'),
+        default = None,
+        required = False,
+        )
+
+    validation_date = schema.Datetime(
+        title = _(u'Validation Date'),
+        required = False,
+        readonly = False,
         )
 

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

@@ -37 +37 @@
         super(StudentStudyLevel, self).__init__()
         self.level = None
-        self.validation_date = None
-        self.validated_by = None
         return
 

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

@@ -967 +967 @@
         self.app['users'].addUser('mrsadvise', 'mrsadvisesecret')
         self.app['users']['mrsadvise'].email = 'mradvise@foo.ng'
-        self.app['users']['mrsadvise'].title = 'Helen Procter'
+        self.app['users']['mrsadvise'].title = u'Helen Procter'
         # Assign local CourseAdviser100 role for a certificate
         cert = self.app['faculties']['fac1']['dep1'].certificates['CERT1']
@@ -1018 +1018 @@
         # the 100L CA does see the 'Validate' button
         self.browser.open(L110_student_path)
-        self.assertFalse('Validate' in self.browser.contents)
+        self.assertFalse('Validate courses' in self.browser.contents)
         IWorkflowInfo(self.student).fireTransition('register_courses')
         self.browser.open(L110_student_path)
-        self.assertFalse('Validate' in self.browser.contents)
+        self.assertFalse('Validate courses' in self.browser.contents)
         self.student['studycourse'].current_level = 110
         self.browser.open(L110_student_path)
-        self.assertTrue('Validate' in self.browser.contents)
+        self.assertTrue('Validate courses' in self.browser.contents)
         # ... but a 100L CA does not see the button on other levels
         studylevel2 = StudentStudyLevel()
@@ -1032 +1032 @@
         L200_student_path = self.studycourse_path + '/200'
         self.browser.open(L200_student_path)
-        self.assertFalse('Validate' in self.browser.contents)
+        self.assertFalse('Validate courses' in self.browser.contents)
         self.browser.open(L110_student_path)
         self.browser.getLink("Validate courses").click()
         self.assertTrue('Course list has been validated' in self.browser.contents)
         self.assertTrue('courses validated' in self.browser.contents)
+        self.assertEqual(self.student['studycourse']['110'].validated_by,
+            'Helen Procter')
+        self.assertMatches(
+            '<YYYY-MM-DD hh:mm:ss>',
+            self.student['studycourse']['110'].validation_date.strftime(
+                "%Y-%m-%d %H:%M:%S"))
         self.browser.getLink("Reject courses").click()
         self.assertTrue('Course list request has been annulled.'
@@ -1044 +1050 @@
             '/contactstudent?subject=%s' % urlmessage)
         self.assertTrue('school fee paid' in self.browser.contents)
+        self.assertTrue(self.student['studycourse']['110'].validated_by is None)
+        self.assertTrue(self.student['studycourse']['110'].validation_date is None)
         IWorkflowInfo(self.student).fireTransition('register_courses')
         self.browser.open(L110_student_path)

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

@@ -209 +209 @@
         self.assertEqual(
             result,
-            'level,level_session,level_verdict,student_id\r\n'
-            ',,0,\r\n'
+            'level,level_session,level_verdict,validated_by,validation_date,'
+            'student_id\r\n'
+            ',,0,,,\r\n'
             )
         return
@@ -225 +226 @@
         self.assertEqual(
             result,
-            'level,level_session,level_verdict,student_id\r\n'
-            '100,2012,A,A111111\r\n'
+            'level,level_session,level_verdict,validated_by,validation_date,'
+            'student_id\r\n'
+            '100,2012,A,,,A111111\r\n'
             )
         return
@@ -239 +241 @@
         self.assertEqual(
             result,
-            'level,level_session,level_verdict,student_id\r\n'
-            '100,2012,A,A111111\r\n'
+            'level,level_session,level_verdict,validated_by,validation_date,'
+            'student_id\r\n'
+            '100,2012,A,,,A111111\r\n'
             )
         return
@@ -252 +255 @@
         self.assertEqual(
             result,
-            'level,level_session,level_verdict,student_id\r\n'
-            '100,2012,A,A111111\r\n'
+            'level,level_session,level_verdict,validated_by,validation_date,'
+            'student_id\r\n'
+            '100,2012,A,,,A111111\r\n'
             )
         return

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

@@ -2 +2 @@
 """
 import grok
+from datetime import datetime
 from zope.component import getUtility
 from hurry.workflow.workflow import Transition, WorkflowState, NullCondition
@@ -12 +13 @@
 from waeup.kofa.workflow import KofaWorkflow, KofaWorkflowInfo
 from waeup.kofa.students.interfaces import IStudent, IStudentsUtils
+from waeup.kofa.utils.helpers import get_current_principal
 
 
@@ -234 +236 @@
         new_session = obj['studycourse'].current_session + 1
         obj['studycourse'].current_session = new_session
+    elif event.transition.transition_id == 'validate_courses':
+        current_level = obj['studycourse'].current_level
+        level_object = obj['studycourse'].get(str(current_level), None)
+        if level_object is not None:
+            user = get_current_principal()
+            if user is None:
+                usertitle = 'system'
+            else:
+                usertitle = getattr(user, 'public_name', None)
+                if not usertitle:
+                    usertitle = user.title
+            level_object.validated_by = usertitle
+            level_object.validation_date = datetime.utcnow()
+    elif event.transition.transition_id == 'reset8':
+        current_level = obj['studycourse'].current_level
+        level_object = obj['studycourse'].get(str(current_level), None)
+        if level_object is not None:
+            level_object.validated_by = None
+            level_object.validation_date = None
     # In some tests we don't have a students container
     try: