Changeset 407 for WAeUP_SRP/trunk/Accommodation.py

Timestamp:

23 Aug 2006, 05:13:30 (18 years ago)

Author:

joachim

Message:

undoing change committed in 404

File:

• WAeUP_SRP/trunk/Accommodation.py (modified) (2 diffs)

WAeUP_SRP/trunk/Accommodation.py

@@ -32 +32 @@
         for hall in halls:
             h = hall.getContent()
+            reserved = [int(r) for r in h.reserved_rooms.split()]
             for block in range(1,int(h.nr_of_blocks)):
                 for floor in range(1,int(h.nr_of_floors)):
@@ -37 +38 @@
                         for bed in 'ABCDEFGH'[:int(h.beds_per_room)]:
                             room_nr = floor*100 + room
+                            if room_nr in reserved:
+                                print room_nr
+                                continue
+                            bt = 'xx'
+                            if bed in h.beds_for_fresh:
+                                bt = 'fr'
+                            elif bed in h.beds_for_returning:
+                                bt = 're'
+                            elif bed in h.beds_for_final:
+                                bt = 'fi'
+                            print bt
                             freelist.addRecord(bed = '%s_%d_%s' % (h.getId(),room_nr,bed),
-                                               bed_type = "test")
+                                               bed_type = bt)
+        return self.accommodation.academics_contents()
 
 ###)