Changeset 10185 for main

Timestamp:

22 May 2013, 06:45:17 (11 years ago)

Author:

Henrik Bettermann

Message:

Add custom fields to certificates (not used in base package).

Location:

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

Files:

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

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

@@ -58 +58 @@
                  school_fee_1=None, school_fee_2=None,
                  school_fee_3=None, school_fee_4=None,
-                 ratio=None):
+                 ratio=None,
+                 custom_textline_1=None, custom_textline_2=None,
+                 custom_float_1=None, custom_float_2=None):
         super(Certificate, self).__init__()
         self.code = code
@@ -71 +73 @@
         self.school_fee_4 = school_fee_4
         self.ratio = ratio
+        self.custom_textline_1 = custom_textline_1
+        self.custom_textline_2 = custom_textline_2
+        self.custom_float_1 = custom_float_1
+        self.custom_float_2 = custom_float_2
 
     def traverse(self, name):

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

@@ -158 +158 @@
               'start_level', 'end_level', 'application_category', 'ratio',
               'school_fee_1', 'school_fee_2', 'school_fee_3', 'school_fee_4',
+              'custom_textline_1', 'custom_textline_2',
+              'custom_float_1', 'custom_float_2',
               'users_with_local_roles')
 

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

@@ -266 +266 @@
         )
 
+    custom_textline_1 = schema.TextLine(
+        title = _(u'Custom Textline 1 (not used)'),
+        required = False,
+        )
+
+    custom_textline_2 = schema.TextLine(
+        title = _(u'Custom Textline 2 (not used)'),
+        required = False,
+        )
+
+    custom_float_1 = schema.Float(
+        title = _(u'Custom Float 1 (not used)'),
+        required = False,
+        )
+
+    custom_float_2 = schema.Float(
+        title = _(u'Custom Float 2 (not used)'),
+        required = False,
+        )
+
     def longtitle():
         """

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

@@ -380 +380 @@
             'code,faculty_code,department_code,title,study_mode,start_level,'
             'end_level,application_category,ratio,school_fee_1,'
-            'school_fee_2,school_fee_3,school_fee_4,users_with_local_roles\r\n'
-            'CERT1,F1,D1,Master of Cheese,ct_ft,100,300,basic,,,,,,'
+            'school_fee_2,school_fee_3,school_fee_4,'
+            'custom_textline_1,custom_textline_2,'
+            'custom_float_1,custom_float_2,'
+            'users_with_local_roles\r\n'
+            'CERT1,F1,D1,Master of Cheese,ct_ft,100,300,basic,,,,,,,,,,'
             '"[{\'user_name\': u\'bob\', \'local_role\': u\'bobsrole\'}]"\r\n'
             )
@@ -394 +397 @@
             'code,faculty_code,department_code,title,study_mode,start_level,'
             'end_level,application_category,ratio,school_fee_1,'
-            'school_fee_2,school_fee_3,school_fee_4,users_with_local_roles\r\n'
-            '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,400,700,cest,,,,,,[]\r\n'
+            'school_fee_2,school_fee_3,school_fee_4,'
+            'custom_textline_1,custom_textline_2,'
+            'custom_float_1,custom_float_2,'
+            'users_with_local_roles\r\n'
+            '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,400,700,cest,,,,,,,,,,[]\r\n'
             )
         return
@@ -411 +417 @@
             'end_level,application_category,ratio,'
             'school_fee_1,school_fee_2,school_fee_3,school_fee_4,'
+            'custom_textline_1,custom_textline_2,'
+            'custom_float_1,custom_float_2,'
             'users_with_local_roles\r\n'
-            '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,400,700,cest,,,,,,[]\r\n'
-            'CERT3,F1,D2,Cert. of Rubbish,dp_pt,100,200,no,,,,,,[]\r\n'
+            '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,400,700,cest,,,,,,,,,,[]\r\n'
+            'CERT3,F1,D2,Cert. of Rubbish,dp_pt,100,200,no,,,,,,,,,,[]\r\n'
             )
         return
@@ -428 +436 @@
             'end_level,application_category,ratio,'
             'school_fee_1,school_fee_2,school_fee_3,school_fee_4,'
+            'custom_textline_1,custom_textline_2,'
+            'custom_float_1,custom_float_2,'
             'users_with_local_roles\r\n'
-            '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,400,700,cest,,,,,,[]\r\n'
-            'CERT3,F1,D2,Cert. of Rubbish,dp_pt,100,200,no,,,,,,[]\r\n'
+            '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,400,700,cest,,,,,,,,,,[]\r\n'
+            'CERT3,F1,D2,Cert. of Rubbish,dp_pt,100,200,no,,,,,,,,,,[]\r\n'
             )
         return