Changeset 1412 for WAeUP_SRP/trunk/skins/waeup_accommodation

Timestamp:

13 Feb 2007, 14:14:44 (18 years ago)

Author:

joachim

Message:

more documentation

M profiles/default/schemas/acco_hall.xml
M profiles/default/schemas/schema.xsl
M profiles/default/workflows/waeup_student_wf/definition.xml
M profiles/default/layouts/layout.xsl
M profiles/default/layouts/acco_bed_booking.xml
M profiles/default/layouts/acco_hall.xml
M profiles/default/types/Student.xml
M profiles/default/types/AccoFolder.xml
M profiles/default/types/AccoHall.xml
M doc/srp_documentation.mm

reserved bed functionallity,
pay hostel-fee for reserved bed

D skins/waeup_student/reserve_accommodation.py
M skins/waeup_accommodation/book_reserved_bed.py
A skins/waeup_accommodation/reserve_accommodation.py

Location:

WAeUP_SRP/trunk/skins/waeup_accommodation

Files:

• book_reserved_bed.py (modified) (7 diffs)
• reserve_accommodation.py (moved) (moved from WAeUP_SRP/trunk/skins/waeup_student/reserve_accommodation.py) (1 diff)

WAeUP_SRP/trunk/skins/waeup_accommodation/book_reserved_bed.py

@@ -16 +16 @@
 
 mode = 'create'
-validate = REQUEST.has_key("cpsdocument_edit_button")
+validate = REQUEST.has_key("cpsdocument_edit_button") and\
+           REQUEST.get("cpsdocument_edit_button").startswith('reserve')
 d = {}
-res,psm,ds = lt.renderLayout(layout_id= 'acco_bed_booking',
+rendered,psm,ds = lt.renderLayout(layout_id= 'acco_bed_booking',
                       schema_id= 'acco_bed_booking',
                       context=context,
@@ -28 +29 @@
 if psm == 'invalid':
     psm = "Please correct your input."
-    return context.book_reserved_bed_form(rendered = res,
+    return context.book_reserved_bed_form(rendered = rendered,
                                  psm = psm,
                                  #psm = "%s, %s" % (psm,ds),
@@ -37 +38 @@
                                  )
 elif psm == '':
-    return context.book_reserved_bed_form(rendered = res,
+    return context.book_reserved_bed_form(rendered = rendered,
                                  psm = psm,
                                  mode = mode,
@@ -46 +47 @@
 elif psm == 'valid':
     pass
+#from Products.zdb import set_trace;set_trace()
 hall_id = context.getId()
 doc = context.getContent()
@@ -61 +63 @@
         break
     bed_brain = res[0]
+    already = acco_cat(student=sid) 
+    if already:
+        psm = "Student %s already reserved bed %s" % (sid, already[0].bed)
+        break
     if not bed_brain.bed_type.endswith("reserved"):
         psm = "Not a reserved bed %s" % bid
@@ -72 +78 @@
     break
 if psm != '':
-    return context.book_reserved_bed_form(rendered = res,
+    return context.book_reserved_bed_form(rendered = rendered,
                                  psm = psm,
                                  mode = mode,
@@ -80 +86 @@
                                  )
 acco_cat.modifyRecord(bed = bid, student = sid)
-logger.info('"%s","booked reserved bed %s for","%s"' % (member,bed,sid))
-return context.book_reserved_bed_form(rendered = res,
+logger.info('"%s","booked reserved bed %s for","%s"' % (member,bid,sid))
+return context.book_reserved_bed_form(rendered = "",
                                  psm = "Bed reserved for %s %s" % (sid,student.name),
                                  mode = mode,
                                  formaction = "book_reserved_bed",
-                                 button = "reserve bed",
+                                 button = "next reservation",
                                  ds = ds,
                                  )

WAeUP_SRP/trunk/skins/waeup_accommodation/reserve_accommodation.py

@@ -77 +77 @@
         pin = str(ds.get('acco_res_sc_pin'))
         pa = context.portal_accommodation
-        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 == -1:
-            return context.accommodation_pin_edit_form(rendered = res,
-                                 psm = "%s" % bed,
-                                 mode = mode,
-                                 ds = ds,
-                                 )
-        elif code == -2:
-            return context.accommodation_pin_edit_form(rendered = res,
-                                 psm = "No bed available. Your category is already fully booked.",
-                                 mode = mode,
-                                 ds = ds,
-                                 )
+        already = pa(student=s_id)
+        if not already:
+            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 == -1:
+                return context.accommodation_pin_edit_form(rendered = res,
+                                     psm = "%s" % bed,
+                                     mode = mode,
+                                     ds = ds,
+                                     )
+            elif code == -2:
+                return context.accommodation_pin_edit_form(rendered = res,
+                                     psm = "No bed available. Your category is already fully booked.",
+                                     mode = mode,
+                                     ds = ds,
+                                     )
+        else:
+            bed = already[0].bed 
         student.invokeFactory('StudentAccommodation',acco_id)
         acco = getattr(student,acco_id)