Changeset 17176 for main/waeup.kofa/trunk/src/waeup/kofa/hostels

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/hostels

Files:

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

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