Changeset 1700 for WAeUP_SRP/trunk/skins

Timestamp:

23 Apr 2007, 21:16:34 (18 years ago)

Author:

joachim

Message:

students_catalog reindexing implemented.

Location:

WAeUP_SRP/trunk/skins

Files:

• waeup_custom/functions.js.dtml (moved) (moved from WAeUP_SRP/trunk/skins/waeup_default/functions.js.dtml)
• waeup_student/getStudentReviewState.py (modified) (2 diffs)
• waeup_student/list_students.py (modified) (1 diff)
• waeup_utilities/readOnlinePaymentsFromLog.py (modified) (2 diffs)

WAeUP_SRP/trunk/skins/waeup_student/getStudentReviewState.py

@@ -5 +5 @@
 ##bind script=script
 ##bind subpath=traverse_subpath
-##parameters=
+##parameters=student_id=None
 ##title=
 ##
@@ -17 +17 @@
 except:
     aq_portal = None
-student_id = context.getStudentId()
+if student_id is None:
+    student_id = context.getStudentId()
 query = Eq('id',student_id)
 res = aq_portal(query)

WAeUP_SRP/trunk/skins/waeup_student/list_students.py

@@ -49 +49 @@
 newquery = Eq('portal_type','StudentApplication') & MatchRegexp('SearchableText',r'^6*')
 #newquery = MatchRegexp('SearchableText','^5*')
-new_students = aq_portal(newquery)
-new_sids = []
-for ns in new_students:
-    new_sids.append(ns.getPath().split('/')[-2])
+#new_students = aq_portal(newquery)
+#set_trace()
+#new_sids = []
+#for ns in new_students:
+#    new_sids.append(ns.getPath().split('/')[-2])
+#set_trace()
 for student in cleared:
-    if student.getId not in new_sids:
-        continue
+##    if student.getId not in new_sids:
+##        continue
     erg = scat(id=student.getId)
     if not erg:
+        continue
+    if not erg[0].jamb_reg_no.startswith('6'):
         continue
     d = context.getFormattedStudentEntry(erg[0])

WAeUP_SRP/trunk/skins/waeup_utilities/readOnlinePaymentsFromLog.py

@@ -95 +95 @@
                                                   ))
     if payment_doc.resp_code == "" and response_code == "00":
-        pd = {}
         review_state = wftool.getInfoFor(payment_obj,'review_state',None)
         if review_state != "opened":
@@ -104 +103 @@
             logger.info('%s review_state = %s' % (student_id,review_state))
             continue
-        pd['resp_code'] = 'IP'
-        pd['resp_desc'] = 'Payment approved by import, %s' % (DateTime.DateTime())
-        payment_doc.edit(mapping=pd)
+        readin['resp_code'] = 'IP ' + readin['resp_code']
+        readin['resp_desc'] = 'Payment approved by logfile import, %s. ' % (DateTime.DateTime()) \
+                              + readin['resp_desc']
+        payment_doc.edit(mapping=readin)
         if payment_doc.type_description.startswith('School Fee'):
             wftool.doActionFor(student_obj,'pay_school_fee')
-        logger.info('%s approves epayment for %s by import' % (member,student_id))
+        logger.info('%s approves epayment for %s by logfile import' % (member,student_id))
         wftool.doActionFor(payment_obj,'close')
         approved += 1