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

Timestamp:

2 Oct 2012, 19:08:02 (12 years ago)

Author:

Henrik Bettermann

Message:

Export current_session. We need this to disable the right payments in FCEOkene.

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

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

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

@@ -70 +70 @@
         try:
             return self.student.state
+        except AttributeError:
+            return None
+
+    @property
+    def current_session(self):
+        try:
+            return self.student.current_session
         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,student_state\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,current_session\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,student_state\r\n'
+            'r_code,r_desc,student_id,student_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,'
-            'r-code,,A111111,created\r\n'
+            'r-code,,A111111,created,2012\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,student_state\r\n'
+            'r_code,r_desc,student_id,student_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,'
-            'r-code,,A111111,created\r\n'
+            'r-code,,A111111,created,2012\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,student_state\r\n'
+            'r_code,r_desc,student_id,student_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,'
-            'r-code,,A111111,created\r\n'
-            )
-        return
+            'r-code,,A111111,created,2012\r\n'
+            )
+        return