Changeset 6998 for main/waeup.sirp/trunk/src

Timestamp:

4 Nov 2011, 17:33:06 (13 years ago)

Author:

Henrik Bettermann

Message:

Renumber and sort remaining beds correctly.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/hostels/hostel.py (modified) (4 diffs)

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

@@ -59 +59 @@
                 self._p_changed = True
                 removed_counter += 1
+            else:
+                self[key].bed_number = 9999
+        remaining = len(keys) - removed_counter
 
         blocks_for_female = getattr(self,'blocks_for_female',[])
@@ -94 +97 @@
                         if self.has_key(uid):
                             bed = self[uid]
+                            # Renumber remaining beds
+                            bed.bed_number = len(self) + 1 - remaining
+                            remaining -= 1
                             if bed.bed_type != bt:
                                 bed.bed_type = bt
@@ -102 +108 @@
                             bed.bed_id = uid
                             bed.bed_type = bt
-                            bed.bed_number = len(self) + 1
+                            bed.bed_number = len(self) + 1 - remaining
                             bed.owner = NOT_OCCUPIED
                             self.addBed(bed)
@@ -122 +128 @@
 
     def bookBed(self, student_id):
-        self.owner = student_id
-        return
+        if self.owner == NOT_OCCUPIED:
+            self.owner = student_id
+            return None
+        else:
+            return self.owner
 
     def switchReservation(self):