Changeset 13533

Timestamp:

3 Dec 2015, 20:04:17 (9 years ago)

Author:

Henrik Bettermann

Message:

Reserve bed so that it cannot be automatically booked by someone else.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/hostels

Files:

• browser.py (modified) (1 diff)
• hostel.py (modified) (3 diffs)
• interfaces.py (modified) (1 diff)
• tests.py (modified) (2 diffs)

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

@@ -203 +203 @@
             message = ', '.join(released)
             self.context.writeLogMessage(self, 'released: %s' % message)
-            flash_msg = _('Successfully released beds: ${a}',
-                mapping = {'a':message})
+            if len(released) > 50:
+                flash_msg = _('Successfully released ${a} beds.',
+                    mapping = {'a':len(released)})
+            else:
+                flash_msg = _('Successfully released beds: ${a}',
+                    mapping = {'a':message})
         else:
             flash_msg = _('No bed released.')

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

@@ -227 +227 @@
 
     def releaseBed(self):
+        """Release bed.
+        """
         if self.owner == NOT_OCCUPIED:
             return
@@ -247 +249 @@
 
     def releaseBedIfMaintenanceNotPaid(self, n=7):
+        """Release bed if maintenance fee has not been paid on time.
+        Reserve bed so that it cannot be automatically booked by someone else.
+        """
         if self.owner == NOT_OCCUPIED:
             return
@@ -263 +268 @@
             old_owner = self.owner
             self.owner = NOT_OCCUPIED
+            sh, sex, bt = self.bed_type.split('_')
+            bt = u'%s_%s_reserved' % (sh, sex)
+            self.bed_type = bt
             notify(grok.ObjectModifiedEvent(self))
             bedticket.bed = None

main/waeup.kofa/trunk/src/waeup/kofa/hostels/interfaces.py

@@ -246 +246 @@
     def releaseBedIfMaintenanceNotPaid():
         """Release bed if maintenance fee has not been paid on time.
+        Reserve bed so that it cannot be automatically booked by someone else.
         """
 

main/waeup.kofa/trunk/src/waeup/kofa/hostels/tests.py

@@ -198 +198 @@
         notify(grok.ObjectModifiedEvent(
             self.app['hostels']['hall-x']['hall_block_room_bed']))
+        self.assertEqual(
+            self.app['hostels']['hall-x']['hall_block_room_bed'].bed_type,
+            'regular_male_fr')
         results = cat.searchResults(owner=(self.student_id, self.student_id))
         self.assertEqual(len(results), 1)
@@ -216 +219 @@
         self.assertMatches(bedticket.display_coordinates,
             '-- booking expired (2015-10-14 08:35:38 UTC) --')
+        # The owner has been removed and the bed reserved.
         self.assertEqual(
             self.app['hostels']['hall-x']['hall_block_room_bed'].owner,
             NOT_OCCUPIED)
+        self.assertEqual(
+            self.app['hostels']['hall-x']['hall_block_room_bed'].bed_type,
+            'regular_male_reserved')
         # Accommodation session can't be changed if hostels are not empty.
         self.browser.open(self.manage_container_path)