Changeset 17182 for main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py

Timestamp:

30 Nov 2022, 14:09:18 (22 months ago)

Author:

Henrik Bettermann

Message:

p_session of bed allocation and maintenance fees is always the portal’s accommodation session and not the student’s current session.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py (modified) (2 diffs)

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

@@ -2267 +2267 @@
         # The hostel_application payment category is temporarily used
         # by Uniben.
-        if p_category in (
-                'bed_allocation', 'hostel_application') and grok.getSite()[
-                    'hostels'].accommodation_session - student[
-                        'studycourse'].current_session > students_utils.ACCOMMODATION_SPAN:
+        accommodation_session = grok.getSite()['hostels'].accommodation_session
+        if p_category in ('bed_allocation', 'hostel_application') \
+            and accommodation_session - student[
+                'studycourse'].current_session > students_utils.ACCOMMODATION_SPAN:
                 self.flash(
                     _('Your current session does not allow ' + \
@@ -2276 +2276 @@
                 return
         if 'maintenance' in p_category:
-            current_session = str(student['studycourse'].current_session)
-            if not current_session in student['accommodation']:
+            if str(accommodation_session) not in student['accommodation']:
                 self.flash(_('You have not yet booked accommodation.'),
                            type="warning")