Changeset 5653

Timestamp:

21 Jan 2011, 12:16:53 (14 years ago)

Author:

Henrik Bettermann

Message:

Enable allocation of reserved bed spaces in SSE hostels (with special handling).

Location:

WAeUP_SRP/trunk/skins/waeup_accommodation

Files:

• allocate_reserved_bed.py (modified) (2 diffs)
• allocate_reserved_bed.py_old_version (modified) (2 diffs)

WAeUP_SRP/trunk/skins/waeup_accommodation/allocate_reserved_bed.py

@@ -70 +70 @@
             psm = "Student %s has already booked bed %s. This booking must be cancelled first." % (sid, already[0].bed)
             break
-        if not bed_brain.bed_type.endswith("reserved"):
+        if not "reserved" in bed_brain.bed_type:
             psm = "%s is not a reserved bed" % bid
             break
@@ -94 +94 @@
             psm = "Student %s has already paid for bed %s" % (sid, bid)
             break
-        if not bed_brain.bed_type.endswith("reserved"):
+        if not "reserved" in bed_brain.bed_type:
             psm = "%s is not a reserved bed" % bid
             break

WAeUP_SRP/trunk/skins/waeup_accommodation/allocate_reserved_bed.py_old_version

@@ -75 +75 @@
             psm = "Student %s has already reserved bed %s" % (sid, already[0].bed)
             break
-        if not bed_brain.bed_type.endswith("reserved"):
+        if not "reserved" in bed_brain.bed_type:
             psm = "%s is not a reserved bed" % bid
             break
@@ -93 +93 @@
             psm = "Student %s has no reserved bed" % (sid)
             break
-        if not bed_brain.bed_type.endswith("reserved"):
+        if not "reserved" in bed_brain.bed_type:
             psm = "%s is not a reserved bed" % bid
             break