Changeset 2913 for WAeUP_SRP/fceokene/waeup_custom

Timestamp:

10 Dec 2007, 21:50:04 (17 years ago)

Author:

Henrik Bettermann

Message:

calculate correct session_id and layout changes

Location:

WAeUP_SRP/fceokene/waeup_custom

Files:

• getAccommodationInfo.py (modified) (4 diffs)
• getSchoolFee.py (modified) (1 diff)
• layout_student_acco_view_slip.pt (modified) (1 diff)
• pay_interswitch.py (modified) (1 diff)

WAeUP_SRP/fceokene/waeup_custom/getAccommodationInfo.py

@@ -52 +52 @@
 review_state = info['review_state'] = s_brain.review_state
 
-info['session'] = current_session = context.getSessionId()[0]
+
+info['session'] = session = context.getSessionId()
 
 students_object = context.portal_url.getPortalObject().campus.students
@@ -60 +61 @@
 
 booking_allowed = False
-if review_state in ('school_fee_paid','courses_registered', 'courses_validated',) and s_brain.session == current_session:
+if review_state in ('school_fee_paid','courses_registered', 'courses_validated',) and s_brain.session == session[0]:
     booking_allowed = True
 
@@ -72 +73 @@
     info['acco'] = None
     return info
-acco_id = 'accommodation_' + str(current_session)
+acco_id = 'accommodation_' + session[0]
 acco = getattr(student,acco_id,None)
 info['acco'] = acco
@@ -91 +92 @@
     bt = 'pr'
 else:
-    if s_brain.end_level and s_brain.end_level:
-        certlevel = int(certificate.end_level)
-    else:
-        info["error"] = '"no level information provided","%s"' % c_brain.getId
-        return info
-    if s_brain.end_level >= s_brain.end_level:
-        bt = "fi"
+    res = context.portal_catalog(portal_type = "Certificate", id = s_brain.course)
+    if res:
+        c_brain = res[0]
+        certificate = c_brain.getObject().getContent()
+        try:
+            certlevel = int(certificate.end_level)
+        except:
+            info["error"] = '"no end_level for","%s"' % c_brain.getId
+            return info
+        try:
+            studentlevel = int(s_brain.level)
+        except:
+            info["error"] = '"no level for","%s"' % s_brain.getId
+            return info
+        if studentlevel >= certlevel:
+            bt = "fi"
 d['sex'] = 'male'
 if s_brain.sex:

WAeUP_SRP/fceokene/waeup_custom/getSchoolFee.py

@@ -40 +40 @@
 next_info = context.getNextInfo(brain)
 next_session_str = next_info['next_session_str']
+d['next_session_id'] = next_info['next_session_id']
 d['description'] = "School Fee for Session %s" % next_session_str
 

WAeUP_SRP/fceokene/waeup_custom/layout_student_acco_view_slip.pt

@@ -8 +8 @@
                               'acco_res_date',
                                  'acco_maint_pay_id', 
+                                 'acco_maint_fee',
                                  'acco_maint_date',
                                  )"

WAeUP_SRP/fceokene/waeup_custom/pay_interswitch.py

@@ -61 +61 @@
 info['type'] = 'online'
 info['status'] = 'started'
-info['session_id'] = student_record.session
+info['session_id'] = fee_dict['next_session_id']
 info['item'] = student_record.course
 info['category'] = 'schoolfee'