Changeset 4007 for WAeUP_SRP/trunk/skins/waeup_accommodation

Timestamp:

10 Mar 2009, 06:03:56 (16 years ago)

Author:

Henrik Bettermann

Message:

ease disabling hostel booking (not yet tested)

FCE Okene remains unchanged.

Location:

WAeUP_SRP/trunk/skins/waeup_accommodation

Files:

• booking_disabled.pt (added)
• getAccommodationInfo.py (modified) (7 diffs)
• reserve_accommodation.py (modified) (1 diff)

WAeUP_SRP/trunk/skins/waeup_accommodation/getAccommodationInfo.py

@@ -16 +16 @@
 import DateTime
 
-booking_disabled = False
+booking_disabled = True
 
 request = context.REQUEST
@@ -56 +56 @@
 info['student'] = student
 
+# do not change these settings!
+
 booking_allowed = False
+info['booking_disabled'] = False
 
 # customize from here
@@ -76 +79 @@
               'courses_validated',
               )
+new = None
+arrived = None
 
 try:
@@ -85 +90 @@
 except:    
     logger.info('%s has invalid session %s' % (student_id,student_record.session))    
-
+    
 level = None
 end_level = None
@@ -117 +122 @@
     info['acco'] = None
     info['student_status'] = ''
-    logger.info('%s: no bed found' % (student_id))     
+    logger.info('%s: not eligible' % (student_id))     
     return info
-
-acco_id = 'accommodation_' + session[0]
-acco = getattr(student,acco_id,None)
-info['acco'] = acco
-info['acco_id'] = acco_id
-bt = 're'
-info['maintenance_paid'] = False
-if acco is not None:
-    info['acco_doc'] = acco.getContent()
-    info['acco_review_state'] = wf.getInfoFor(acco,'review_state',None)
-    info['maintenance_paid'] = info['acco_review_state'] == "maintenance_fee_paid"
-elif booking_disabled:
-    info['booking_allowed'] = False
 
 d = {}
@@ -143 +135 @@
 else:
     bt = 'fi'
-
 d['sex'] = 'male'
 if student_record.sex:
@@ -157 +148 @@
 student_status = "%(sex)s_%(bt)s" % d
 info['student_status'] = student_status
+
+# customize end
+
+acco_id = 'accommodation_' + session[0]
+acco = getattr(student,acco_id,None)
+info['acco'] = acco
+info['acco_id'] = acco_id
+info['maintenance_paid'] = False
+if acco is not None:
+    info['acco_doc'] = acco.getContent()
+    info['acco_review_state'] = wf.getInfoFor(acco,'review_state',None)
+    info['maintenance_paid'] = info['acco_review_state'] == "maintenance_fee_paid"
+elif booking_disabled:
+    info['booking_allowed'] = False
+    info['booking_disabled'] = True
+    logger.info('%s: %s eligible but booking disabled' % (student_id,student_status))  
+
 return info

WAeUP_SRP/trunk/skins/waeup_accommodation/reserve_accommodation.py

@@ -34 +34 @@
 
 mode = 'create'
+if info['booking_disabled']:
+    return context.REQUEST.RESPONSE.redirect("%s/booking_disabled" % info['student'].absolute_url())
 if not info['booking_allowed']:
     return context.REQUEST.RESPONSE.redirect("%s/no_booking_allowed" % info['student'].absolute_url())