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

Timestamp:

12 Jun 2013, 10:16:01 (12 years ago)

Author:

Henrik Bettermann

Message:

DataForBursaryExporter?: Export only paid payment tickets.

Adjust tests.

Location:

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

Files:

• export.py (modified) (2 diffs)
• tests/test_batching.py (modified) (2 diffs)
• tests/test_export.py (modified) (8 diffs)

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

@@ -96 +96 @@
     return payments
 
+def get_paid_payments(students):
+    """Get all paid payments of `students`.
+    """
+    payments = []
+    for student in students:
+        for payment in student.get('payments', {}).values():
+            if payment.p_state == 'paid':
+                payments.append(payment)
+    return payments
+
 def get_bedtickets(students):
     """Get all bedtickets of `students`.
@@ -319 +329 @@
     grok.name('bursary')
 
+    def filter_func(self, x, **kw):
+        return get_paid_payments(x)
+
     #: Fieldnames considered by this exporter
     fields = tuple(

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

@@ -276 +276 @@
         payment.creation_date = datetime.datetime(2012, 4, 1, 13, 12, 1)
         payment.p_id = 'my-id'
+        payment.p_state = 'paid'
         payment.ac = u'666'
         payment.p_item = u'p-item'
@@ -281 +282 @@
         payment.p_session = 2012
         payment.payment_date = datetime.datetime(2012, 4, 1, 14, 12, 1)
+        payment.amount_auth = 12.12
         payment.r_amount_approved = 12.12
         payment.r_code = u'r-code'

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

@@ -651 +651 @@
             'r_code,r_desc,student_id,state,current_session\r\n'
 
-            '666,0.0,2012-04-01 13:12:01,schoolfee,1,my-id,'
-            'p-item,100,2012,unpaid,2012-04-01 14:12:01,12.12,'
+            '666,12.12,2012-04-01 13:12:01,schoolfee,1,my-id,'
+            'p-item,100,2012,paid,2012-04-01 14:12:01,12.12,'
             'r-code,,A111111,created,2012\r\n'
             )
@@ -670 +670 @@
             'r_code,r_desc,student_id,state,current_session\r\n'
 
-            '666,0.0,2012-04-01 13:12:01,schoolfee,1,my-id,'
-            'p-item,100,2012,unpaid,2012-04-01 14:12:01,12.12,'
+            '666,12.12,2012-04-01 13:12:01,schoolfee,1,my-id,'
+            'p-item,100,2012,paid,2012-04-01 14:12:01,12.12,'
             'r-code,,A111111,created,2012\r\n'
             )
@@ -689 +689 @@
             'r_code,r_desc,student_id,state,current_session\r\n'
 
-            '666,0.0,2012-04-01 13:12:01,schoolfee,1,my-id,'
-            'p-item,100,2012,unpaid,2012-04-01 14:12:01,12.12,'
+            '666,12.12,2012-04-01 13:12:01,schoolfee,1,my-id,'
+            'p-item,100,2012,paid,2012-04-01 14:12:01,12.12,'
             'r-code,,A111111,created,2012\r\n'
             )
@@ -711 +711 @@
             'r_code,r_desc,student_id,state,current_session\r\n'
 
-            '666,0.0,2012-04-01 13:12:01,schoolfee,1,my-id,'
-            'p-item,100,2012,unpaid,2012-04-01 14:12:01,12.12,'
+            '666,12.12,2012-04-01 13:12:01,schoolfee,1,my-id,'
+            'p-item,100,2012,paid,2012-04-01 14:12:01,12.12,'
             'r-code,,A111111,created,2012\r\n'
             )
@@ -740 +740 @@
             'state,current_session,entry_session,entry_mode,faccode,depcode\r\n'
 
-            '666,0.0,2012-04-01 13:12:01,schoolfee,1,my-id,p-item,100,2012,'
-            'unpaid,2012-04-01 14:12:01,12.12,r-code,,A111111,234,'
+            '666,12.12,2012-04-01 13:12:01,schoolfee,1,my-id,p-item,100,2012,'
+            'paid,2012-04-01 14:12:01,12.12,r-code,,A111111,234,'
             'Anna,M.,Tester,created,2012,2010,ug_ft,NA,NA\r\n'
             )
@@ -885 +885 @@
             '%s\r\n'
             'A111111,234,Anna M. Tester,created,CERT1,NA,NA,0,200,2012,ug_ft,'
-            ',,,,,,,,,\r\n' % year_range_str,
+            ',,,,,,,,12.12,\r\n' % year_range_str,
             result
             )
@@ -898 +898 @@
         payment.p_id = 'my-id'
         payment.p_session = 2009
-        payment.amount_auth = 12.12
+        payment.amount_auth = 13.13
         payment.p_state = u'paid'
         self.student['payments']['my-2ndpayment'] = payment
@@ -909 +909 @@
             'current_level,current_session,current_mode,'
             '%s\r\nA111111,234,Anna M. Tester,created,CERT1,NA,NA,0,'
-            '200,2012,ug_ft,,,,,,12.12,,,,\r\n' % year_range_str,
+            '200,2012,ug_ft,,,,,,13.13,,,12.12,\r\n' % year_range_str,
             result
             )