Changeset 3960

Timestamp:

12 Feb 2009, 06:03:29 (16 years ago)

Author:

Henrik Bettermann

Message:

allow '8' and '08' as session strings

Location:

WAeUP_SRP/trunk/skins

Files:

• waeup_aaua/getAccommodationInfo.py (modified) (1 diff)
• waeup_accommodation/getAccommodationInfo.py (modified) (1 diff)
• waeup_epayment/getSchoolFee.py (modified) (1 diff)
• waeup_fceokene/getAccommodationInfo.py (modified) (1 diff)
• waeup_fceoyo/getAccommodationInfo.py (modified) (1 diff)
• waeup_futminna/getAccommodationInfo.py (modified) (1 diff)

WAeUP_SRP/trunk/skins/waeup_aaua/getAccommodationInfo.py

@@ -66 +66 @@
     info['student_status'] = ''
     return info    
+    
+try:
+    arrived = int(student_record.session) == int(session[0])
+except:
+    arrived = False
+    logger.info('%s has invalid session %s' % (student_id,student_record.session))    
 
-if review_state in ('school_fee_paid','courses_registered', 'courses_validated',) and student_record.session == session[0]:
+if review_state in ('school_fee_paid','courses_registered', 'courses_validated',) and arrived:
     info['booking_allowed'] = True
     info['online_payment'] = True

WAeUP_SRP/trunk/skins/waeup_accommodation/getAccommodationInfo.py

@@ -77 +77 @@
               )
 
-new = student_record.entry_session == session[0]
-arrived = student_record.session == session[0]
+try:
+    new = int(student_record.entry_session) == int(session[0])
+except:    
+    logger.info('%s has invalid entry_session %s' % (student_id,student_record.entry_session))
+try:
+    arrived = int(student_record.session) == int(session[0])
+except:    
+    logger.info('%s has invalid session %s' % (student_id,student_record.session))    
 
 level = None

WAeUP_SRP/trunk/skins/waeup_epayment/getSchoolFee.py

@@ -27 +27 @@
                 '06': ('22200','23700'),
                 '07': ('22200','23700'),
+                '08': ('22200','23700'),                
+                '1': ('22200','23700'),
+                '2': ('22200','23700'),
+                '3': ('22200','23700'),
+                '4': ('22200','23700'),
+                '5': ('22200','23700'),
+                '6': ('22200','23700'),
+                '7': ('22200','23700'),  
+                '8': ('22200','23700'),                
                 }
 pt_fees = {

WAeUP_SRP/trunk/skins/waeup_fceokene/getAccommodationInfo.py

@@ -67 +67 @@
     return info    
 
-if review_state in ('school_fee_paid','courses_registered', 'courses_validated',) and student_record.session == session[0]:
+try:
+    arrived = int(student_record.session) == int(session[0])
+except:
+    arrived = False
+    logger.info('%s has invalid session %s' % (student_id,student_record.session))
+
+if review_state in ('school_fee_paid','courses_registered', 'courses_validated',) and arrived:
     info['booking_allowed'] = True
     info['online_payment'] = True

WAeUP_SRP/trunk/skins/waeup_fceoyo/getAccommodationInfo.py

@@ -66 +66 @@
     info['student_status'] = ''
     return info    
+    
+try:
+    arrived = int(student_record.session) == int(session[0])
+except:
+    arrived = False
+    logger.info('%s has invalid session %s' % (student_id,student_record.session))    
 
-if review_state in ('school_fee_paid','courses_registered', 'courses_validated',) and student_record.session == session[0]:
+if review_state in ('school_fee_paid','courses_registered', 'courses_validated',) and arrived:
     info['booking_allowed'] = True
     info['online_payment'] = True

WAeUP_SRP/trunk/skins/waeup_futminna/getAccommodationInfo.py

@@ -69 +69 @@
     return info    
 
-if review_state in ('cleared_and_validated','school_fee_paid','courses_registered', 'courses_validated',) and student_record.session == session[0]:
+try:
+    arrived = int(student_record.session) == int(session[0])
+except:
+    arrived = False
+    logger.info('%s has invalid session %s' % (student_id,student_record.session))
+
+if review_state in ('cleared_and_validated','school_fee_paid','courses_registered', 'courses_validated',) and arrived:
     info['booking_allowed'] = True
     info['online_payment'] = True