Changeset 17176

Timestamp:

25 Nov 2022, 11:54:59 (2 years ago)

Author:

Henrik Bettermann

Message:

Allow students to book accommodation also if they are in previous sessions (not activated in base package).

Location:

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

Files:

• hostels/interfaces.py (modified) (2 diffs)
• hostels/tests.py (modified) (1 diff)
• students/browser.py (modified) (2 diffs)
• students/tests/test_browser.py (modified) (2 diffs)
• students/utils.py (modified) (2 diffs)

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

@@ -28 +28 @@
     bed_letters, blocks, SpecialHandlingSource,
     NOT_OCCUPIED)
+from waeup.kofa.students.interfaces import (IStudentsUtils)
 
 # Define a validation method for sort ids
@@ -285 +286 @@
             return
         catalog = getUtility(ICatalog, name='students_catalog')
+        accommodation_span = getUtility(IStudentsUtils).ACCOMMODATION_SPAN
         accommodation_session = getSite()['hostels'].accommodation_session
         students = catalog.searchResults(current_session=(
-            accommodation_session,accommodation_session))
+            accommodation_session-accommodation_span,accommodation_session))
         student_ids = [student.student_id for student in students]
         if not bed.owner in student_ids:
             raise Invalid(_(
                 "Either student does not exist or student "
-                "is not in accommodation session."))
+                "is not eligible to book accommodation."))
         catalog = getUtility(ICatalog, name='beds_catalog')
         beds = catalog.searchResults(owner=(bed.owner,bed.owner))

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

@@ -452 +452 @@
         self.assertMatches(
             "...Either student does not exist or student "
-            "is not in accommodation session...",
+            "is not eligible to book accommodation...",
             self.browser.contents)
         self.browser.getControl(name="form.owner").value = self.student_id

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

@@ -2264 +2264 @@
             p_combi = [p_combi,]
         student = self.context.__parent__
+        students_utils = getUtility(IStudentsUtils)
         # The hostel_application payment category is temporarily used
         # by Uniben.
-        if p_category in ('bed_allocation', 'hostel_application') and student[
-            'studycourse'].current_session != grok.getSite()[
-            'hostels'].accommodation_session:
+        if p_category in (
+                'bed_allocation', 'hostel_application') and grok.getSite()[
+                    'hostels'].accommodation_session - student[
+                        'studycourse'].current_session > students_utils.ACCOMMODATION_SPAN:
                 self.flash(
-                    _('Your current session does not match ' + \
-                    'accommodation session.'), type="danger")
+                    _('Your current session does not allow ' + \
+                    'to book accommodation.'), type="danger")
                 return
         if 'maintenance' in p_category:
@@ -2279 +2281 @@
                            type="warning")
                 return
-        students_utils = getUtility(IStudentsUtils)
         error, payment = students_utils.setPaymentDetails(
             p_category, student, None, None, p_combi)

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

@@ -1416 +1416 @@
         self.app['hostels'].accommodation_session = 2011
         self.browser.getControl("Create ticket").click()
-        self.assertMatches('...Your current session does not match...',
+        self.assertMatches('...Your current session does not allow...',
                            self.browser.contents)
         self.app['hostels'].accommodation_session = 2004
@@ -1439 +1439 @@
         self.student['studycourse'].current_session = 2003
         self.browser.getControl("Book accommodation").click()
-        self.assertMatches('...Your current session does not match...',
-                           self.browser.contents)
+        self.assertMatches(
+            '...Your current session does not allow to book accommodation...',
+            self.browser.contents)
         self.student['studycourse'].current_session = 2004
         # All requirements are met and ticket can be created

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

@@ -654 +654 @@
         return d
 
+    ACCOMMODATION_SPAN = 0
+
     def checkAccommodationRequirements(self, student, acc_details):
         if acc_details.get('expired', False):
@@ -672 +674 @@
         if not student.state in acc_details['allowed_states']:
             return _("You are in the wrong registration state.")
-        if student['studycourse'].current_session != acc_details[
-            'booking_session']:
-            return _('Your current session does not '
-                     'match accommodation session.')
+        if  acc_details['booking_session'] - student[
+            'studycourse'].current_session > self.ACCOMMODATION_SPAN:
+            return _('Your current session does not allow ' + \
+                    'to book accommodation.')
         bsession = str(acc_details['booking_session'])
         if bsession in student['accommodation'].keys() \