Changeset 7527 for main/waeup.sirp/trunk

Timestamp:

28 Jan 2012, 07:45:06 (13 years ago)

Author:

Henrik Bettermann

Message:

Set clearance_locked properly when importing students.

Location:

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

Files:

• student.py (modified) (2 diffs)
• tests/sample_student_data_migration.csv (modified) (1 diff)
• tests/test_batching.py (modified) (1 diff)

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

@@ -142 +142 @@
     and the transition create is fired. The latter produces a logging message.
     """
-    student.clearance_locked = True
+    reg_state = IWorkflowState(student).getState()
+    if reg_state == 'clearance started':
+        student.clearance_locked = False
+    else:
+        student.clearance_locked = True
     studycourse = StudentStudyCourse()
     student['studycourse'] = studycourse
@@ -156 +160 @@
     role_manager.assignRoleToPrincipal(
         'waeup.local.StudentRecordOwner', student.student_id)
-    if IWorkflowState(student).getState() is None:
+    if reg_state is None:
         IWorkflowInfo(student).fireTransition('create')
     return

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

@@ -1 +1 @@
 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
+A123456,Aaren,Pieri,1,1990-01-02#,100000,aa@aa.ng,1234,mypw1,clearance started
 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

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

@@ -200 +200 @@
         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')
+        self.assertEqual(self.app['students']['A123456'].state,'clearance started')
         self.assertEqual(self.app['students']['A123456'].date_of_birth,
             datetime.date(1990, 1, 2))
+        self.assertFalse(self.app['students']['A123456'].clearance_locked)
         self.assertEqual(self.app['students']['B123456'].state,'cleared')
         self.assertEqual(self.app['students']['B123456'].date_of_birth,
             datetime.date(1990, 1, 3))
+        self.assertTrue(self.app['students']['B123456'].clearance_locked)
         history = ' '.join(self.app['students']['A123456'].history.messages)
         self.assertTrue(
-            "State 'school fee paid' set by system" in history)
+            "State 'clearance started' set by system" in history)
         shutil.rmtree(os.path.dirname(fin_file))