Changeset 13641


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • main/waeup.kofa/trunk/src/waeup/kofa/students/export.py

    r13640 r13641  
    363363            IStudentOnlinePayment, exclude_attribs=False,
    364364            omit=['display_item']))) + (
    365             'student_id','state','current_session', 'reg_number')
     365            'student_id','state','current_session')
    366366    title = _(u'Student Payments')
    367367
     
    482482    fields = ('student_id', 'matric_number', 'display_fullname',
    483483        'state', 'certcode', 'faccode', 'depcode', 'is_postgrad',
    484         'current_level', 'current_session', 'current_mode', 'entry_session'
     484        'current_level', 'current_session', 'current_mode',
     485        'entry_session', 'reg_number'
    485486        ) + year_range_tuple
    486487    title = _(u'Student Payments Overview')
  • main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_export.py

    r13640 r13641  
    746746            'ac,amount_auth,creation_date,p_category,p_current,p_id,'
    747747            'p_item,p_level,p_session,p_state,payment_date,r_amount_approved,'
    748             'r_code,r_desc,student_id,state,current_session,reg_number\r\n'
    749 
    750             ',0.0,2012-04-01 13:12:01#,,1,,,,,unpaid,,0.0,,,,,,\r\n'
     748            'r_code,r_desc,student_id,state,current_session\r\n'
     749
     750            ',0.0,2012-04-01 13:12:01#,,1,,,,,unpaid,,0.0,,,,,\r\n'
    751751            )
    752752        return
     
    764764            'ac,amount_auth,creation_date,p_category,p_current,p_id,'
    765765            'p_item,p_level,p_session,p_state,payment_date,r_amount_approved,'
    766             'r_code,r_desc,student_id,state,current_session,reg_number\r\n'
     766            'r_code,r_desc,student_id,state,current_session\r\n'
    767767
    768768            '666,12.12,2012-04-01 13:12:01#,schoolfee,1,my-id,'
    769769            'p-item,100,2012,paid,2012-04-01 14:12:01#,12.12,'
    770             'r-code,,A111111,created,2012,\r\n'
     770            'r-code,,A111111,created,2012\r\n'
    771771            )
    772772        return
     
    783783            'ac,amount_auth,creation_date,p_category,p_current,p_id,'
    784784            'p_item,p_level,p_session,p_state,payment_date,r_amount_approved,'
    785             'r_code,r_desc,student_id,state,current_session,reg_number\r\n'
     785            'r_code,r_desc,student_id,state,current_session\r\n'
    786786
    787787            '666,12.12,2012-04-01 13:12:01#,schoolfee,1,my-id,'
    788788            'p-item,100,2012,paid,2012-04-01 14:12:01#,12.12,'
    789             'r-code,,A111111,created,2012,\r\n'
     789            'r-code,,A111111,created,2012\r\n'
    790790            )
    791791        return
     
    802802            'ac,amount_auth,creation_date,p_category,p_current,p_id,'
    803803            'p_item,p_level,p_session,p_state,payment_date,r_amount_approved,'
    804             'r_code,r_desc,student_id,state,current_session,reg_number\r\n'
     804            'r_code,r_desc,student_id,state,current_session\r\n'
    805805
    806806            '666,12.12,2012-04-01 13:12:01#,schoolfee,1,my-id,'
    807807            'p-item,100,2012,paid,2012-04-01 14:12:01#,12.12,'
    808             'r-code,,A111111,created,2012,\r\n'
     808            'r-code,,A111111,created,2012\r\n'
    809809            )
    810810        return
     
    824824            'ac,amount_auth,creation_date,p_category,p_current,p_id,'
    825825            'p_item,p_level,p_session,p_state,payment_date,r_amount_approved,'
    826             'r_code,r_desc,student_id,state,current_session,reg_number\r\n'
     826            'r_code,r_desc,student_id,state,current_session\r\n'
    827827
    828828            '666,12.12,2012-04-01 13:12:01#,schoolfee,1,my-id,'
    829829            'p-item,100,2012,paid,2012-04-01 14:12:01#,12.12,'
    830             'r-code,,A111111,created,2012,\r\n'
     830            'r-code,,A111111,created,2012\r\n'
    831831            )
    832832        return
     
    860860            'ac,amount_auth,creation_date,p_category,p_current,p_id,'
    861861            'p_item,p_level,p_session,p_state,payment_date,r_amount_approved,'
    862             'r_code,r_desc,student_id,state,current_session,reg_number\r\n'
     862            'r_code,r_desc,student_id,state,current_session\r\n'
    863863
    864864            '666,12.12,2012-04-01 13:12:01#,schoolfee,1,my-id,'
    865865            'p-item,100,2012,paid,2012-04-01 14:12:01#,12.12,'
    866             'r-code,,A111111,created,2012,\r\n'
     866            'r-code,,A111111,created,2012\r\n'
    867867            )
    868868        # Payment date is 2012-04-01, 14:12:01.
     
    877877            'ac,amount_auth,creation_date,p_category,p_current,p_id,'
    878878            'p_item,p_level,p_session,p_state,payment_date,r_amount_approved,'
    879             'r_code,r_desc,student_id,state,current_session,reg_number\r\n'
     879            'r_code,r_desc,student_id,state,current_session\r\n'
    880880            )
    881881        exporter.export_filtered(
     
    888888            'ac,amount_auth,creation_date,p_category,p_current,p_id,'
    889889            'p_item,p_level,p_session,p_state,payment_date,r_amount_approved,'
    890             'r_code,r_desc,student_id,state,current_session,reg_number\r\n'
     890            'r_code,r_desc,student_id,state,current_session\r\n'
    891891            )
    892892        # No results if payment_date is not set
     
    901901            'ac,amount_auth,creation_date,p_category,p_current,p_id,'
    902902            'p_item,p_level,p_session,p_state,payment_date,r_amount_approved,'
    903             'r_code,r_desc,student_id,state,current_session,reg_number\r\n'
     903            'r_code,r_desc,student_id,state,current_session\r\n'
    904904            )
    905905        return
     
    926926            'ac,amount_auth,creation_date,p_category,p_current,p_id,'
    927927            'p_item,p_level,p_session,p_state,payment_date,r_amount_approved,'
    928             'r_code,r_desc,student_id,state,current_session,reg_number\r\n'
     928            'r_code,r_desc,student_id,state,current_session\r\n'
    929929            )
    930930        # Make ticket unpaid
     
    936936            'ac,amount_auth,creation_date,p_category,p_current,p_id,'
    937937            'p_item,p_level,p_session,p_state,payment_date,r_amount_approved,'
    938             'r_code,r_desc,student_id,state,current_session,reg_number\r\n'
     938            'r_code,r_desc,student_id,state,current_session\r\n'
    939939
    940940            '666,12.12,2012-04-01 13:12:01#,schoolfee,1,my-id,'
    941941            'p-item,100,2012,unpaid,2012-04-01 14:12:01#,12.12,'
    942             'r-code,,A111111,created,2012,\r\n'
     942            'r-code,,A111111,created,2012\r\n'
    943943            )
    944944        return
     
    11101110            'faccode,depcode,is_postgrad,'
    11111111            'current_level,current_session,current_mode,entry_session,'
    1112             '%s\r\n'
     1112            'reg_number,%s\r\n'
    11131113            'A111111,234,Anna M. Tester,created,CERT1,NA,NA,0,'
    11141114            '200,2012,ug_ft,2010,'
     
    11531153            'certcode,faccode,depcode,is_postgrad,'
    11541154            'current_level,current_session,current_mode,entry_session,'
    1155             '%s\r\nA111111,234,Anna M. Tester,created,CERT1,NA,NA,0,'
    1156             '200,2012,ug_ft,2010,,,,,,14.14,waived,,,,\r\n'
     1155            'reg_number,%s\r\nA111111,234,Anna M. Tester,created,CERT1,NA,NA,0,'
     1156            '200,2012,ug_ft,2010,123,,,,,,14.14,waived,,,,\r\n'
    11571157            % year_range_str in result
    11581158            )
Note: See TracChangeset for help on using the changeset viewer.