Changeset 13654 for main


Ignore:
Timestamp:
7 Feb 2016, 07:57:36 (9 years ago)
Author:
Henrik Bettermann
Message:

Export degree field.

Location:
main/waeup.kofa/trunk/src/waeup/kofa/university
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • main/waeup.kofa/trunk/src/waeup/kofa/university/export.py

    r13144 r13654  
    162162
    163163    fields = ('code', 'faculty_code', 'department_code', 'title', 'study_mode',
     164              'degree',
    164165              'start_level', 'end_level', 'application_category', 'ratio',
    165166              'school_fee_1', 'school_fee_2', 'school_fee_3', 'school_fee_4',

  • main/waeup.kofa/trunk/src/waeup/kofa/university/tests/test_export.py

    r10185 r13654  
    378378        self.assertEqual(
    379379            result,
    380             'code,faculty_code,department_code,title,study_mode,start_level,'
     380            'code,faculty_code,department_code,title,study_mode,'
     381            'degree,start_level,'
    381382            'end_level,application_category,ratio,school_fee_1,'
    382383            'school_fee_2,school_fee_3,school_fee_4,'
    … …  
    384385            'custom_float_1,custom_float_2,'
    385386            'users_with_local_roles\r\n'
    386             'CERT1,F1,D1,Master of Cheese,ct_ft,100,300,basic,,,,,,,,,,'
     387            'CERT1,F1,D1,Master of Cheese,ct_ft,,100,300,basic,,,,,,,,,,'
    387388            '"[{\'user_name\': u\'bob\', \'local_role\': u\'bobsrole\'}]"\r\n'
    388389            )
    … …  
    395396        self.assertEqual(
    396397            result,
    397             'code,faculty_code,department_code,title,study_mode,start_level,'
     398            'code,faculty_code,department_code,title,study_mode,'
     399            'degree,start_level,'
    398400            'end_level,application_category,ratio,school_fee_1,'
    399401            'school_fee_2,school_fee_3,school_fee_4,'
    … …  
    401403            'custom_float_1,custom_float_2,'
    402404            'users_with_local_roles\r\n'
    403             'CERT1,F1,D1,Master of Cheese,ct_ft,100,300,basic,,,,,,,,,,'
    404             '"[{\'user_name\': u\'bob\', \'local_role\': u\'bobsrole\'}]"\r\n'
    405             'CERT2,F1,D1,Master of Cheddar,ct_ft,400,700,cest,,,,,,,,,,[]\r\n'
     405            'CERT1,F1,D1,Master of Cheese,ct_ft,,100,300,basic,,,,,,,,,,'
     406            '"[{\'user_name\': u\'bob\', \'local_role\': u\'bobsrole\'}]"\r\n'
     407            'CERT2,F1,D1,Master of Cheddar,ct_ft,,400,700,cest,,,,,,,,,,[]\r\n'
    406408            )
    407409        return
    … …  
    414416        self.assertEqual(
    415417            result,
    416             'code,faculty_code,department_code,title,study_mode,start_level,'
     418            'code,faculty_code,department_code,title,study_mode,'
     419            'degree,start_level,'
    417420            'end_level,application_category,ratio,'
    418421            'school_fee_1,school_fee_2,school_fee_3,school_fee_4,'
    … …  
    420423            'custom_float_1,custom_float_2,'
    421424            'users_with_local_roles\r\n'
    422             'CERT1,F1,D1,Master of Cheese,ct_ft,100,300,basic,,,,,,,,,,'
    423             '"[{\'user_name\': u\'bob\', \'local_role\': u\'bobsrole\'}]"\r\n'
    424             'CERT2,F1,D1,Master of Cheddar,ct_ft,400,700,cest,,,,,,,,,,[]\r\n'
    425             'CERT3,F1,D2,Cert. of Rubbish,dp_pt,100,200,no,,,,,,,,,,[]\r\n'
     425            'CERT1,F1,D1,Master of Cheese,ct_ft,,100,300,basic,,,,,,,,,,'
     426            '"[{\'user_name\': u\'bob\', \'local_role\': u\'bobsrole\'}]"\r\n'
     427            'CERT2,F1,D1,Master of Cheddar,ct_ft,,400,700,cest,,,,,,,,,,[]\r\n'
     428            'CERT3,F1,D2,Cert. of Rubbish,dp_pt,,100,200,no,,,,,,,,,,[]\r\n'
    426429            )
    427430        return
    … …  
    433436        self.assertEqual(
    434437            result,
    435             'code,faculty_code,department_code,title,study_mode,start_level,'
     438            'code,faculty_code,department_code,title,study_mode,'
     439            'degree,start_level,'
    436440            'end_level,application_category,ratio,'
    437441            'school_fee_1,school_fee_2,school_fee_3,school_fee_4,'
    … …  
    439443            'custom_float_1,custom_float_2,'
    440444            'users_with_local_roles\r\n'
    441             'CERT1,F1,D1,Master of Cheese,ct_ft,100,300,basic,,,,,,,,,,'
    442             '"[{\'user_name\': u\'bob\', \'local_role\': u\'bobsrole\'}]"\r\n'
    443             'CERT2,F1,D1,Master of Cheddar,ct_ft,400,700,cest,,,,,,,,,,[]\r\n'
    444             'CERT3,F1,D2,Cert. of Rubbish,dp_pt,100,200,no,,,,,,,,,,[]\r\n'
     445            'CERT1,F1,D1,Master of Cheese,ct_ft,,100,300,basic,,,,,,,,,,'
     446            '"[{\'user_name\': u\'bob\', \'local_role\': u\'bobsrole\'}]"\r\n'
     447            'CERT2,F1,D1,Master of Cheddar,ct_ft,,400,700,cest,,,,,,,,,,[]\r\n'
     448            'CERT3,F1,D2,Cert. of Rubbish,dp_pt,,100,200,no,,,,,,,,,,[]\r\n'
    445449            )
    446450        return
Note: See TracChangeset for help on using the changeset viewer.