Changeset 13952

Timestamp:

17 Jun 2016, 13:02:01 (8 years ago)

Author:

Henrik Bettermann

Message:

Export also reg_number and display_fullname.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/applicants

Files:

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

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

@@ -161 +161 @@
         IApplicantOnlinePayment,
         exclude_attribs=False,
-        omit=['display_item']))) + ('applicant_id',)
+        omit=['display_item']))) + (
+              'applicant_id',
+              'reg_number',
+              'display_fullname',)
     title = _(u'Applicant Payments')
 
@@ -167 +170 @@
         """The mangler determines the applicant's id.
         """
-        if name == 'applicant_id' and context is not None:
+        if name in ('applicant_id', 'reg_number',
+            'display_fullname',) and context is not None:
             applicant = context.__parent__
             value = getattr(applicant, name, None)

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

@@ -287 +287 @@
         cdate = str('%s#' % self.applicant['p120'].creation_date)
         self.assertEqual(
-            'ac,amount_auth,creation_date,p_category,p_id,p_item,p_session,'
-            'p_state,payment_date,r_amount_approved,r_code,r_desc,'
-            'applicant_id\r\n,'
-            '0.0,%s,application,p120,,2012,'
-            'paid,,0.0,,,dp2011_654321\r\n' % cdate, result)
+            'ac,amount_auth,creation_date,p_category,p_id,'
+            'p_item,p_session,p_state,payment_date,r_amount_approved,'
+            'r_code,r_desc,applicant_id,reg_number,display_fullname\r\n'
+            ',0.0,%s,application,p120,,2012,paid,,0.0,,,dp2011_654321,'
+            '123456,Anna M. Tester\r\n' % cdate, result)
         return
 
@@ -301 +301 @@
         cdate = str('%s#' % self.applicant['p120'].creation_date)
         self.assertEqual(
-            'ac,amount_auth,creation_date,p_category,p_id,p_item,p_session,'
-            'p_state,payment_date,r_amount_approved,r_code,r_desc,'
-            'applicant_id\r\n,'
-            '0.0,%s,application,p120,,2012,'
-            'paid,,0.0,,,dp2011_654321\r\n' % cdate, result)
+            'ac,amount_auth,creation_date,p_category,p_id,'
+            'p_item,p_session,p_state,payment_date,r_amount_approved,'
+            'r_code,r_desc,applicant_id,reg_number,display_fullname\r\n'
+            ',0.0,%s,application,p120,,2012,paid,,0.0,,,dp2011_654321,'
+            '123456,Anna M. Tester\r\n' % cdate, result)
         return
 
@@ -316 +316 @@
         cdate = str('%s#' % self.applicant['p120'].creation_date)
         self.assertEqual(
-            'ac,amount_auth,creation_date,p_category,p_id,p_item,p_session,'
-            'p_state,payment_date,r_amount_approved,r_code,r_desc,'
-            'applicant_id\r\n,'
-            '0.0,%s,application,p120,,2012,'
-            'paid,,0.0,,,dp2011_654321\r\n' % cdate, result)
-        return
+            'ac,amount_auth,creation_date,p_category,p_id,'
+            'p_item,p_session,p_state,payment_date,r_amount_approved,'
+            'r_code,r_desc,applicant_id,reg_number,display_fullname\r\n'
+            ',0.0,%s,application,p120,,2012,paid,,0.0,,,dp2011_654321,'
+            '123456,Anna M. Tester\r\n' % cdate, result)
+        return