Changeset 13314 for main/waeup.kofa

Timestamp:

13 Oct 2015, 17:29:07 (9 years ago)

Author:

Henrik Bettermann

Message:

Add maint_payment_made method to BedTicket? class.

Location:

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

Files:

• accommodation.py (modified) (1 diff)
• export.py (modified) (1 diff)
• interfaces.py (modified) (1 diff)
• tests/test_browser.py (modified) (1 diff)
• tests/test_student.py (modified) (1 diff)

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

@@ -81 +81 @@
         return students_utils.getBedCoordinates(self)
 
+    @property
+    def maint_payment_made(self):
+        try:
+            if len(self.student['payments']):
+                for ticket in self.student['payments'].values():
+                    if ticket.p_category == 'hostel_maintenance' and \
+                        ticket.p_session == self.booking_session and \
+                        ticket.p_state == 'paid':
+                            return True
+        except TypeError: # in unit tests
+            pass
+        return False
+
     def writeLogMessage(self, view, message):
         return self.__parent__.__parent__.writeLogMessage(view, message)

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

@@ -445 +445 @@
         sorted(iface_names(
             IBedTicket, exclude_attribs=False,
-            omit=['display_coordinates']))) + (
+            omit=['display_coordinates', 'maint_payment_made']))) + (
             'student_id', 'actual_bed_type')
     title = _(u'Bed Tickets')

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

@@ -705 +705 @@
     """A representation of accommodation booking data.
     """
-    bed = Attribute('The bed object.')
+    bed = Attribute('The bed object')
     booking_date = Attribute('Date of booking the bed')
+    maint_payment_made = Attribute('True if maintenance payment is made')
 
     display_coordinates = schema.TextLine(

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

@@ -3090 +3090 @@
         value = ctrl.options[1]
         self.assertEqual(self.student['payments'][value].amount_auth, 987.0)
+        # The bedticket is aware of successfull maintenance fee payment
+        bedticket = self.student['accommodation']['2004']
+        self.assertFalse(bedticket.maint_payment_made)
+        self.student['payments'][value].approve()
+        self.assertTrue(bedticket.maint_payment_made)
         return
 

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

@@ -140 +140 @@
         return
 
+    def test_maint_payment_made(self):
+        self.assertFalse(self.bedticket.maint_payment_made)
+        return
+
+
 class StudentRemovalTests(StudentImportExportSetup):
     # Test handle_student_removed