Changeset 15307 for main/waeup.uniben/trunk

Timestamp:

28 Jan 2019, 11:19:24 (6 years ago)

Author:

Henrik Bettermann

Message:

Allow hostel booking if current session bed ticket has expired.

Location:

main/waeup.uniben/trunk/src/waeup/uniben/students

Files:

• tests/test_browser.py (modified) (4 diffs)
• utils.py (modified) (1 diff)

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

@@ -736 +736 @@
     def test_edit_level_by_co(self):
         # Create clearance officer
-        self.app['users'].addUser('mrclear', 'mrclearsecret')
+        self.app['users'].addUser('mrclear', 'mrClearsecret1')
         self.app['users']['mrclear'].email = 'mrclear@foo.ng'
         self.app['users']['mrclear'].title = 'Carlo Pitter'
@@ -749 +749 @@
         self.browser.open(self.login_path)
         self.browser.getControl(name="form.login").value = 'mrclear'
-        self.browser.getControl(name="form.password").value = 'mrclearsecret'
+        self.browser.getControl(name="form.password").value = 'mrClearsecret1'
         self.browser.getControl("Login").click()
         self.assertMatches('...You logged in...', self.browser.contents)
@@ -890 +890 @@
     def test_handle_clearance_by_co(self):
         # Create clearance officer
-        self.app['users'].addUser('mrclear', 'mrclearsecret')
+        self.app['users'].addUser('mrclear', 'mrClearsecret1')
         self.app['users']['mrclear'].email = 'mrclear@foo.ng'
         self.app['users']['mrclear'].title = 'Carlo Pitter'
@@ -902 +902 @@
         self.browser.open(self.login_path)
         self.browser.getControl(name="form.login").value = 'mrclear'
-        self.browser.getControl(name="form.password").value = 'mrclearsecret'
+        self.browser.getControl(name="form.password").value = 'mrClearsecret1'
         self.browser.getControl("Login").click()
         self.assertMatches('...You logged in...', self.browser.contents)

main/waeup.uniben/trunk/src/waeup/uniben/students/utils.py

@@ -81 +81 @@
                 'A', 'B', 'F', 'J', 'M', 'C', 'Z'):
             return _("Your are not eligible to book accommodation.")
-        if str(acc_details[
-            'booking_session']) in student['accommodation'].keys():
+        bsession = str(acc_details['booking_session'])
+        if bsession in student['accommodation'].keys() \
+            and not 'booking expired' in \
+            student['accommodation'][bsession].bed_coordinates:
             return _('You already booked a bed space in '
                      'current accommodation session.')