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

Timestamp:

30 Sep 2012, 13:05:04 (12 years ago)

Author:

Henrik Bettermann

Message:

Export payments with student_state to sort out if payments do not correspond with states set manually by officers.

Location:

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

Files:

• export.py (modified) (1 diff)
• payments.py (modified) (1 diff)
• tests/test_export.py (modified) (4 diffs)

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

@@ -248 +248 @@
     fields = tuple(
         sorted(iface_names(
-            IStudentOnlinePayment, exclude_attribs=False))) + ('student_id',)
+            IStudentOnlinePayment, exclude_attribs=False))) + (
+                'student_id','student_state')
 
     #: The title under which this exporter will be displayed

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

@@ -63 +63 @@
         try:
             return self.__parent__.__parent__
+        except AttributeError:
+            return None
+
+    @property
+    def student_state(self):
+        try:
+            return self.student.state
         except AttributeError:
             return None

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

@@ -377 +377 @@
             'ac,amount_auth,creation_date,p_category,p_current,p_id,'
             'p_item,p_level,p_session,p_state,payment_date,r_amount_approved,'
-            'r_code,r_desc,student_id\r\n'
-
-            ',0.0,2012-04-01 13:12:01,schoolfee,1,,,,,unpaid,,0.0,,,\r\n'
+            'r_code,r_desc,student_id,student_state\r\n'
+
+            ',0.0,2012-04-01 13:12:01,schoolfee,1,,,,,unpaid,,0.0,,,,\r\n'
             )
         return
@@ -395 +395 @@
             'ac,amount_auth,creation_date,p_category,p_current,p_id,'
             'p_item,p_level,p_session,p_state,payment_date,r_amount_approved,'
-            'r_code,r_desc,student_id\r\n'
+            'r_code,r_desc,student_id,student_state\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\r\n'
+            'r-code,,A111111,created\r\n'
             )
         return
@@ -414 +414 @@
             'ac,amount_auth,creation_date,p_category,p_current,p_id,'
             'p_item,p_level,p_session,p_state,payment_date,r_amount_approved,'
-            'r_code,r_desc,student_id\r\n'
+            'r_code,r_desc,student_id,student_state\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\r\n'
+            'r-code,,A111111,created\r\n'
             )
         return
@@ -433 +433 @@
             'ac,amount_auth,creation_date,p_category,p_current,p_id,'
             'p_item,p_level,p_session,p_state,payment_date,r_amount_approved,'
-            'r_code,r_desc,student_id\r\n'
+            'r_code,r_desc,student_id,student_state\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\r\n'
-            )
-        return
+            'r-code,,A111111,created\r\n'
+            )
+        return