Changeset 11661

Timestamp:

21 May 2014, 05:53:55 (11 years ago)

Author:

Henrik Bettermann

Message:

Add regular school fee and balance payments when exporting payments overviews.

Location:

main/waeup.kofa/trunk

Files:

• CHANGES.txt (modified) (1 diff)
• src/waeup/kofa/students/export.py (modified) (1 diff)
• src/waeup/kofa/students/tests/test_export.py (modified) (2 diffs)

main/waeup.kofa/trunk/CHANGES.txt

@@ -4 +4 @@
 1.2dev (unreleased)
 ===================
+
+* Add regular school fee and balance payments when exporting payments
+  overviews.
 
 * Add samePaymentMade method to StudentsUtils.

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

@@ -421 +421 @@
     def mangle_value(self, value, name, context=None):
         if name in self.year_range_tuple and context is not None:
-            value = ''
+            value = 0
             for ticket in context['payments'].values():
                 if ticket.p_state == 'paid' and \
                     ticket.p_category == 'schoolfee' and \
                     ticket.p_session == int(name):
-                    value = ticket.amount_auth
-                    break
+                    value += ticket.amount_auth
+            if value == 0:
+                value = ''
         return super(
             StudentsExporter, self).mangle_value(

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

@@ -937 +937 @@
         # set values we can expect in export file
         self.setup_student(self.student)
-        # We add successful payments
-        payment = StudentOnlinePayment()
-        payment.p_id = 'my-id'
-        payment.p_session = 2009
-        payment.amount_auth = 13.13
-        payment.p_state = u'paid'
-        payment.p_category = u'schoolfee'
-        self.student['payments']['my-2ndpayment'] = payment
+        # We add successful payments. 
+        payment_2 = StudentOnlinePayment()
+        payment_2.p_id = 'my-id'
+        payment_2.p_session = curr_year - 5
+        payment_2.amount_auth = 13.13
+        payment_2.p_state = u'paid'
+        payment_2.p_category = u'schoolfee'
+        self.student['payments']['my-2ndpayment'] = payment_2
+        # This one could be a balance payment.
+        # The amount is being added.
+        payment_3 = StudentOnlinePayment()
+        payment_3.p_id = 'my-id_2'
+        payment_3.p_session = curr_year - 5
+        payment_3.amount_auth = 1.01
+        payment_3.p_state = u'paid'
+        payment_3.p_category = u'schoolfee'
+        self.student['payments']['my-3rdpayment'] = payment_3
         exporter = StudentPaymentsOverviewExporter()
         exporter.export_all(self.app, self.outfile)
@@ -953 +962 @@
             'current_level,current_session,current_mode,'
             '%s\r\nA111111,234,Anna M. Tester,created,CERT1,NA,NA,0,'
-            '200,2012,ug_ft' % year_range_str in result
+            '200,2012,ug_ft,,,,,14.14,,,12.12,,\r\n'
+            % year_range_str in result
             )
         return