Changeset 10217 for main/waeup.futminna/trunk/src/waeup

Timestamp:

24 May 2013, 05:18:59 (12 years ago)

Author:

Henrik Bettermann

Message:

Define invariant condition for managers.

Applicants can also see first choice course in edit form.

File:

• main/waeup.futminna/trunk/src/waeup/futminna/applicants/interfaces.py (modified) (5 diffs)

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

@@ -20 +20 @@
 
 from zope import schema
+from zope.interface import Attribute, invariant, Invalid
 from waeup.kofa.applicants.interfaces import (
     IApplicantBaseData,
@@ -41 +42 @@
     PUTME_OMIT_PDF_FIELDS,
     PUTME_OMIT_MANAGE_FIELDS,
-    PUTME_OMIT_EDIT_FIELDS,
+    PUTME_OMIT_FIELDS,
+    #PUTME_OMIT_EDIT_FIELDS,
     )
+
+PUTME_OMIT_EDIT_FIELDS = UG_OMIT_EDIT_FIELDS + PUTME_OMIT_FIELDS + (
+    'firstname', 'middlename', 'lastname', 'sex',
+    'lga')
 
 PG_OMIT_DISPLAY_FIELDS = OMIT_DISPLAY_FIELDS + ('course2',)
@@ -83 +89 @@
     course2 = schema.Choice(
         title = _(u'2nd Choice Course of Study'),
-        description = _(u'Comment which explains why applicant must select a 2nd Choice Course of Study.'),
-        source = AppCatCertificateSource(),
-        required = True,
+        source = AppCatCertificateSource(),
+        required = False,
         )
     hq_type = schema.Choice(
@@ -167 +172 @@
         )
 
+    @invariant
+    def second_choice(applicant):
+        if applicant.course1 == applicant.course2:
+            raise Invalid(_("2nd choice course must differ from 1st choice course."))
 
 class ICustomPGApplicant(IApplicantBaseData):
@@ -259 +268 @@
     """
 
+    course1 = schema.Choice(
+        title = _(u'1st Choice Course of Study'),
+        source = AppCatCertificateSource(),
+        required = True,
+        readonly = True,
+        )
+
+    course2 = schema.Choice(
+        title = _(u'2nd Choice Course of Study'),
+        description = _(u'Comment which explains why applicant must select a 2nd Choice Course of Study.'),
+        source = AppCatCertificateSource(),
+        required = True,
+        )
+
 class ICustomPGApplicantEdit(ICustomPGApplicant):
     """A postgraduate applicant interface for editing.