Changeset 13103 for main/waeup.kofa/trunk/src/waeup/kofa/students

Timestamp:

26 Jun 2015, 06:05:43 (9 years ago)

Author:

Henrik Bettermann

Message:

Remove manual clearance lock. Replace clearance_locked field by
property attribute.

Location:

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

Files:

• browser.py (modified) (3 diffs)
• interfaces.py (modified) (2 diffs)
• student.py (modified) (2 diffs)
• tests/test_batching.py (modified) (1 diff)
• tests/test_browser.py (modified) (7 diffs)
• tests/test_export.py (modified) (7 diffs)
• workflow.py (modified) (2 diffs)

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

@@ -638 +638 @@
     def form_fields(self):
         if self.context.is_postgrad:
-            form_fields = grok.AutoFields(
-                IPGStudentClearance).omit('clearance_locked')
-        else:
-            form_fields = grok.AutoFields(
-                IUGStudentClearance).omit('clearance_locked')
+            form_fields = grok.AutoFields(IPGStudentClearance)
+        else:
+            form_fields = grok.AutoFields(IUGStudentClearance)
         if not getattr(self.context, 'officer_comment'):
             form_fields = form_fields.omit('officer_comment')
@@ -669 +667 @@
     def form_fields(self):
         if self.context.is_postgrad:
-            form_fields = grok.AutoFields(
-                IPGStudentClearance).omit('clearance_locked')
-        else:
-            form_fields = grok.AutoFields(
-                IUGStudentClearance).omit('clearance_locked')
+            form_fields = grok.AutoFields(IPGStudentClearance)
+        else:
+            form_fields = grok.AutoFields(IUGStudentClearance)
         if not getattr(self.context, 'officer_comment'):
             form_fields = form_fields.omit('officer_comment')
@@ -2413 +2409 @@
         if self.context.is_postgrad:
             form_fields = grok.AutoFields(IPGStudentClearance).omit(
-                'clearance_locked', 'clr_code', 'officer_comment')
+                'clr_code', 'officer_comment')
         else:
             form_fields = grok.AutoFields(IUGStudentClearance).omit(
-                'clearance_locked', 'clr_code', 'officer_comment')
+                'clr_code', 'officer_comment')
         return form_fields
 

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

@@ -209 +209 @@
     personal_data_expired = Attribute('True if personal data expired')
     transcript_enabled = Attribute('True if transcript processing is enabled')
+    clearance_locked = Attribute('True if clearance form is locked')
 
     password = Attribute('Encrypted password')
@@ -309 +310 @@
     officer_comment = schema.Text(
         title = _(u"Officer's Comment"),
-        required = False,
-        )
-
-    clearance_locked = schema.Bool(
-        title = _(u'Clearance form locked'),
-        default = False,
         required = False,
         )

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

@@ -239 +239 @@
         return True
 
+    @property
+    def clearance_locked(self):
+        return self.state != CLEARANCE
+
     def transfer(self, certificate, current_session=None,
         current_level=None, current_verdict=None, previous_verdict=None):
