Changeset 16872

Timestamp:

9 Mar 2022, 20:53:31 (3 years ago)

Author:

Henrik Bettermann

Message:

Adjust exporter and fix tests.

Location:

main/waeup.fceokene/trunk/src/waeup/fceokene/applicants

Files:

• export.py (modified) (1 diff)
• interfaces.py (modified) (1 diff)
• tests/test_browser.py (modified) (4 diffs)

main/waeup.fceokene/trunk/src/waeup/fceokene/applicants/export.py

@@ -56 +56 @@
                 except:
                     pass
+        if name == 'subj_comb' and value is not None:
+            value = value.code
         return super(
             CustomApplicantExporter, self).mangle_value(

main/waeup.fceokene/trunk/src/waeup/fceokene/applicants/interfaces.py

@@ -155 +155 @@
         )
 
-    #subj_comb = schema.TextLine(
-    #    title = _(u'Subject Combination'),
-    #    required = False,
-    #    readonly = False,
-    #    )
-
     subj_comb = schema.Choice(
         title = _(u'Subject Combination'),

main/waeup.fceokene/trunk/src/waeup/fceokene/applicants/tests/test_browser.py

@@ -96 +96 @@
         self.tpucontainer.code = u'tpu%s' % session
         self.tpucontainer.prefix = u'tpu'
-        self.tpucontainer.application_category = u'tpu'
+        self.tpucontainer.application_category = u'basic'
         self.tpucontainer.year = session
         self.tpucontainer.application_fee = 300.0
@@ -192 +192 @@
         
     def test_final_submit_tpu(self):
-        self.certificate.application_category = 'tpu'
+        self.certificate.application_category = 'basic'
         self.certificate.title = 'NCECert1'
         notify(grok.ObjectModifiedEvent(self.certificate))
@@ -236 +236 @@
         certificate.code = 'CERT2'
         certificate.title = 'NCECert2'
-        certificate.application_category = 'tpu'
+        certificate.application_category = 'basic'
         certificate.start_level = 100
         certificate.end_level = 500
@@ -265 +265 @@
         self.assertEqual(self.tpuapplicant.state, 'submitted')
         return
-