Changeset 642

Timestamp:

10 Oct 2006, 16:31:30 (18 years ago)

Author:

joachim

Message:

added hostal_reservation_slip

Location:

WAeUP_SRP/trunk

Files:

• profiles/default/types/StudentAccommodation.xml (modified) (2 diffs)
• skins/waeup_accommodation/formatBed.py (added)
• skins/waeup_accommodation/reserve_acco.py (modified) (3 diffs)

WAeUP_SRP/trunk/profiles/default/types/StudentAccommodation.xml

@@ -8 +8 @@
  <property name="product">WAeUP_SRP</property>
  <property name="factory">addStudentAccommodation</property>
- <property name="immediate_view">student_index</property>
+ <property name="immediate_view">hostal_reservation_slip</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
@@ -26 +26 @@
  <property name="storage_methods"/>
  <property name="cps_is_portlet">False</property>
- <alias from="(Default)" to="student_index"/>
- <alias from="view" to="student_index"/>
+ <alias from="(Default)" to="hostal_reservation_slip"/>
+ <alias from="view" to="hostal_reservation_slip"/>
  <action title="Standard View" action_id="view" category="object"
-    condition_expr="" url_expr="string:${object_url}/student_index"
+    condition_expr="" url_expr="string:${object_url}/hostal_reservation_slip"
     visible="True">
   <permission value="View"/>

WAeUP_SRP/trunk/skins/waeup_accommodation/reserve_acco.py

@@ -19 +19 @@
 student = info['student']
 if info['acco']:
-    return student.hostal_reservation_slip()
+    return context.REQUEST.RESPONSE.redirect("%s" % info['acco'].absolute_url())
 res,psm,ds = lt.renderLayout(layout_id= 'student_acco_reserve',
                       schema_id= 'student_acco_reserve',
@@ -47 +47 @@
     s_id = ds.get('s_id')
     pin = str(ds.get('acco_res_ac_pin'))
+    
     pa = context.portal_accommodation
     code,bed = pa.searchAndReserveBed(s_id,"%s_%s" % (info['sex'],ds.get('student_status')))
-    if code < -10:
+    if code < 0:
         return context.reserve_acco_form(rendered = res,
                                  psm = bed,
@@ -58 +59 @@
 student.invokeFactory('StudentAccommodation',acco_id)
 acco = getattr(student,acco_id)
-ds['acco_res_date'] = current
-ds['bed'] = bed
-ds['session'] = session
+ds.set('acco_res_date', current)
+ds.set('bed', bed)
+ds.set('session', session)
 acco.getContent().edit(mapping=ds)
-return student.hostal_reservation_slip()
-return context.reserve_acco_form(rendered = res,
-                                 psm = "successfully reserved bed %s" % bed,
-                                 firstlayout = True,
-                                 lastlayout = True,
-                                 ds = ds,
-                                 )
+return context.REQUEST.RESPONSE.redirect("%s/hostal_reservation_slip" % student.absolute_url())
+##return context.reserve_acco_form(rendered = res,
+##                                 psm = "successfully reserved bed %s" % bed,
+##                                 firstlayout = True,
+##                                 lastlayout = True,
+##                                 ds = ds,
+##                                 )