Changeset 13155 for main

Timestamp:

7 Jul 2015, 20:53:37 (9 years ago)

Author:

Henrik Bettermann

Message:

Add description only on edit page.

Use '++' separator when exporting jamb_subjects lines.

Location:

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/applicants

Files:

• browser.py (modified) (1 diff)
• export.py (modified) (1 diff)
• interfaces.py (modified) (3 diffs)
• tests/test_browser.py (modified) (2 diffs)

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/applicants/browser.py

@@ -225 +225 @@
                 form_fields = form_fields.omit(field)
         elif self.target is not None and self.target.startswith('pre'):
-            form_fields = grok.AutoFields(INigeriaPGApplicant)
+            form_fields = grok.AutoFields(INigeriaPGApplicantEdit)
             for field in PG_OMIT_EDIT_FIELDS:
                 form_fields = form_fields.omit(field)
         elif self.target is not None and self.target.startswith('cbt'):
-            form_fields = grok.AutoFields(INigeriaUGApplicant)
+            form_fields = grok.AutoFields(INigeriaUGApplicantEdit)
             for field in CBT_OMIT_EDIT_FIELDS:
                 form_fields = form_fields.omit(field)

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/applicants/export.py

@@ -37 +37 @@
 
     def mangle_value(self, value, name, context=None):
+        if name == 'jamb_subjects' and value:
+            value = value.replace('\n', '++')
         if '_result' in name and value:
             value = [eval(entry.to_string()) for entry in value]

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/applicants/interfaces.py

@@ -185 +185 @@
     jamb_subjects = schema.Text(
         title = _(u'Subjects and Scores'),
-        description = _(u'(Enter all four subjects, one subject with score per line!)'),
         required = False,
         )
@@ -523 +522 @@
         show_year = True,
         )
+    jamb_subjects = schema.Text(
+        title = _(u'Subjects and Scores'),
+        description = _(u'Enter all four subjects, one subject with score per line!'),
+        required = True,
+        )
 
 INigeriaUGApplicantEdit[
-    'date_of_birth'].order =  INigeriaUGApplicant['date_of_birth'].order
+    'date_of_birth'].order = INigeriaUGApplicant['date_of_birth'].order
 INigeriaUGApplicantEdit[
-    'email'].order =  INigeriaUGApplicant['email'].order
+    'email'].order = INigeriaUGApplicant['email'].order
+INigeriaUGApplicantEdit[
+    'jamb_subjects'].order = INigeriaUGApplicant['jamb_subjects'].order
 
 class INigeriaPGApplicantEdit(INigeriaPGApplicant):
@@ -559 +565 @@
 class INigeriaApplicantOnlinePayment(INigeriaOnlinePayment):
     """An applicant payment via payment gateways.
-
     """
 

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/applicants/tests/test_browser.py

@@ -347 +347 @@
         applicant.course_admitted = self.certificate
         applicant.notice = u'Some notice\nin lines.'
+        applicant.jamb_subjects = u'Line 1\nLine 2'
         applicant.screening_score = 98
         applicant.screening_venue = u'Exam Room'
@@ -378 +379 @@
             'Anna M. Tester,anna@sample.com,,,,,,,,,,,Anna,,,,,,'
             '[u\'2015-07-06 11:21:22 WAT - Application initialized by system\']'
-            ',,,,,,,,,,Tester,,0,M.,NG,"Some notice\nin lines.",,,'
+            ',,,,,,,,,Line 1++Line 2,Tester,,0,M.,NG,"Some notice\nin lines.",,,'
             'any password,+234-123-12345#,,123456,,,,,,,'
             '"Saturday, 16th June 2012 2:00:00 PM",98,Exam Room,f,,,'