Changeset 1813

Timestamp:

23 May 2007, 19:23:45 (18 years ago)

Author:

Henrik Bettermann

Message:

reload picture of late admissions after login
Joachim, please check!

Location:

WAeUP_SRP/trunk

Files:

• WAeUPTool.py (modified) (3 diffs)
• skins/waeup_custom/logged_in.py (modified) (1 diff)

WAeUP_SRP/trunk/WAeUPTool.py

@@ -150 +150 @@
 
     security.declarePublic('loadStudentFoto') ###(
-    def loadStudentFoto(self,student):
+    def loadStudentFoto(self,student,filename,folder):
         "return a student passport picture"
         app_doc = student.application.getContent()
-        clear = student.clearance
-        clear_doc = clear.getContent()
-        matric_no = clear_doc.matric_no.upper()
-        picture1 ="%s/import/pictures_returning/%s.jpg" % (i_home,matric_no)
-        picture2 ="%s/import/pictures_returning/%s.JPG" % (i_home,matric_no)
+        #clear = student.clearance
+        #clear_doc = clear.getContent()
+        #matric_no = clear_doc.matric_no.upper()
+        picture1 ="%s/import/%s/%s.jpg" % (i_home,folder,filename)
+        picture2 ="%s/import/%s/%s.JPG" % (i_home,folder,filename)
         #import pdb;pdb.set_trace()
         if os.path.exists(picture1):
@@ -622 +622 @@
             #data['response_code'] = response_code = '00'
             #data['amount'] = amount = pay_transaction['Amount']
-            
+
             # format of the third file sent by Kehinde
             data['datetime'] = date = 0
@@ -628 +628 @@
             data['order_id'] = order_id = pay_transaction['merchant_reference']
             data['response_code'] = response_code = '00'
-            data['amount'] = amount = pay_transaction['Amount']            
+            data['amount'] = amount = pay_transaction['Amount']
 
             dup = False

WAeUP_SRP/trunk/skins/waeup_custom/logged_in.py

@@ -91 +91 @@
         #from Products.zdb import set_trace;set_trace()
         if s_review_state == 'returning' and load_passport and 'passport' not in app_doc.objectIds():
-            msg = context.waeup_tool.loadStudentFoto(student)
+            folder = 'returning_import'
+            res = context.students_catalog(id = str(member))
+            filename = res['matric_no'].upper()
+            msg = context.waeup_tool.loadStudentFoto(student,filename,folder)
             logger.info('%s, %s' % (member,msg))
-        elif s_review_state in ("student_created","admitted") and\
+        if s_review_state == 'admitted' and load_passport and 'passport' not in app_doc.objectIds():
+            folder = 'pictures_admitted_latest'
+            filename = app_doc.jamb_reg_no.replace('/','_')
+            msg = context.waeup_tool.loadStudentFoto(student,filename,folder)
+            logger.info('%s, %s' % (member,msg))
+        if s_review_state in ("student_created","admitted") and\
                              a_review_state == 'created' :
             wftool.doActionFor(student_app,'open')