Changeset 16329 for main

Timestamp:

21 Nov 2020, 14:59:17 (4 years ago)

Author:

Henrik Bettermann

Message:

Add field to bursary data exporter.

Location:

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

Files:

• browser.py (modified) (1 diff)
• export.py (modified) (1 diff)
• tests/test_browser.py (modified) (4 diffs)
• tests/test_export.py (modified) (2 diffs)

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

@@ -2217 +2217 @@
         return
 
-    #@action(_('Add online payment ticket'))
-    #def addPaymentTicket(self, **data):
-    #    self.redirect(self.url(self.context, '@@addop'))
-
 class OnlinePaymentAddFormPage(KofaAddFormPage):
     """ Page to add an online payment ticket

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

@@ -640 +640 @@
             omit=['display_item', 'certificate', 'student']))) + (
             'student_id','matric_number','reg_number',
-            'firstname', 'middlename', 'lastname',
+            'firstname', 'middlename', 'lastname','sex',
             'state','current_session',
             'entry_session', 'entry_mode',

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

@@ -4243 +4243 @@
             '666,12.12,2012-12-13 00:00:00#,schoolfee,[],1,my-id,p-item,100,%s,'
             'paid,2012-12-13 00:00:00#,12.12,r-code,,K1000000,234,123,Anna,,'
-            'Tester,created,2004,2004,,fac1,dep1,CERT1'
+            'Tester,,created,2004,2004,,fac1,dep1,CERT1'
             %(curr_year-6) in self.browser.contents)
         self.assertEqual(len(self.app['datacenter'].running_exports), 1)
@@ -4290 +4290 @@
             '666,12.12,2012-12-13 00:00:00#,schoolfee,[],1,my-id,p-item,100,%s,'
             'paid,2012-12-13 00:00:00#,12.12,r-code,,K1000000,234,123,Anna,,'
-            'Tester,created,2004,2004,,fac1,dep1,CERT1'
+            'Tester,,created,2004,2004,,fac1,dep1,CERT1'
             %(curr_year-6) in self.browser.contents)
 
@@ -4649 +4649 @@
             '666,12.12,2012-12-13 00:00:00#,schoolfee,[],1,my-id,p-item,100,%s,'
             'paid,2012-12-13 00:00:00#,12.12,r-code,,K1000000,234,123,Anna,,'
-            'Tester,created,2004,2004,,fac1,dep1,CERT1'
+            'Tester,,created,2004,2004,,fac1,dep1,CERT1'
             %(curr_year-6) in self.browser.contents)
         # ... and discarded
@@ -4676 +4676 @@
             '666,12.12,2012-12-13 00:00:00#,schoolfee,[],1,my-id,p-item,100,%s,'
             'paid,2012-12-13 00:00:00#,12.12,r-code,,K1000000,234,123,Anna,,'
-            'Tester,created,2004,2004,,fac1,dep1,CERT1'
+            'Tester,,created,2004,2004,,fac1,dep1,CERT1'
             %(curr_year-6) in self.browser.contents)
 

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

@@ -1197 +1197 @@
             'p_level,p_session,p_state,payment_date,r_amount_approved,r_code,'
             'r_desc,student_id,matric_number,reg_number,firstname,middlename,lastname,'
-            'state,current_session,entry_session,entry_mode,faccode,depcode,certcode\r\n'
+            'sex,state,current_session,entry_session,entry_mode,faccode,depcode,certcode\r\n'
 
             '666,12.12,%s-04-01 13:12:01#,schoolfee,[],1,my-id,p-item,100,%s,'
             'paid,%s-04-01 14:12:01#,12.12,r-code,,A111111,234,123,'
-            'Anna,M.,Tester,created,2012,2010,ug_ft,NA,NA,CERT1\r\n'
+            'Anna,M.,Tester,,created,2012,2010,ug_ft,NA,NA,CERT1\r\n'
             % (curr_year-6, curr_year-6, curr_year-6)
             )
@@ -1255 +1255 @@
             'ac,amount_auth,creation_date,p_category,p_combi,p_current,p_id,p_item,'
             'p_level,p_session,p_state,payment_date,r_amount_approved,r_code,'
-            'r_desc,student_id,matric_number,reg_number,firstname,middlename,lastname,'
+            'r_desc,student_id,matric_number,reg_number,firstname,middlename,lastname,sex,'
             'state,current_session,entry_session,entry_mode,faccode,depcode,certcode\r\n'
             'abc,12.12,%s-04-01 13:12:01#,bed_allocation,[],1,id1,xyz,100,%s,'
             'paid,%s-04-01 14:12:01#,12.12,cde,,A111111,234,123,'
-            'Anna,M.,Tester,created,2012,2010,ug_ft,NA,NA,CERT1\r\n'
+            'Anna,M.,Tester,,created,2012,2010,ug_ft,NA,NA,CERT1\r\n'
             'abc,12.12,%s-04-01 13:12:01#,hostel_maintenance,[],1,id2,xyz,100,%s,'
             'paid,%s-04-01 14:12:01#,12.12,cde,,A111111,234,123,'
-            'Anna,M.,Tester,created,2012,2010,ug_ft,NA,NA,CERT1\r\n'
+            'Anna,M.,Tester,,created,2012,2010,ug_ft,NA,NA,CERT1\r\n'
             % (curr_year-6, curr_year-6, curr_year-6,
                curr_year-6, curr_year-6, curr_year-6)