Changeset 9076 for main/kofacustom.nigeria/trunk

Timestamp:

28 Jul 2012, 11:01:38 (12 years ago)

Author:

Henrik Bettermann

Message:

Do not display screening score, venue and date if not set.

File:

• main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/applicants/browser.py (modified) (3 diffs)

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

@@ -99 +99 @@
         #form_fields['perm_address'].custom_widget = BytesDisplayWidget
         form_fields['notice'].custom_widget = BytesDisplayWidget
+        if not getattr(self.context, 'student_id'):
+            form_fields = form_fields.omit('student_id')
+        if not getattr(self.context, 'screening_score'):
+            form_fields = form_fields.omit('screening_score')
+        if not getattr(self.context, 'screening_venue'):
+            form_fields = form_fields.omit('screening_venue')
+        if not getattr(self.context, 'screening_date'):
+            form_fields = form_fields.omit('screening_date')
         return form_fields
 
@@ -106 +114 @@
         return getattr(self.context, 'result_uploaded', False)
 
-    @property
-    def note(self):
-        target = getattr(self.context.__parent__, 'prefix', None)
-        if target is not None and not target.startswith('pg') \
-            and not self._reduced_slip():
-            return _(u'<br /><br /><br />'
-                      'Comfirm your exam venue 72 hours to the exam.')
-        return
+    #@property
+    #def note(self):
+    #    target = getattr(self.context.__parent__, 'prefix', None)
+    #    if target is not None and not target.startswith('pg') \
+    #        and not self._reduced_slip():
+    #        return _(u'<br /><br /><br />'
+    #                  'Comfirm your exam venue 72 hours to the exam.')
+    #    return
 
     @property
@@ -144 +152 @@
         if not getattr(self.context, 'student_id'):
             form_fields = form_fields.omit('student_id')
+        if not getattr(self.context, 'screening_score'):
+            form_fields = form_fields.omit('screening_score')
+        if not getattr(self.context, 'screening_venue'):
+            form_fields = form_fields.omit('screening_venue')
+        if not getattr(self.context, 'screening_date'):
+            form_fields = form_fields.omit('screening_date')
         return form_fields