Changeset 6976

Timestamp:

31 Oct 2011, 10:53:17 (13 years ago)

Author:

Henrik Bettermann

Message:

Consider bed_reserved attribute when filling up an (old) hostel.

Location:

main/waeup.sirp/trunk/src/waeup/sirp/hostels

Files:

• hostel.py (modified) (4 diffs)
• interfaces.py (modified) (1 diff)

main/waeup.sirp/trunk/src/waeup/sirp/hostels/hostel.py

@@ -57 +57 @@
         beds_for_final = getattr(self,'beds_for_final',[])
         beds_for_all = getattr(self,'beds_for_all',[])
-        beds_reserved = [] #temporarily empty
+        beds_reserved = getattr(self,'beds_reserved',[])
         all_blocks = blocks_for_female + blocks_for_male
         all_beds = (beds_for_pre + beds_for_fresh +
             beds_for_returning + beds_for_final + beds_for_all)
-        #import pdb;pdb.set_trace()
         for block in all_blocks:
             sex = 'male'
@@ -71 +70 @@
                         room_nr = floor*100 + room
                         bt = 'all'
-                        if (block,room_nr) in beds_reserved:
+                        if '%s_%s_%s' % (block,room_nr,bed) in beds_reserved:
                             bt = "reserved"
                         elif bed in beds_for_fresh:
@@ -123 +122 @@
         beds_for_final = getattr(self,'beds_for_final',[])
         hostel = self.__parent__
-        bed_string = u'%s_%s_%s ' % (block, room_nr, bed)
+        bed_string = u'%s_%s_%s' % (block, room_nr, bed)
         if bt == 'reserved':
             bt = 'all'
@@ -135 +134 @@
                 bt = 're'
             bt = u'%s_%s_%s' % (sh, sex, bt)
-            hostel.reserved.remove(bed_string)
+            hostel.beds_reserved.remove(bed_string)
         else:
             bt = u'%s_%s_reserved' % (sh, sex)
-            hostel.reserved.append(bed_string)
+            hostel.beds_reserved.append(bed_string)
         self.bed_type = bt
         return

main/waeup.sirp/trunk/src/waeup/sirp/hostels/interfaces.py

@@ -54 +54 @@
         )
 
-    reserved = schema.List(
+    beds_reserved = schema.List(
         title = u'Reserved Beds',
         value_type = schema.TextLine(
-            title = u'Bed',
             default = u'',
             required = False,