Changeset 17183

Timestamp:

30 Nov 2022, 14:35:10 (22 months ago)

Author:

Henrik Bettermann

Message:

Adjust to changes in base package.

Location:

main/waeup.fceokene/trunk/src/waeup/fceokene/students

Files:

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

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

@@ -277 +277 @@
         self.assertEqual(error, None)
 
-        self.student['studycourse'].current_session = 2005
+        self.app['hostels'].accommodation_session = 2005
         error, payment = utils.setPaymentDetails('hostel_maintenance',self.student)
         self.assertEqual(payment, None)
         self.assertEqual(error, 'No bed space allocated.')
-        self.student['studycourse'].current_session = 2004
+        self.app['hostels'].accommodation_session = 2004
 
         error, payment = utils.setPaymentDetails('hostel_maintenance',self.student)
@@ -322 +322 @@
         self.assertEqual(payment.p_session, 2004)
         self.assertEqual(payment.amount_auth, 150)
-        self.assertEqual(payment.p_item, u'')
+        self.assertEqual(payment.p_item, u'regular_male_fr')
         self.assertEqual(error, None)
 

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

@@ -105 +105 @@
             amount = academic_session.gown_fee
         elif category == 'bed_allocation':
+            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':
-            current_session = student['studycourse'].current_session
-            bedticket = student['accommodation'].get(str(current_session), None)
+            amount = 0.0
+            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: