Changeset 2268 for WAeUP_SRP/base

Timestamp:

21 Sep 2007, 20:11:08 (17 years ago)

Author:

Henrik Bettermann

Message:

allow overwriting of matric_no or jamb_reg_no if student id is provided

File:

• WAeUP_SRP/base/WAeUPTool.py (modified) (3 diffs)

WAeUP_SRP/base/WAeUPTool.py

@@ -1156 +1156 @@
             if not res:
                 return '',"no student with id %s" % sid
-            elif matric_no and res[0].matric_no and\
+            if matric_no and res[0].matric_no and\
               matric_no != res[0].matric_no:
-                return '%s' % res[0].id ,"student has no matric_no %s" % matric_no
-            elif jamb_reg_no and res[0].jamb_reg_no and\
+                logger.info("%s, old matric_no %s overwritten with %s" % (res[0].id,res[0].matric_no,matric_no))
+            if jamb_reg_no and res[0].jamb_reg_no and\
               jamb_reg_no != res[0].jamb_reg_no:
-                return '%s' % res[0].id ,"student has no jamb_reg_no %s" % jamb_reg_no
+                logger.info("%s, old reg_no %s overwritten with %s" % (res[0].id,res[0].jamb_reg_no,jamb_reg_no))
         elif jamb_reg_no:
             res = self.students_catalog(jamb_reg_no = jamb_reg_no)
@@ -1173 +1173 @@
             editable_keys.remove('matric_no')
 
-        # included only to change wf state from admitted to returning
-        if res[0].review_state not in ('admitted','objection_raised'):
-            return '%s' % res[0].id ,"student is not in state admitted or objection_raised"
-        # end inclusion
+        ## included only to change wf state from admitted to returning
+        #if res[0].review_state not in ('admitted','objection_raised'):
+        #    return '%s' % res[0].id ,"student is not in state admitted or objection_raised"
+        ## end inclusion
 
         sid = res[0].id
@@ -1210 +1210 @@
 
 
-        # included only to change wf state from admitted to returning
-            if res[0].review_state in ('admitted','objection_raised'):
-                new_state = f2t[pt]['wf_transition_return']
-                sub_obj = getattr(student_obj,f2t[pt]['id'],None)
-                if sub_obj and new_state != "remain":
-                    try:
-                        self.portal_workflow.doActionFor(sub_obj,new_state,dest_container=sub_obj)
-                    except:
-                        #logger.info('%s, wf transition %s of %s failed' % (sid,new_state,sub_obj.id))
-                        pass
-        if res[0].review_state in ('admitted','objection_raised'):
-            wfaction = 'return'
-            try:
-                self.portal_workflow.doActionFor(student_obj,wfaction)
-                logger.info('%s, wf state changed' % sid)
-                any_change = True
-            except:
-                logger.info('%s, wf transition failed, old state = %s' % (sid,res[0].review_state))
-                pass
-        # end inclusion
+        ## included only to change wf state from admitted to returning
+        #    if res[0].review_state in ('admitted','objection_raised'):
+        #        new_state = f2t[pt]['wf_transition_return']
+        #        sub_obj = getattr(student_obj,f2t[pt]['id'],None)
+        #        if sub_obj and new_state != "remain":
+        #            try:
+        #                self.portal_workflow.doActionFor(sub_obj,new_state,dest_container=sub_obj)
+        #            except:
+        #                #logger.info('%s, wf transition %s of %s failed' % (sid,new_state,sub_obj.id))
+        #                pass
+        #if res[0].review_state in ('admitted','objection_raised'):
+        #    wfaction = 'return'
+        #    try:
+        #        self.portal_workflow.doActionFor(student_obj,wfaction)
+        #        logger.info('%s, wf state changed' % sid)
+        #        any_change = True
+        #    except:
+        #        logger.info('%s, wf transition failed, old state = %s' % (sid,res[0].review_state))
+        #        pass
+        ## end inclusion