Changeset 6975 for main

Timestamp:

31 Oct 2011, 10:11:06 (13 years ago)

Author:

Henrik Bettermann

Message:

Use List field for 'reserved' attribute and fill or remove list items when reserving or releasing a bed. The 'reserved' field should be omitted in the manage form. When clearing a hostel the reserved bed configuration remains and can be used when refilling the hostel in the following session.

Location:

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

Files:

• browser.py (modified) (1 diff)
• hostel.py (modified) (2 diffs)
• interfaces.py (modified) (2 diffs)

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

@@ -250 +250 @@
                 return
         if len(switched):
+            #import pdb; pdb.set_trace()
             self.flash('Successfully switched: %s' % ', '.join(switched))
             self.redirect(self.url(self.context, '@@manage')+'#tab-2')

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

@@ -122 +122 @@
         beds_for_returning = getattr(self,'beds_for_returning',[])
         beds_for_final = getattr(self,'beds_for_final',[])
+        hostel = self.__parent__
+        bed_string = u'%s_%s_%s ' % (block, room_nr, bed)
         if bt == 'reserved':
             bt = 'all'
@@ -133 +135 @@
                 bt = 're'
             bt = u'%s_%s_%s' % (sh, sex, bt)
+            hostel.reserved.remove(bed_string)
         else:
             bt = u'%s_%s_reserved' % (sh, sex)
+            hostel.reserved.append(bed_string)
         self.bed_type = bt
         return

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

@@ -54 +54 @@
         )
 
+    reserved = schema.List(
+        title = u'Reserved Beds',
+        value_type = schema.TextLine(
+            title = u'Bed',
+            default = u'',
+            required = False,
+        ),
+        required = True,
+        readonly = False,
+        default = [],
+        )
+
     blocks_for_female = schema.List(
         title = u'Blocks for Female Students',
@@ -101 +113 @@
         required = True,
         default = u'regular',
-        )
-
-    reserved = schema.TextLine(
-        title = u'Reserved Beds',
-        required = False,
-        readonly = True,
         )