Changeset 6997

Timestamp:

4 Nov 2011, 17:32:02 (13 years ago)

Author:

Henrik Bettermann

Message:

Don't use access code if no bed is found. This is in contrast to the Uniben practice.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/students/browser.py (modified) (3 diffs)

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

@@ -53 +53 @@
 from waeup.sirp.browser.resources import toggleall
 from waeup.sirp.authentication import get_principal_role_manager
+from waeup.sirp.hostels.hostel import NOT_OCCUPIED
 
 def write_log_message(view, message):
@@ -1107 +1108 @@
             self.flash('Activation code is invalid.')
             return
+        # Search a bed and exit if no bed is found
+        cat = queryUtility(ICatalog, name='beds_catalog', default=None)
+        entries = cat.searchResults(
+            bed_type=(acc_details['bt'],acc_details['bt']))
+        available_beds = [
+            entry for entry in entries if entry.owner == NOT_OCCUPIED]
+        if not available_beds:
+            self.flash('There is no free bed in your category %s.'
+                        % acc_details['bt'])
+            return
         # Mark pin as used (this also fires a pin related transition)
         if code.state == USED:
@@ -1119 +1130 @@
                 self.flash('You are not the owner of this access code.')
                 return
+        # Create bed ticket and book bed
         bedticket = createObject(u'waeup.BedTicket')
         bedticket.booking_code = pin
         bedticket.booking_session = acc_details['booking_session']
         bedticket.bed_type = acc_details['bt']
-        # Search and book bed
-        cat = queryUtility(ICatalog, name='beds_catalog', default=None)
-        entries = cat.searchResults(
-            bed_type=(bedticket.bed_type,bedticket.bed_type))
-        bed = [entry for entry in entries if entry.owner == NOT_OCCUPIED][0] # first bed found
+        bed = available_beds[0] # first bed found
         bed.bookBed(student.student_id)
         bedticket.bed = bed # maybe wo don't need the bed object itself