Changeset 7060 for main/waeup.sirp/trunk

Timestamp:

9 Nov 2011, 13:34:17 (13 years ago)

Author:

Henrik Bettermann

Message:

Add more tests.

browser.py: If student owns a bed, this bed will be taken (to be prepared for the upcoming student allocation feature), otherwise an empty bed is looked up.

Location:

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

Files:

• browser.py (modified) (3 diffs)
• tests/test_browser.py (modified) (2 diffs)

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

@@ -1238 +1238 @@
         if str(grok.getSite()[
                 'configuration'].accommodation_session) in self.context.keys():
-            self.flash('You already booked a bed space for the current accommodation session.')
+            self.flash('You already booked a bed space in current accommodation session.')
             self.redirect(self.url(self.context))
             return
@@ -1250 +1250 @@
             self.flash('Activation code is invalid.')
             return
-        # Search a bed and exit if no bed is found or if the student
-        # has already booked a bed
+        # Search and book bed
         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
-        entries = cat.searchResults(
             owner=(student.student_id,student.student_id))
-        # Cannot happen but anyway ...
         if len(entries):
+            # If bed space has bee manually allocated use this bed
             bed = [entry for entry in entries][0]
-            self.flash('You already booked bed %s.'
-                        % bed.bed_id)
-            return
+        else:
+            # else search for other available beds
+            entries = cat.searchResults(
+                bed_type=(acc_details['bt'],acc_details['bt']))
+            available_beds = [
+                entry for entry in entries if entry.owner == NOT_OCCUPIED]
+            if available_beds:
+                bed = self.selectBed(available_beds)
+                bed.bookBed(student.student_id)
+            else:
+                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:
@@ -1281 +1282 @@
                 self.flash('You are not the owner of this access code.')
                 return
-        # Create bed ticket and book bed
+        # Create bed ticket
         bedticket = createObject(u'waeup.BedTicket')
         bedticket.booking_code = pin
         bedticket.booking_session = acc_details['booking_session']
         bedticket.bed_type = acc_details['bt']
-        bed = self.selectBed(available_beds)
-        bed.bookBed(student.student_id)
         bedticket.bed = bed
         hall_title = bed.__parent__.hostel_name

main/waeup.sirp/trunk/src/waeup/sirp/students/tests/test_browser.py

@@ -1004 +1004 @@
         pin = self.app['accesscodes']['HOS-0'].keys()[0]
         ac = self.app['accesscodes']['HOS-0'][pin]
-        ac.owner = self.student_id
+        ac.owner = u'Anybody'
         parts = pin.split('-')[1:]
         sfeseries, sfenumber = parts
@@ -1017 +1017 @@
         self.assertMatches('...Activation Code:...',
                            self.browser.contents)
+        self.browser.getControl(name="ac_series").value = u'nonsense'
+        self.browser.getControl(name="ac_number").value = sfenumber
+        self.browser.getControl("Create bed ticket").click()
+        self.assertMatches('...Activation code is invalid...',
+                           self.browser.contents)
+        self.browser.getControl(name="ac_series").value = sfeseries
+        self.browser.getControl(name="ac_number").value = sfenumber
+        self.browser.getControl("Create bed ticket").click()
+        self.assertMatches('...You are not the owner of this access code...',
+                           self.browser.contents)
+        ac.owner = self.student_id
         self.browser.getControl(name="ac_series").value = sfeseries
         self.browser.getControl(name="ac_number").value = sfenumber