Changeset 17497 for main/waeup.kofa/trunk/src/waeup/kofa/university

Timestamp:

20 Jul 2023, 13:38:29 (19 months ago)

Author:

Henrik Bettermann

Message:

Remove redundant ‚key‘ field from exports.
Adjust tests and code.
Add columns to transcript officers landing page.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/university

Files:

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

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

@@ -123 +123 @@
 
     def mangle_value(self, value, name, context=None):
-        """The mangler additionally computes the department_code value
-        which is the code of the department that offers the course.
+        """The mangler additionally computes the department_code
+        and faculty_code values.
         """
         if name == 'users_with_local_roles':
@@ -166 +166 @@
 
     fields = ('code', 'faculty_code', 'department_code', 'title', 'study_mode',
-              'degree','key',
+              'degree',
               'start_level', 'end_level', 'application_category', 'ratio',
               'school_fee_1', 'school_fee_2', 'school_fee_3', 'school_fee_4',
@@ -174 +174 @@
 
     title = _(u'Certificates')
-
-    def mangle_value(self, value, name, context=None):
-        """The mangler additionally computes the department_code value
-        which is the code of the department that offers the certificate.
-        """
-        if name == 'key':
-            value = context.__name__
-        return super(CertificateExporter, self).mangle_value(
-            value, name, context)
 
     def export_all(self, site, filepath=None):

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

@@ -400 +400 @@
             result,
             'code,faculty_code,department_code,title,study_mode,'
-            'degree,key,start_level,'
+            'degree,start_level,'
             'end_level,application_category,ratio,school_fee_1,'
             'school_fee_2,school_fee_3,school_fee_4,'
@@ -406 +406 @@
             'custom_float_1,custom_float_2,'
             'users_with_local_roles\r\n'
-            'CERT1,F1,D1,Master of Cheese,ct_ft,,CERT1,100,300,basic,,,,,,,,,,'
+            'CERT1,F1,D1,Master of Cheese,ct_ft,,100,300,basic,,,,,,,,,,'
             '"[{\'user_name\': u\'bob\', \'local_role\': u\'bobsrole\'}]"\r\n'
             )
@@ -418 +418 @@
             result,
             'code,faculty_code,department_code,title,study_mode,'
-            'degree,key,start_level,'
+            'degree,start_level,'
             'end_level,application_category,ratio,school_fee_1,'
             'school_fee_2,school_fee_3,school_fee_4,'
@@ -424 +424 @@
             'custom_float_1,custom_float_2,'
             'users_with_local_roles\r\n'
-            'CERT1,F1,D1,Master of Cheese,ct_ft,,CERT1,100,300,basic,,,,,,,,,,'
+            'CERT1,F1,D1,Master of Cheese,ct_ft,,100,300,basic,,,,,,,,,,'
             '"[{\'user_name\': u\'bob\', \'local_role\': u\'bobsrole\'}]"\r\n'
-            'CERT2,F1,D1,Master of Cheddar,ct_ft,,CERT2,400,700,cest,,,,,,,,,,[]\r\n'
+            'CERT2,F1,D1,Master of Cheddar,ct_ft,,400,700,cest,,,,,,,,,,[]\r\n'
             )
         return
@@ -438 +438 @@
             result,
             'code,faculty_code,department_code,title,study_mode,'
-            'degree,key,start_level,'
+            'degree,start_level,'
             'end_level,application_category,ratio,'
             'school_fee_1,school_fee_2,school_fee_3,school_fee_4,'
@@ -444 +444 @@
             'custom_float_1,custom_float_2,'
             'users_with_local_roles\r\n'
-            'CERT1,F1,D1,Master of Cheese,ct_ft,,CERT1,100,300,basic,,,,,,,,,,'
+            'CERT1,F1,D1,Master of Cheese,ct_ft,,100,300,basic,,,,,,,,,,'
             '"[{\'user_name\': u\'bob\', \'local_role\': u\'bobsrole\'}]"\r\n'
-            'CERT2,F1,D1,Master of Cheddar,ct_ft,,CERT2,400,700,cest,,,,,,,,,,[]\r\n'
-            'CERT3,F1,D2,Cert. of Rubbish,dp_pt,,CERT3,100,200,no,,,,,,,,,,[]\r\n'
+            'CERT2,F1,D1,Master of Cheddar,ct_ft,,400,700,cest,,,,,,,,,,[]\r\n'
+            'CERT3,F1,D2,Cert. of Rubbish,dp_pt,,100,200,no,,,,,,,,,,[]\r\n'
             )
         return
@@ -458 +458 @@
             result,
             'code,faculty_code,department_code,title,study_mode,'
-            'degree,key,start_level,'
+            'degree,start_level,'
             'end_level,application_category,ratio,'
             'school_fee_1,school_fee_2,school_fee_3,school_fee_4,'
@@ -464 +464 @@
             'custom_float_1,custom_float_2,'
             'users_with_local_roles\r\n'
-            'CERT1,F1,D1,Master of Cheese,ct_ft,,CERT1,100,300,basic,,,,,,,,,,'
+            'CERT1,F1,D1,Master of Cheese,ct_ft,,100,300,basic,,,,,,,,,,'
             '"[{\'user_name\': u\'bob\', \'local_role\': u\'bobsrole\'}]"\r\n'
-            'CERT2,F1,D1,Master of Cheddar,ct_ft,,CERT2,400,700,cest,,,,,,,,,,[]\r\n'
-            'CERT3,F1,D2,Cert. of Rubbish,dp_pt,,CERT3,100,200,no,,,,,,,,,,[]\r\n'
+            'CERT2,F1,D1,Master of Cheddar,ct_ft,,400,700,cest,,,,,,,,,,[]\r\n'
+            'CERT3,F1,D2,Cert. of Rubbish,dp_pt,,100,200,no,,,,,,,,,,[]\r\n'
             )
         return