Changeset 11756

Timestamp:

9 Jul 2014, 12:46:08 (10 years ago)

Author:

Henrik Bettermann

Message:

Catch error if payment_date and payment is None.

Location:

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

Files:

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

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

@@ -108 +108 @@
             for student in students:
                 for payment in student.get('payments', {}).values():
-                    if payment.p_state == 'paid' and \
+                    if payment.payment_date and payment.p_state == 'paid' and \
                         payment.payment_date > payments_start and \
                         payment.payment_date < payments_end:
@@ -116 +116 @@
             for student in students:
                 for payment in student.get('payments', {}).values():
-                    if payment.payment_date > payments_start and \
+                    if payment.payment_date and payment.payment_date > payments_start and \
                         payment.payment_date < payments_end:
                         payments.append(payment)

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

@@ -287 +287 @@
         payment.r_code = u'r-code'
         # XXX: there is no addPayment method to give predictable names
-        student['payments']['my-payment'] = payment
+        self.payment = student['payments']['my-payment'] = payment
         return payment
 

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

@@ -817 +817 @@
             'r_code,r_desc,student_id,state,current_session\r\n'
             )
+        # no results if payment_date is not set
+        self.payment.payment_date = None
+        exporter.export_filtered(
+            self.app, self.outfile,
+            current_session=None, current_level=None,
+            payments_start='01/04/2012', payments_end='02/04/2012')
+        result = open(self.outfile, 'rb').read()
+        
         return