Changeset 638

Timestamp:

10 Oct 2006, 10:30:24 (18 years ago)

Author:

joachim

Message:

removed returning bed, reserved beds can now be separated by ,. or blank

Location:

WAeUP_SRP/trunk

Files:

• Accommodation.py (modified) (3 diffs)
• profiles/default/layouts/acco_hall.xml (modified) (2 diffs)
• profiles/default/schemas/acco_hall.xml (modified) (1 diff)

WAeUP_SRP/trunk/Accommodation.py

@@ -13 +13 @@
 import Globals
 import DateTime
+import re
 p_home = Globals.package_home(globals())
 i_home = Globals.INSTANCE_HOME
@@ -48 +49 @@
             hall_gen['name'] = hall.Title
             count = 0
-            reserved = [int(r) for r in h.reserved_rooms.split()]
+            #reserved = [int(r) for r in h.reserved_rooms.split(',')]
+            reserved = [int(r) for r in re.split(',|\.| ',h.reserved_rooms) 
+                                     if not re.search(r'\D',r)]
             sex = 'male'
             if h.which_sex:
@@ -57 +60 @@
                         for bed in 'ABCDEFGH'[:int(h.beds_per_room)]:
                             room_nr = floor*100 + room
-                            bt = 'xx'
+                            bt = 're'
                             if room_nr in reserved:
                                 bt = "reserved"
                             elif bed in h.beds_for_fresh:
                                 bt = 'fr'
-                            elif bed in h.beds_for_returning:
-                                bt = 're'
+                            #elif bed in h.beds_for_returning:
+                            #    bt = 're'
                             elif bed in h.beds_for_final:
                                 bt = 'fi'

WAeUP_SRP/trunk/profiles/default/layouts/acco_hall.xml

@@ -99 +99 @@
   <property name="label_edit">Reserved Rooms</property>
   <property
-     name="help">Enter the reserved room numbers separeted by space.</property>
+     name="help">Enter the reserved room numbers separeted by comma.</property>
   <property name="readonly_layout_modes"/>
   <property name="hidden_layout_modes"/>
@@ -162 +162 @@
   </row>
   <row>
-   <cell name="beds_for_returning"/>
-  </row>
-  <row>
    <cell name="beds_for_final"/>
   </row>

WAeUP_SRP/trunk/profiles/default/schemas/acco_hall.xml

@@ -14 +14 @@
   </field>
  <field name="reserved_rooms" meta_type="CPS String List Field">
-    <property name="default_expr">string:101 102</property>
+    <property name="default_expr">string:101,102</property>
   </field>
   <field name="rooms_per_floor" meta_type="CPS Int Field">