Changeset 17182 for main

Timestamp:

30 Nov 2022, 14:09:18 (2 years 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.

Location:

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

Files:

• browser.py (modified) (2 diffs)
• utils.py (modified) (1 diff)

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")

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

@@ -490 +490 @@
             amount = academic_session.clearance_fee
         elif category == 'bed_allocation':
-            p_item = self.getAccommodationDetails(student)['bt']
+            acco_details = self.getAccommodationDetails(student)
+            p_session = acco_details['booking_session']
+            p_item = acco_details['bt']
             amount = academic_session.booking_fee
         elif category == 'hostel_maintenance':
             amount = 0.0
-            bedticket = student['accommodation'].get(
-                str(student.current_session), None)
+            booking_session = grok.getSite()['hostels'].accommodation_session
+            bedticket = student['accommodation'].get(str(booking_session), None)
             if bedticket is not None and bedticket.bed is not None:
+                p_session = booking_session
                 p_item = bedticket.bed_coordinates
                 if bedticket.bed.__parent__.maint_fee > 0: