Changeset 13362

Timestamp:

29 Oct 2015, 22:05:33 (9 years ago)

Author:

Henrik Bettermann

Message:

Make lga and date_of_birth fields required.

Location:

main/waeup.aaue/trunk/src/waeup/aaue/students

Files:

• browser.py (modified) (3 diffs)
• interfaces.py (modified) (2 diffs)

main/waeup.aaue/trunk/src/waeup/aaue/students/browser.py

@@ -43 +43 @@
     NigeriaStudentPersonalEditFormPage,
     NigeriaStudentPersonalManageFormPage,
+    NigeriaStudentClearanceEditFormPage,
     )
 from waeup.aaue.students.interfaces import (
@@ -49 +50 @@
     ICustomStudent,
     ICustomStudentPersonal,
-    ICustomStudentPersonalEdit)
+    ICustomStudentPersonalEdit,
+    ICustomUGStudentClearance)
 from waeup.aaue.interfaces import MessageFactory as _
 
@@ -75 +77 @@
     form_fields[
         'personal_updated'].custom_widget = FriendlyDatetimeDisplayWidget('le')
+
+class CustomStudentClearanceEditFormPage(NigeriaStudentClearanceEditFormPage):
+    """ View to edit student clearance data by student
+    """
+
+    @property
+    def form_fields(self):
+        if self.context.is_postgrad:
+            form_fields = grok.AutoFields(ICustomPGStudentClearance).omit(
+            'clearance_locked', 'nysc_location', 'clr_code', 'officer_comment',
+            'physical_clearance_date')
+        else:
+            form_fields = grok.AutoFields(ICustomUGStudentClearance).omit(
+            'clearance_locked', 'clr_code', 'officer_comment',
+            'physical_clearance_date')
+        return form_fields
 
 class CustomStartClearancePage(StartClearancePage):

main/waeup.aaue/trunk/src/waeup/aaue/students/interfaces.py

@@ -22 +22 @@
 from zope.component import getUtility
 from waeup.kofa.interfaces import IKofaObject
-from waeup.kofa.schema import PhoneNumber
+from waeup.kofa.schema import PhoneNumber, FormattedDate
+from kofacustom.nigeria.interfaces import LGASource
 from kofacustom.nigeria.students.interfaces import (
     INigeriaStudentBase, INigeriaUGStudentClearance, INigeriaPGStudentClearance,
@@ -194 +195 @@
     """
 
+    date_of_birth = FormattedDate(
+        title = _(u'Date of Birth'),
+        required = True,
+        show_year = True,
+        )
+
+    lga = schema.Choice(
+        source = LGASource(),
+        title = _(u'State / LGA'),
+        required = True,
+        )
+
+ICustomUGStudentClearance['lga'].order = INigeriaUGStudentClearance[
+    'lga'].order
+ICustomUGStudentClearance['date_of_birth'].order = INigeriaUGStudentClearance[
+    'date_of_birth'].order
+
+
 class ICustomPGStudentClearance(INigeriaPGStudentClearance):
     """Representation of pg student clearance data.