Changeset 1100

Timestamp:

20 Dec 2006, 09:23:40 (18 years ago)

Author:

joachim

Message:

reserve accommodation respects ekenhuan campus

Location:

WAeUP_SRP/trunk/skins/waeup_student

Files:

• getAccommodationInfo.py (added)
• reserve_accommodation.py (modified) (3 diffs)

WAeUP_SRP/trunk/skins/waeup_student/reserve_accommodation.py

@@ -2 +2 @@
 # $Id$
 """
-process the Application Form
-return html renderer + psm
+process the the accommodation reservation
 """
 import DateTime
-
 current = DateTime.DateTime()
 pr = context.portal_registration
 wftool = context.portal_workflow
-
-info = context.getStudentInfo()
-validate = REQUEST.has_key("cpsdocument_create_button")
-#           REQUEST.has_key("cpsdocument_edit_button")
-
 lt = context.portal_layouts
-pr = context.portal_registration
-session = current.year()
-acco_id = 'accommodation_%s' % session
-info = context.getStudentInfo()
+info = context.getAccommodationInfo()
 student = info['student']
+acco_id = info['acco_id']
+session = acco_id[-4:]
 mode = 'create'
-
 if info['review_state'] != 'cleared_and_validated':
     return context.REQUEST.RESPONSE.redirect("%s/no_booking_allowed" % info['student'].absolute_url())
-
+validate = REQUEST.has_key("cpsdocument_create_button")
 if info.has_key('acco') and info['acco']:
     validate = REQUEST.has_key("cpsdocument_edit_button")
@@ -69 +60 @@
         pin = str(ds.get('acco_res_sc_pin'))
         pa = context.portal_accommodation
-        code,bed = pa.searchAndReserveBed(s_id,"%s_%s" % (info['sex'],ds.get('student_status')))
+        code,bed = pa.searchAndReserveBed(s_id,"%s" % (info['student_status']))
+        #code,bed = pa.searchAndReserveBed(s_id,"%s_%s" % (info['sex'],ds.get('student_status')))
         if code < 0:
             return context.accommodation_pin_edit_form(rendered = res,
@@ -84 +76 @@
         ds.set('bed', bed)
         ds.set('session', session)
+        ds.set('student_status',info['student_status'])
         acco.getContent().edit(mapping=ds)
         #wftool.doActionFor(acco,'pay_maintenance_fee',dest_container=acco)