Changeset 1447

Timestamp:

20 Feb 2007, 13:41:26 (18 years ago)

Author:

joachim

Message:

new function fixReservedBeds:
walks through all reserved beds
if the bed is allocated to a student:

if the student has an accommodation object:

if not the same as the reserved bed:

deallocate bed.

Location:

WAeUP_SRP/trunk/skins/waeup_accommodation

Files:

• acco_folder_view.pt (modified) (1 diff)
• book_reserved_bed.py (modified) (1 diff)
• fixReservedBeds.py (added)
• getAccoFolderInfo.py (modified) (2 diffs)
• getAccoHallBeds.py (modified) (2 diffs)
• reservedRoomsVoc.py (modified) (2 diffs)

WAeUP_SRP/trunk/skins/waeup_accommodation/acco_folder_view.pt

@@ -48 +48 @@
                      />
             </td>
-            <td><a href="view" tal:attributes="href string:/${row/url}">
+            <td><a href="view" tal:attributes="href row/url">
               <strong tal:content="row/title" /></a> </td>
             <td tal:content="row/id"> </td>

WAeUP_SRP/trunk/skins/waeup_accommodation/book_reserved_bed.py

@@ -118 +118 @@
     if acco_id in student_obj.objectIds():
         acco_doc = getattr(student_obj, acco_id).getContent()
-        acco_doc.edit(mapping={'bed':bid + " (reservation cancelled by %s!)" % member})
+        if acco_doc.bed == bid:
+            acco_doc.edit(mapping={'bed':bid + " (reservation cancelled by %s!)" % member})
     logger.info('"%s","cancelled reservation %s by","%s"' % (member,bid,sid))
     psm = "%s removed from %s" % (student.name,bid)

WAeUP_SRP/trunk/skins/waeup_accommodation/getAccoFolderInfo.py

@@ -10 +10 @@
 # $Id$
 """
-return Info about the Faculties
+return Info about the Accommodation-Folder
 """
 request = context.REQUEST
@@ -29 +29 @@
     row['id'] = f.id
     row['title'] = f.Title
-    row['url'] = f.relative_path
+    row['url'] = "%s/%s" % (context.absolute_url(),f.id)
     #fo = f.getObject()
     #row['is_editable'] = mtool.checkPermission('Modify portal content', fo)

WAeUP_SRP/trunk/skins/waeup_accommodation/getAccoHallBeds.py

@@ -1 @@
-##parameters=key=None 
+##parameters=key=None,doc=None
 # $Id$
 """
@@ -5 +5 @@
 
 """
-doc = context.getContent()
+if doc is None:
+    doc = context.getContent()
 if key is None:
     return [(l,l) for l in 'ABCDEFGH'[:doc.beds_per_room]]

WAeUP_SRP/trunk/skins/waeup_accommodation/reservedRoomsVoc.py

@@ -1 @@
-##parameters=key=None
+##parameters=key=None,doc=None
 # $Id$
 """
@@ -5 +5 @@
 
 """
-doc = context.getContent()
-voc = [("_".join((r.split('/')[0],r.split('/')[1])),r)
-                      for r in doc.reserved_rooms.replace(' ','').split(',') if r]
+if doc is None:
+    doc = context.getContent()
+voc = [("_".join((r.split('/')[0].strip(),r.split('/')[1].strip())),r)
+                      for r in doc.reserved_rooms.split(',') if r]
 #from Products.zdb import set_trace;set_trace()
 if not key: