Changeset 9151

Timestamp:

4 Sep 2012, 07:03:24 (12 years ago)

Author:

Henrik Bettermann

Message:

Check if we can import p_current.

Location:

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

Files:

• tests/sample_payment_data.csv (modified) (1 diff)
• tests/test_batching.py (modified) (3 diffs)
• utils.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/sample_payment_data.csv

@@ -1 @@
-matric_number,p_state,p_category,p_id,reg_number,session_id,r_amount_approved,p_item,amount_auth,r_card_num,r_code,creation_date,type
-,paid,schoolfee,3816951290797973744#,1,2010,19500,BTECHBDT,19500,0942,00,2010/11/26 19:59:33.744 GMT+1,online
-100001,unpaid,schoolfee,3816951290712593757,,2010,0,BTECHBDT,19500,0942,Z0,2010-11-25 20:16:33.757 WAT,online
-,paid,schoolfee,p1266236341955,3,2009,19500,BTECHBDT,19500,0615,00,2010/02/15 13:19:01,online
+matric_number,p_state,p_category,p_id,reg_number,session_id,r_amount_approved,p_item,amount_auth,r_card_num,r_code,creation_date,type,p_current
+,paid,schoolfee,3816951290797973744#,1,2010,19500,BTECHBDT,19500,0942,00,2010/11/26 19:59:33.744 GMT+1,online,1
+100001,unpaid,schoolfee,3816951290712593757,,2010,0,BTECHBDT,19500,0942,Z0,2010-11-25 20:16:33.757 WAT,online,0
+,paid,schoolfee,p1266236341955,3,2009,19500,BTECHBDT,19500,0615,00,2010/02/15 13:19:01,online,1

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

@@ -915 +915 @@
             p_id='p2907979737440'), self.app)
         self.assertEqual(payment.p_id, 'p2907979737440')
+        self.assertTrue(payment.p_current)
         cdate = payment.creation_date.strftime("%Y-%m-%d %H:%M:%S")
         self.assertEqual(cdate, "2010-11-26 18:59:33")
@@ -921 +922 @@
             p_id='p2907125937570'), self.app)
         self.assertEqual(payment.p_id, 'p2907125937570')
+        self.assertFalse(payment.p_current)
         cdate = payment.creation_date.strftime("%Y-%m-%d %H:%M:%S")
         # Ooooh, still the old problem, see
@@ -932 +934 @@
         self.assertTrue(
             'INFO - system - K1000001 - Payment ticket updated: '
-            'p_id=p1266236341955, p_item=BTECHBDT, '
-            'creation_date=2010-02-15 13:19:01+00:00, r_code=00, '
-            'r_amount_approved=19500.0, p_category=schoolfee, '
-            'amount_auth=19500.0, p_state=paid'
+            'p_item=BTECHBDT, creation_date=2010-02-15 13:19:01+00:00, '
+            'p_category=schoolfee, amount_auth=19500.0, p_current=True, '
+            'p_id=p1266236341955, r_code=00, r_amount_approved=19500.0, '
+            'p_state=paid'
             in logcontent)
 

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

@@ -282 +282 @@
 
     def setPaymentDetails(self, category, student,
-            previous_session=None, previous_level=None):
+            previous_session, previous_level):
         """Create Payment object and set the payment data of a student for
         the payment category specified.