Changeset 7513 for main/waeup.sirp/trunk/src

Timestamp:

25 Jan 2012, 17:47:23 (13 years ago)

Author:

Henrik Bettermann

Message:

Enable import of student registration states which are in IMPORTABLE_STATES.

Set workflow state directly rather than firing transitions.

Location:

main/waeup.sirp/trunk/src/waeup/sirp/students

Files:

• batching.py (modified) (5 diffs)
• student.py (modified) (1 diff)
• tests/sample_student_data.csv (modified) (1 diff)
• tests/sample_student_data_migration.csv (modified) (1 diff)
• tests/test_batching.py (modified) (2 diffs)
• tests/test_browser.py (modified) (3 diffs)
• workflow.py (modified) (1 diff)

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

@@ -31 +31 @@
 from zope.event import notify
 from zope.catalog.interfaces import ICatalog
+from hurry.workflow.interfaces import IWorkflowState
 from waeup.sirp.interfaces import (
     IBatchProcessor, FatalCSVError, IObjectConverter, IUserAccount)
@@ -36 +37 @@
     IStudent, IStudentStudyCourseImport,
     IStudentUpdateByRegNo, IStudentUpdateByMatricNo)
+from waeup.sirp.students.workflow import  IMPORTABLE_STATES
 from waeup.sirp.utils.batching import BatchProcessor
 
@@ -58 +60 @@
     def available_fields(self):
         return sorted(list(set(
-            ['student_id','reg_number','matric_number','password'] + getFields(
+            ['student_id','reg_number','matric_number',
+            'password', 'reg_state'] + getFields(
                 self.iface).keys())))
 
@@ -144 +147 @@
             if key == 'password':
                 IUserAccount(obj).setPassword(value)
+            elif key == 'reg_state':
+                IWorkflowState(obj).setState(value)
             elif hasattr(obj, key):
                 setattr(obj, key, value)
@@ -177 +182 @@
         errs, inv_errs, conv_dict =  converter.fromStringDict(
             row, self.factory_name)
+        if row.has_key('reg_state') and \
+            row['reg_state'] is not None and \
+            not row['reg_state'] in IMPORTABLE_STATES:
+            errs.append(('reg_state','not allowed'))
         return errs, inv_errs, conv_dict
 

main/waeup.sirp/trunk/src/waeup/sirp/students/student.py

@@ -156 +156 @@
     role_manager.assignRoleToPrincipal(
         'waeup.local.StudentRecordOwner', student.student_id)
-    IWorkflowInfo(student).fireTransition('create')
+    if IWorkflowState(student).getState() is None:
+        IWorkflowInfo(student).fireTransition('create')
     return
 

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

@@ -1 @@
-firstname,lastname,reg_number,date_of_birth,matric_number,email,phone
+firstname,lastname,reg_number,date_of_birth,matric_number,email,phone,reg_state
 Aaren,Pieri,1,1990-01-02,100000,aa@aa.ng,1234
-Aaren,Finau,2,1990-01-03,100001,aa@aa.ng,1234
-Aaren,Berson,3,1990-01-04,100002,aa@aa.ng,1234
+Aaren,Finau,2,1990-01-03,100001,aa@aa.ng,1234,admitted
+Aaren,Berson,3,1990-01-04,100002,aa@aa.ng,1234,cleared
+John,Wolter,4,1990-01-04,100003,aa@aa.ng,1234,nonsense

main/waeup.sirp/trunk/src/waeup/sirp/students/tests/sample_student_data_migration.csv

@@ -1 @@
-student_id,firstname,lastname,reg_number,date_of_birth,matric_number,email,phone,password
-A123456,Aaren,Pieri,1,1990-01-02,100000,aa@aa.ng,1234,mypw1
-B123456,Aaren,Finau,2,1990-01-03,100001,aa@aa.ng,1234,mypw1
-C123456,Aaren,Berson,3,1990-01-04,100002,aa@aa.ng,1234,mypw1
+student_id,firstname,lastname,reg_number,date_of_birth,matric_number,email,phone,password,reg_state
+A123456,Aaren,Pieri,1,1990-01-02,100000,aa@aa.ng,1234,mypw1,school fee paid
+B123456,Aaren,Finau,2,1990-01-03,100001,aa@aa.ng,1234,mypw1,cleared
+C123456,Aaren,Berson,3,1990-01-04,100002,aa@aa.ng,1234,mypw1,admitted
+D123456,John,Wolter,4,1990-01-04,100003,aa@aa.ng,1234,mypw1,nonsense

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

@@ -162 +162 @@
         num, num_warns, fin_file, fail_file = self.importer.doImport(
             self.csv_file, STUDENT_HEADER_FIELDS)
-        self.assertEqual(num_warns,0)
+        self.assertEqual(num_warns,1)
         assert len(self.app['students'].keys()) == 4
         shutil.rmtree(os.path.dirname(fin_file))
@@ -196 +196 @@
         num, num_warns, fin_file, fail_file = self.importer.doImport(
             self.csv_file_migration, STUDENT_HEADER_FIELDS_MIGRATION)
-        self.assertEqual(num_warns,0)
+        self.assertEqual(num_warns,1)
         assert len(self.app['students'].keys()) == 4
         self.assertTrue('A123456' in self.app['students'].keys())
+        self.assertEqual(self.app['students']['A123456'].state,'school fee paid')
         shutil.rmtree(os.path.dirname(fin_file))
 

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

@@ -31 +31 @@
 from zope.securitypolicy.interfaces import IPrincipalRoleManager
 from zope.testbrowser.testing import Browser
-from hurry.workflow.interfaces import IWorkflowInfo
+from hurry.workflow.interfaces import IWorkflowInfo, IWorkflowState
 from waeup.sirp.testing import FunctionalLayer, FunctionalTestCase
 from waeup.sirp.app import University
@@ -769 +769 @@
         prmlocal = IPrincipalRoleManager(department)
         prmlocal.assignRoleToPrincipal('waeup.local.ClearanceOfficer', 'mrclear')
-        IWorkflowInfo(self.student).fireTransition('admit')
-        IWorkflowInfo(self.student).fireTransition('start_clearance')
+        IWorkflowState(self.student).setState('clearance started')
         # Login as clearance officer
         self.browser.open(self.login_path)
@@ -857 +856 @@
         prmlocal = IPrincipalRoleManager(cert)
         prmlocal.assignRoleToPrincipal('waeup.local.CourseAdviser100', 'mrsadvise')
-        IWorkflowInfo(self.student).fireTransition('admit')
-        IWorkflowInfo(self.student).fireTransition('start_clearance')
-        IWorkflowInfo(self.student).fireTransition('request_clearance')
-        IWorkflowInfo(self.student).fireTransition('clear')
-        IWorkflowInfo(self.student).fireTransition('pay_first_school_fee')
+        IWorkflowState(self.student).setState('school fee paid')
         # Login as course adviser
         self.browser.open(self.login_path)

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

@@ -12 +12 @@
 from waeup.sirp.students.interfaces import IStudent
 from waeup.sirp.students.utils import set_returning_data
+
+IMPORTABLE_STATES = (ADMITTED, CLEARANCE, REQUESTED, CLEARED, PAID, RETURNING,
+    REGISTERED, VALIDATED)
 
 REGISTRATION_TRANSITIONS = (