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

Timestamp:

28 May 2013, 09:11:56 (12 years ago)

Author:

Henrik Bettermann

Message:

Add more columns to bursary export file.

Location:

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

Files:

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

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

@@ -324 +324 @@
             IStudentOnlinePayment, exclude_attribs=False,
             omit=['display_item']))) + (
-            'student_id','matric_number','state','current_session',
-            'faccode', 'depcode', 'display_fullname')
+            'student_id','matric_number',
+            'firstname', 'middlename', 'lastname',
+            'state','current_session',
+            'entry_session', 'entry_mode',
+            'faccode', 'depcode')
 
     #: The title under which this exporter will be displayed
@@ -335 +338 @@
         if context is not None:
             student = context.student
-            if name in ['student_id','matric_number',
-                        'state','current_session',
-                        'faccode','depcode',
-                        'display_fullname'] and student is not None:
+            if name in [
+                'student_id','matric_number',
+                'firstname', 'middlename', 'lastname',
+                'state','current_session',
+                'entry_session', 'entry_mode',
+                'faccode', 'depcode'] and student is not None:
                 value = getattr(student, name, None)
         return super(

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

@@ -736 +736 @@
             result,
             '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,matric_number,state,current_session,'
-            'faccode,depcode,display_fullname\r\n'
+            'p_level,p_session,p_state,payment_date,r_amount_approved,r_code,'
+            'r_desc,student_id,matric_number,firstname,middlename,lastname,'
+            'state,current_session,entry_session,entry_mode,faccode,depcode\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,'
-            '234,created,2012,NA,NA,Anna M. Tester\r\n'
+            'unpaid,2012-04-01 14:12:01,12.12,r-code,,A111111,234,'
+            'Anna,M.,Tester,created,2012,2010,,NA,NA\r\n'
             )
         return