Changeset 1449 for WAeUP_SRP/trunk/skins

Timestamp:

20 Feb 2007, 20:23:34 (18 years ago)

Author:

joachim

Message:

modified importReservedBeds
fixReservedBeds
added release_bed
many documentation addons for xml-files

Location:

WAeUP_SRP/trunk/skins/waeup_accommodation

Files:

• book_reserved_bed.py (modified) (5 diffs)
• book_reserved_bed_form.pt (modified) (1 diff)
• change_bed.py (modified) (1 diff)
• release_bed.py (added)

WAeUP_SRP/trunk/skins/waeup_accommodation/book_reserved_bed.py

@@ -15 +15 @@
 logger = logging.getLogger('Accommodation.BookReservedBed')
 
-change = REQUEST.has_key("reserve_and_change")
+#change = REQUEST.has_key("reserve_and_change")
+change = False
 release = REQUEST.has_key("release")
 reserve = REQUEST.has_key("reserve")
@@ -61 +62 @@
 res = acco_cat(bed = bid)
 psm = ''
+students = context.portal_url.getPortalObject().campus.students
+student_obj = getattr(students,sid)
+acco_id = "accommodation_%s" % context.getSessionId()
 while True:
     if not res:
@@ -81 +85 @@
             break
     if release:
+        if acco_id in student_obj.objectIds():
+            acco_doc = getattr(student_obj, acco_id).getContent()
+            if acco_doc.bed == bid:
+                psm = "Student %s has not reserved bed" % (sid, bid)
+                break
         if not already:
             psm = "Student %s already has no reserved beds" % (sid, already[0].bed)
@@ -104 +113 @@
         acco_cat.modifyRecord(bed=bed.bed,student='')
 
-students = context.portal_url.getPortalObject().campus.students
-student_obj = getattr(students,sid)
-acco_id = "accommodation_%s" % context.getSessionId()
 if reserve or change:
     acco_cat.modifyRecord(bed = bid, student = sid)
@@ -115 +121 @@
     psm = "Bed reserved for %s %s" % (sid,student.name)
 elif release:
-    acco_cat.modifyRecord(bed=bid,student='')
     if acco_id in student_obj.objectIds():
         acco_doc = getattr(student_obj, acco_id).getContent()
-        if acco_doc.bed == bid:
-            acco_doc.edit(mapping={'bed':bid + " (reservation cancelled by %s!)" % member})
+        if acco_doc.bed != bid:
+            acco_cat.modifyRecord(bed=bid,student='')
     logger.info('"%s","cancelled reservation %s by","%s"' % (member,bid,sid))
     psm = "%s removed from %s" % (student.name,bid)
-
 mode = 'view'
 return context.book_reserved_bed_form(rendered = "",

WAeUP_SRP/trunk/skins/waeup_accommodation/book_reserved_bed_form.pt

@@ -23 +23 @@
                  tal:attributes="value options/button"
                  tal:condition="not:creation" />
-          <input type="submit" tal:condition="python:mode !='view'"
+          <input type="submit" tal:condition="python:0 and mode !='view'"
                  class="standalone" 
                  name="reserve_and_change"

WAeUP_SRP/trunk/skins/waeup_accommodation/change_bed.py

@@ -57 +57 @@
         acco_doc.edit(mapping=d)
         return redirect("%s/%s/%s" % (students.absolute_url(),student,info['acco_id']))
+    student_obj = getattr(students,student_id)
+    acco_id = "accommodation_%s" % context.getSessionId()
+    if acco_id in student_obj.objectIds():
+        acco_doc = getattr(student_obj, acco_id).getContent()
+        if acco_doc.bed == bed:
+            acco_doc.edit(mapping={'bed':bed + " (cancelled by change bed %s!)" % member})
     logger.info('"%s", "new bed allocation failed","%s"' % (student_id,code))
+    logger.info('"%s","cancelled booking of %s"' % (member,bed,sid))
     redirect("%s/%s/%s" % (students.absolute_url(),student,info['acco_id']))