Changeset 9535 for main/kofacustom.nigeria/trunk/src

Timestamp:

5 Nov 2012, 12:13:10 (12 years ago)

Author:

Henrik Bettermann

Message:

Show officers's comment in the same way as shown in the base package.

Location:

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/students

Files:

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

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

@@ -100 +100 @@
             form_fields = grok.AutoFields(
                 INigeriaUGStudentClearance).omit('clearance_locked')
+        if not getattr(self.context, 'officer_comment'):
+            form_fields = form_fields.omit('officer_comment')
+        else:
+            form_fields['officer_comment'].custom_widget = BytesDisplayWidget
         return form_fields
 
@@ -115 +119 @@
             form_fields = grok.AutoFields(
                 INigeriaUGStudentClearance).omit('clearance_locked')
+        if not getattr(self.context, 'officer_comment'):
+            form_fields = form_fields.omit('officer_comment')
         return form_fields
 
@@ -139 +145 @@
         if self.context.is_postgrad:
             form_fields = grok.AutoFields(INigeriaPGStudentClearance).omit(
-            'clearance_locked', 'nysc_location', 'clr_code')
+            'clearance_locked', 'nysc_location', 'clr_code', 'officer_comment')
         else:
             form_fields = grok.AutoFields(INigeriaUGStudentClearance).omit(
-            'clearance_locked', 'clr_code')
+            'clearance_locked', 'clr_code', 'officer_comment')
         return form_fields
 

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

@@ -114 +114 @@
 
     """
+    officer_comment = schema.Text(
+        title = _(u"Officer's Comment"),
+        required = False,
+        )
+
+    clearance_locked = schema.Bool(
+        title = _(u'Clearance form locked'),
+        default = False,
+        required = False,
+        )
+
+    clr_code = schema.TextLine(
+        title = _(u'CLR Activation Code'),
+        required = False,
+        readonly = False,
+        )
+
     date_of_birth = FormattedDate(
         title = _(u'Date of Birth'),

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/students/tests/test_export.py

@@ -56 +56 @@
             'matric_number,middlename,nationality,next_kin_address,'
             'next_kin_name,next_kin_relation,nysc_lga,nysc_location,'
-            'nysc_year,perm_address,phone,reg_number,religion,scd_sit_date,'
+            'nysc_year,officer_comment,'
+            'perm_address,phone,reg_number,religion,scd_sit_date,'
             'scd_sit_fname,scd_sit_no,scd_sit_results,scd_sit_type,sex,'
             'student_id,suspended,password,state,history,certcode,'
@@ -64 +65 @@
             '1981-02-04#,,,anna@sample.com,,,,,,,,,,,Anna,,,,,'
             '"[(\'visual_art\', \'A1\')]",,,,,,,,,,,,,,,Tester,,,234,M.,NG'
-            ',,,,,,,"Studentroad 21\nLagos 123456\n",+234-123-12345#,123'
+            ',,,,,,,,"Studentroad 21\nLagos 123456\n",+234-123-12345#,123'
             ',,,,,"[(\'visual_art\', \'A1\')]",,f,A111111,0,,created,'
             in result