Changeset 4009

Timestamp:

10 Mar 2009, 08:03:23 (16 years ago)

Author:

Henrik Bettermann

Message:

ease disabling hostel booking also for fceokene

Location:

WAeUP_SRP/trunk/skins

Files:

• waeup_fceokene/getAccommodationInfo.py (modified) (4 diffs)
• waeup_fceokene/no_booking_allowed.pt (deleted)
• waeup_fceokene/reserve_accommodation.py (modified) (2 diffs)
• waeup_futminna/getAccommodationInfo.py (modified) (1 diff)

WAeUP_SRP/trunk/skins/waeup_fceokene/getAccommodationInfo.py

@@ -15 +15 @@
 logger = logging.getLogger('Skins.getAccommodationInfo')
 import DateTime
+
+booking_disabled = False
 
 request = context.REQUEST
@@ -54 +56 @@
 info['student'] = student
 
+# do not change these settings!
+
 booking_allowed = False
+info['booking_disabled'] = False
 
 # customize from here
@@ -80 +85 @@
     info['booking_allowed'] = False
     info['student_status'] = ''
+    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
-
-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"
 d = {}
 if level >= 300:
@@ -111 +107 @@
 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_disabled'] = True
+    logger.info('%s: %s eligible but booking disabled' % (student_id,student_status))  
+
 return info
 

WAeUP_SRP/trunk/skins/waeup_fceokene/reserve_accommodation.py

@@ -9 +9 @@
 """
 process the the accommodation reservation
+customized for FCE Okene (random booking order)
 """
 try:
@@ -34 +35 @@
 
 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())

WAeUP_SRP/trunk/skins/waeup_futminna/getAccommodationInfo.py

@@ -79 +79 @@
     info['booking_allowed'] = False
     info['student_status'] = ''
+    logger.info('%s: not eligible' % (student_id)) 
     return info