Changeset 2454 for WAeUP_SRP/base/skins/waeup_accommodation

Timestamp:

27 Oct 2007, 21:53:04 (17 years ago)

Author:

Henrik Bettermann

Message:

rebuild getNextInfo.py completely
fetch session from portal properties.xml
change all scripts using getSessionId
remove StudentCourseResult? relevant code from event services
make pay_by_sc.py and interswitch_cb.py work (rebuild both)

Location:

WAeUP_SRP/base/skins/waeup_accommodation

Files:

• allocate_reserved_bed.py (modified) (1 diff)
• change_bed.py (modified) (1 diff)
• getAccommodationInfo.py (modified) (1 diff)
• reserve_accommodation.py (modified) (1 diff)

WAeUP_SRP/base/skins/waeup_accommodation/allocate_reserved_bed.py

@@ -64 +64 @@
 students = context.portal_url.getPortalObject().campus.students
 student_obj = getattr(students,sid)
-acco_id = "accommodation_%s" % context.getSessionId()
+acco_id = "accommodation_%s" % context.getSessionId()[0]
 while True:
     if not res:

WAeUP_SRP/base/skins/waeup_accommodation/change_bed.py

@@ -60 +60 @@
         return redirect("%s/%s/%s" % (students.absolute_url(),student,info['acco_id']))
     student_obj = getattr(students,student_id)
-    acco_id = "accommodation_%s" % context.getSessionId()
+    acco_id = "accommodation_%s" % context.getSessionId()[0]
     if acco_id in student_obj.objectIds():
         acco_doc = getattr(student_obj, acco_id).getContent()

WAeUP_SRP/base/skins/waeup_accommodation/getAccommodationInfo.py

@@ -80 +80 @@
             booking_allowed = info['verdict'] in ("A",
                                                  "B",)
-                                                 
+
 booking_allowed = False # booking temporarily disabled
                         # the algorithm must be adapted to new course_results catalog
                         # and/or FCEOkene modalities
-                        
-                        
-                        
-                        
-                        
-                        
-                        
-                                                                         
-                                                 
+
+
 info['booking_allowed'] = booking_allowed
 if not booking_allowed:
     info['acco'] = None
     return info
-acco_id = 'accommodation_2006'
+info['session'] = session = context.getSessionId()  
+acco_id = 'accommodation_' + session[0]
 acco = getattr(student,acco_id,None)
 info['acco'] = acco

WAeUP_SRP/base/skins/waeup_accommodation/reserve_accommodation.py

@@ -27 +27 @@
 student = info['student']
 acco_id = info['acco_id']
-session = acco_id[-4:]
+session = info['session'][1]
+#session = acco_id[-4:]
 validate = REQUEST.has_key("cpsdocument_create_button")
 if info.has_key('acco') and info['acco']: