Changeset 1440 for WAeUP_SRP/trunk/skins

Timestamp:

19 Feb 2007, 15:06:06 (18 years ago)

Author:

joachim

Message:

book_reserverved_bed enhanced:

• reserve and change button added

1.) all beds which are reserved for this student are unreserved.
2.) the selected bed is reserved for this student.
3.) The new bed-koordinate is reflected in the accommodation object.

The reserve functionallity is unchanged.

Location:

WAeUP_SRP/trunk/skins

Files:

• waeup_accommodation/book_reserved_bed.py (modified) (4 diffs)
• waeup_accommodation/book_reserved_bed_form.pt (modified) (1 diff)
• waeup_default/getSessionId.py (added)

WAeUP_SRP/trunk/skins/waeup_accommodation/book_reserved_bed.py

@@ -15 +15 @@
 logger = logging.getLogger('Accommodation.BookReservedBed')
 
+change_bed = REQUEST.has_key("reserve_and_change")
+validate = change_bed or (REQUEST.has_key("reserve") and
+           REQUEST.get("reserve").startswith('Reserve'))
 mode = 'create'
-validate = REQUEST.has_key("cpsdocument_edit_button") and\
-           REQUEST.get("cpsdocument_edit_button").startswith('Reserve')
+
 d = {}
 rendered,psm,ds = lt.renderLayout(layout_id= 'acco_bed_booking',
@@ -64 +66 @@
     bed_brain = res[0]
     already = acco_cat(student=sid)
-    if already:
+    if already and not change_bed:
         psm = "Student %s already reserved bed %s" % (sid, already[0].bed)
         break
@@ -70 +72 @@
         psm = "Not a reserved bed %s" % bid
         break
-    if bed_brain.student:
+    if bed_brain.student and not change_bed:
         psm = "Bed %s already reserved for %s" % (bid,bed_brain.student)
         break
@@ -85 +87 @@
                                  button = "Reserve Bed",
                                  )
+if change_bed:
+    for bed in already:
+        acco_cat.modifyRecord(bed=bed.bed,student='')
+        
 acco_cat.modifyRecord(bed = bid, student = sid)
+students = context.portal_url.getPortalObject().campus.students
+student_obj = getattr(students,sid)
+acco_id = "accommodation_%s" % context.getSessionId()
+if acco_id in student_obj.objectIds():
+    acco_doc = getattr(student_obj, acco_id).getContent()
+    acco_doc.edit(mapping={'bed': bid})
 logger.info('"%s","booked reserved bed %s for","%s"' % (member,bid,sid))
+mode = 'view'
 return context.book_reserved_bed_form(rendered = "",
                                  psm = "Bed reserved for %s %s" % (sid,student.name),

WAeUP_SRP/trunk/skins/waeup_accommodation/book_reserved_bed_form.pt

@@ -19 +19 @@
           <div tal:replace="structure rendered_main" />
           <br />
-          <input type="submit" class="standalone" name="cpsdocument_edit_button"
-                 value="Save" 
-                 id="cpsdocument_edit_button"
+          <input type="submit" class="standalone" 
+                 name="reserve"
                  tal:attributes="value options/button"
                  tal:condition="not:creation" />
-          <input type="submit" 
+          <input type="submit" tal:condition="python:mode !='view'"
                  class="standalone" 
-                 name="cpsdocument_create_button"
-                 value="apply"
-                 tal:attributes="value options/button"
-                 tal:condition="creation" />
-          
+                 name="reserve_and_change"
+                 value="Reserve and Change Bed"
+                 />
         </form>
       </metal:block>