Changeset 10681 for main/waeup.kofa/trunk/src/waeup

Timestamp:

1 Nov 2013, 07:59:47 (11 years ago)

Author:

Henrik Bettermann

Message:

Set maintenance fee for each hostel.

Location:

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

Files:

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

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

@@ -199 +199 @@
         hostel.hostel_id = u'hall-1'
         hostel.hostel_name = u'Hall 1'
+        hostel.maint_fee = 876.0
         self.app['hostels'].addHostel(hostel)
         bed = Bed()
@@ -2941 +2942 @@
         self.assertMatches('...Payment ticket created...',
                            self.browser.contents)
+
+        ctrl = self.browser.getControl(name='val_id')
+        value = ctrl.options[0]
+        # Maintennace fee is taken from the hostel object
+        self.assertEqual(self.student['payments'][value].amount_auth, 876.0)
+        # If the hostel's maintenance fee isn't set, the fee is
+        # taken from the session configuration object.
+        self.app['hostels']['hall-1'].maint_fee = 0.0
+        self.browser.open(self.payments_path + '/addop')
+        self.browser.getControl(name="form.p_category").value = ['hostel_maintenance']
+        self.browser.getControl("Create ticket").click()
+        ctrl = self.browser.getControl(name='val_id')
+        value = ctrl.options[1]
+        self.assertEqual(self.student['payments'][value].amount_auth, 987.0)
         return
 

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

@@ -406 +406 @@
             amount = academic_session.booking_fee
         elif category == 'hostel_maintenance':
-            amount = academic_session.maint_fee
+            amount = 0.0
             bedticket = student['accommodation'].get(
                 str(student.current_session), None)
             if bedticket:
                 p_item = bedticket.bed_coordinates
+                if bedticket.bed.__parent__.maint_fee > 0:
+                    amount = bedticket.bed.__parent__.maint_fee
+                else:
+                    # fallback
+                    amount = academic_session.maint_fee
             else:
                 # Should not happen because this is already checked