Changeset 6978 for main

Timestamp:

1 Nov 2011, 08:12:36 (13 years ago)

Author:

Henrik Bettermann

Message:

Remove all empty beds when updating a hostel and then refill hostel again. Occupied beds remain in hostel even if they are not part of the new configuration. Tests will follow.

Location:

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

Files:

• browser.py (modified) (2 diffs)
• hostel.py (modified) (4 diffs)

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

@@ -223 +223 @@
     @grok.action('Update all beds')
     def updateBeds(self, **data):
-        added, modified = self.context.updateBeds()
-        self.flash('%d added, %d modified' % (added, modified))
+        removed, added, modified = self.context.updateBeds()
+        self.flash('%d empty beds removed, %d beds added, %d occupied beds modified' % (
+            removed, added, modified))
         self.redirect(self.url(self.context, '@@manage')+'#tab-2')
         return
@@ -250 +251 @@
                 return
         if len(switched):
-            #import pdb; pdb.set_trace()
-            self.flash('Successfully switched: %s' % ', '.join(switched))
+            self.flash('Successfully switched beds: %s' % ', '.join(switched))
             self.redirect(self.url(self.context, '@@manage')+'#tab-2')
         return

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

@@ -44 +44 @@
         return
 
-    # not yet tested nor used
     def updateBeds(self):
         """Fill hostel with beds or update beds.
@@ -50 +49 @@
         added_counter = 0
         modified_counter = 0
+        removed_counter = 0
+
+        # Remove all empty beds. Occupied beds remain in hostel!
+        keys = list(self.keys()) # create list copy
+        for key in keys:
+            if self[key].owner == NOT_OCCUPIED:
+                del self[key]
+                self._p_changed = True
+                removed_counter += 1
+
         blocks_for_female = getattr(self,'blocks_for_female',[])
         blocks_for_male = getattr(self,'blocks_for_male',[])
@@ -86 +95 @@
                             if bed.bed_type != bt:
                                 bed.bed_type = bt
-                                #modified.append('"%(uid)s","%(bt)s","%(bed.owner)s"' % vars())
                                 modified_counter += 1
                         else:
@@ -95 +103 @@
                             bed.owner = NOT_OCCUPIED
                             self.addBed(bed)
-                            #generated.append('"%(uid)s","%(bt)s"' % vars())
                             added_counter +=1
-        return added_counter, modified_counter
+        return removed_counter, added_counter, modified_counter
 
 Hostel = attrs_to_fields(Hostel)