@@ -324 +328 @@
     message.
     """
-    if student.state == CLEARANCE:
-        student.clearance_locked = False
-    else:
-        student.clearance_locked = True
     studycourse = createObject(u'waeup.StudentStudyCourse')
     student['studycourse'] = studycourse

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

@@ -224 +224 @@
         student.matric_number = u'234'
         student.adm_code = u'my adm code'
-        student.clearance_locked = False
         student.clr_code = u'my clr code'
         student.perm_address = u'Studentroad 21\nLagos 123456\n'

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

@@ -1876 +1876 @@
         self.browser.open(self.manage_clearance_path)
         self.assertFalse('Employer' in self.browser.contents)
-        self.student.clearance_locked = False
         self.browser.open(self.edit_clearance_path)
         self.assertFalse('Employer' in self.browser.contents)
@@ -1888 +1887 @@
         self.browser.open(self.manage_clearance_path)
         self.assertTrue('Employer' in self.browser.contents)
+        IWorkflowState(self.student).setState('clearance started')
         self.browser.open(self.edit_clearance_path)
         self.assertTrue('Employer' in self.browser.contents)
@@ -2619 +2619 @@
         self.browser.getControl(name="form.password").value = 'spwd'
         self.browser.getControl("Login").click()
-        self.student.clearance_locked = False
         self.browser.open(self.edit_clearance_path)
         self.browser.getControl(name="form.date_of_birth").value = '09/10/1961'
@@ -3416 +3415 @@
             self.browser.headers['content-disposition'])
         self.assertTrue(
-            'adm_code,clearance_locked,clr_code,date_of_birth,email,employer,'
+            'adm_code,clr_code,date_of_birth,email,employer,'
             'firstname,lastname,matric_number,middlename,nationality,'
             'officer_comment,perm_address,personal_updated,phone,reg_number,'
@@ -3422 +3421 @@
             'password,state,history,certcode,is_postgrad,current_level,'
             'current_session\r\n'
-            ',1,,1981-02-04#,aa@aa.ng,,Anna,Tester,234,,,,,,'
+            ',,1981-02-04#,aa@aa.ng,,Anna,Tester,234,,,,,,'
             '1234#,123,m,K1000000,0,,,{SSHA}' in self.browser.contents)
 
@@ -3516 +3515 @@
             self.browser.headers['content-disposition'])
         self.assertTrue(
-            'adm_code,clearance_locked,clr_code,date_of_birth,email,employer,'
+            'adm_code,clr_code,date_of_birth,email,employer,'
             'firstname,lastname,matric_number,middlename,nationality,'
             'officer_comment,perm_address,personal_updated,phone,reg_number,'
@@ -3522 +3521 @@
             'password,state,history,certcode,is_postgrad,current_level,'
             'current_session\r\n'
-            ',1,,1981-02-04#,aa@aa.ng,,Anna,Tester,234,,,,,,'
+            ',,1981-02-04#,aa@aa.ng,,Anna,Tester,234,,,,,,'
             '1234#,123,m,K1000000,0,,,{SSHA}' in self.browser.contents)
         self.assertEqual(len(self.app['datacenter'].running_exports), 1)

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

@@ -125 +125 @@
 
     std_csv_entry = (
-        'my adm code,0,my clr code,1981-02-04#,anna@sample.com,,'
+        'my adm code,my clr code,1981-02-04#,anna@sample.com,,'
         'Anna,Tester,234,M.,NG,,"Studentroad 21\nLagos 123456\n",,'
         '+234-123-12345#,123,f,A111111,0,,,,created'
@@ -156 +156 @@
         result = open(self.outfile, 'rb').read()
         self.assertTrue(
-            'adm_code,clearance_locked,clr_code,date_of_birth,email,'
+            'adm_code,clr_code,date_of_birth,email,'
             'employer,firstname,lastname,matric_number,middlename,'
             'nationality,officer_comment,perm_address,personal_updated,'
@@ -162 +162 @@
             'transcript_comment,password,state,history,certcode,is_postgrad,'
             'current_level,current_session\r\n'
-            'my adm code,0,my clr code,'
+            'my adm code,my clr code,'
             '1981-02-04#,anna@sample.com,,Anna,Tester,234,M.,NG,,'
             '"Studentroad 21\nLagos 123456\n",,+234-123-12345#,123,f,'
@@ -178 +178 @@
         result = open(self.outfile, 'rb').read()
         self.assertTrue(
-            'adm_code,clearance_locked,clr_code,date_of_birth,email,'
+            'adm_code,clr_code,date_of_birth,email,'
             'employer,firstname,lastname,matric_number,middlename,'
             'nationality,officer_comment,perm_address,personal_updated,'
@@ -184 +184 @@
             'transcript_comment,password,state,history,certcode,'
             'is_postgrad,current_level,current_session\r\n'
-            'my adm code,0,my clr code,1981-02-04#,anna@sample.com,,'
+            'my adm code,my clr code,1981-02-04#,anna@sample.com,,'
             'Anna,Tester,234,M.,NG,,"Studentroad 21\nLagos 123456\n"'
             ',,+234-123-12345#,123,f,A111111,0,,,,created'
@@ -198 +198 @@
         result = open(self.outfile, 'rb').read()
         self.assertTrue(
-            'adm_code,clearance_locked,clr_code,date_of_birth,email,'
+            'adm_code,clr_code,date_of_birth,email,'
             'employer,firstname,lastname,matric_number,middlename,'
             'nationality,officer_comment,perm_address,personal_updated,'
@@ -204 +204 @@
             'transcript_comment,password,state,history,certcode,'
             'is_postgrad,current_level,current_session\r\n'
-            'my adm code,0,my clr code,1981-02-04#,anna@sample.com,,'
+            'my adm code,my clr code,1981-02-04#,anna@sample.com,,'
             'Anna,Tester,234,M.,NG,,"Studentroad 21\nLagos 123456\n"'
             ',,+234-123-12345#,123,f,A111111,0,,,,created'

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

@@ -212 +212 @@
 
 FORBIDDEN_POSTGRAD_TRANS = ['reset6', 'register_courses']
-LOCK_CLEARANCE_TRANS = ('reset2', 'request_clearance')
-UNLOCK_CLEARANCE_TRANS = ('reset3', 'reset4', 'start_clearance')
 
 registration_workflow = KofaWorkflow(REGISTRATION_TRANSITIONS)
@@ -247 +245 @@
     history = IObjectHistory(obj)
     history.addMessage(msg)
-    if event.transition.transition_id in LOCK_CLEARANCE_TRANS:
-        obj.clearance_locked = True
-    if event.transition.transition_id in UNLOCK_CLEARANCE_TRANS:
-        obj.clearance_locked = False
     # School fee payment of returning students triggers the change of
     # current session, current level, and current verdict