Changeset 13641

Timestamp:

20 Jan 2016, 17:18:11 (9 years ago)

Author:

Henrik Bettermann

Message:

StudentPaymentsOverviewExporter? should export reg_number.

Location:

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

Files:

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

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

@@ -363 +363 @@
             IStudentOnlinePayment, exclude_attribs=False,
             omit=['display_item']))) + (
-            'student_id','state','current_session', 'reg_number')
+            'student_id','state','current_session')
     title = _(u'Student Payments')
 
@@ -482 +482 @@
     fields = ('student_id', 'matric_number', 'display_fullname',
         'state', 'certcode', 'faccode', 'depcode', 'is_postgrad',
-        'current_level', 'current_session', 'current_mode', 'entry_session'
+        'current_level', 'current_session', 'current_mode',
+        'entry_session', 'reg_number'
         ) + year_range_tuple
     title = _(u'Student Payments Overview')

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

@@ -746 +746 @@
             '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,state,current_session,reg_number\r\n'
-
-            ',0.0,2012-04-01 13:12:01#,,1,,,,,unpaid,,0.0,,,,,,\r\n'
+            'r_code,r_desc,student_id,state,current_session\r\n'
+
+            ',0.0,2012-04-01 13:12:01#,,1,,,,,unpaid,,0.0,,,,,\r\n'
             )
         return
@@ -764 +764 @@
             '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,state,current_session,reg_number\r\n'
+            'r_code,r_desc,student_id,state,current_session\r\n'
 
             '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'
+            'r-code,,A111111,created,2012\r\n'
             )
         return
@@ -783 +783 @@
             '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,state,current_session,reg_number\r\n'
+            'r_code,r_desc,student_id,state,current_session\r\n'
 
             '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'
+            'r-code,,A111111,created,2012\r\n'
             )
         return
@@ -802 +802 @@
             '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,state,current_session,reg_number\r\n'
+            'r_code,r_desc,student_id,state,current_session\r\n'
 
             '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'
+            'r-code,,A111111,created,2012\r\n'
             )
         return
@@ -824 +824 @@
             '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,state,current_session,reg_number\r\n'
+            'r_code,r_desc,student_id,state,current_session\r\n'
 
             '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'
+            'r-code,,A111111,created,2012\r\n'
             )
         return
@@ -860 +860 @@
             '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,state,current_session,reg_number\r\n'
+            'r_code,r_desc,student_id,state,current_session\r\n'
 
             '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'
+            'r-code,,A111111,created,2012\r\n'
             )
         # Payment date is 2012-04-01, 14:12:01.
@@ -877 +877 @@
             '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,state,current_session,reg_number\r\n'
+            'r_code,r_desc,student_id,state,current_session\r\n'
             )
         exporter.export_filtered(
@@ -888 +888 @@
             '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,state,current_session,reg_number\r\n'
+            'r_code,r_desc,student_id,state,current_session\r\n'
             )
         # No results if payment_date is not set
@@ -901 +901 @@
             '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,state,current_session,reg_number\r\n'
+            'r_code,r_desc,student_id,state,current_session\r\n'
             )
         return
@@ -926 +926 @@
             '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,state,current_session,reg_number\r\n'
+            'r_code,r_desc,student_id,state,current_session\r\n'
             )
         # Make ticket unpaid
@@ -936 +936 @@
             '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,state,current_session,reg_number\r\n'
+            'r_code,r_desc,student_id,state,current_session\r\n'
 
             '666,12.12,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,2012,\r\n'
+            'r-code,,A111111,created,2012\r\n'
             )
         return
@@ -1110 +1110 @@
             'faccode,depcode,is_postgrad,'
             'current_level,current_session,current_mode,entry_session,'
-            '%s\r\n'
+            'reg_number,%s\r\n'
             'A111111,234,Anna M. Tester,created,CERT1,NA,NA,0,'
             '200,2012,ug_ft,2010,'
@@ -1153 +1153 @@
             'certcode,faccode,depcode,is_postgrad,'
             'current_level,current_session,current_mode,entry_session,'
-            '%s\r\nA111111,234,Anna M. Tester,created,CERT1,NA,NA,0,'
-            '200,2012,ug_ft,2010,,,,,,14.14,waived,,,,\r\n'
+            'reg_number,%s\r\nA111111,234,Anna M. Tester,created,CERT1,NA,NA,0,'
+            '200,2012,ug_ft,2010,123,,,,,,14.14,waived,,,,\r\n'
             % year_range_str in result
             )