Changeset 8520 for main/waeup.fceokene/trunk/src/waeup

Timestamp:

25 May 2012, 10:33:15 (12 years ago)

Author:

Henrik Bettermann

Message:

See previous revision.

Location:

main/waeup.fceokene/trunk/src/waeup/fceokene/applicants

Files:

• browser.py (modified) (6 diffs)
• interfaces.py (modified) (2 diffs)
• tests.py (modified) (1 diff)

main/waeup.fceokene/trunk/src/waeup/fceokene/applicants/browser.py

@@ -37 +37 @@
 from waeup.fceokene.applicants.interfaces import (
     IPGApplicant, IUGApplicant, IPGApplicantEdit, IUGApplicantEdit,
-    ICustomApplicantOnlinePayment)
+    ICustomApplicantOnlinePayment,
+    UG_OMIT_DISPLAY_FIELDS, PG_OMIT_DISPLAY_FIELDS,
+    UG_OMIT_MANAGE_FIELDS, PG_OMIT_MANAGE_FIELDS,
+    UG_OMIT_EDIT_FIELDS, PG_OMIT_EDIT_FIELDS)
 from waeup.fceokene.interfaces import MessageFactory as _
 
@@ -65 +68 @@
         target = getattr(self.context.__parent__, 'prefix', None)
         if target is not None and target.startswith('pg'):
-            form_fields = grok.AutoFields(IPGApplicant).omit(
-                'locked', 'course_admitted')
+            form_fields = grok.AutoFields(IPGApplicant)
+            for field in PG_OMIT_DISPLAY_FIELDS:
+                form_fields = form_fields.omit(field)
         else:
-            form_fields = grok.AutoFields(IUGApplicant).omit(
-                'locked', 'course_admitted')
+            form_fields = grok.AutoFields(IUGApplicant)
+            for field in UG_OMIT_DISPLAY_FIELDS:
+                form_fields = form_fields.omit(field)
         return form_fields
 
@@ -80 +85 @@
         target = getattr(self.context.__parent__, 'prefix', None)
         if target is not None and target.startswith('pg'):
-            form_fields = grok.AutoFields(IPGApplicant).omit(
-                'locked', 'course_admitted', 'password')
+            form_fields = grok.AutoFields(IPGApplicant)
+            for field in PG_OMIT_DISPLAY_FIELDS:
+                form_fields = form_fields.omit(field)
         else:
-            form_fields = grok.AutoFields(IUGApplicant).omit(
-                'locked', 'course_admitted', 'password')
+            form_fields = grok.AutoFields(IUGApplicant)
+            for field in UG_OMIT_DISPLAY_FIELDS:
+                form_fields = form_fields.omit(field)
         return form_fields
 
@@ -96 +103 @@
         if target is not None and target.startswith('pg'):
             form_fields = grok.AutoFields(IPGApplicant)
+            for field in PG_OMIT_MANAGE_FIELDS:
+                form_fields = form_fields.omit(field)
         else:
             form_fields = grok.AutoFields(IUGApplicant)
+            for field in UG_OMIT_MANAGE_FIELDS:
+                form_fields = form_fields.omit(field)
         form_fields['student_id'].for_display = True
         form_fields['applicant_id'].for_display = True
@@ -110 +121 @@
         target = getattr(self.context.__parent__, 'prefix', None)
         if target is not None and target.startswith('pg'):
-            form_fields = grok.AutoFields(IPGApplicantEdit).omit(
-                'locked', 'course_admitted', 'student_id',
-                'screening_score', 'screening_venue'
-                )
+            form_fields = grok.AutoFields(IPGApplicantEdit)
+            for field in PG_OMIT_EDIT_FIELDS:
+                form_fields = form_fields.omit(field)
         else:
-            form_fields = grok.AutoFields(IUGApplicantEdit).omit(
-                'locked', 'course_admitted', 'student_id',
-                'screening_score'
-                )
+            form_fields = grok.AutoFields(IUGApplicantEdit)
+            for field in UG_OMIT_EDIT_FIELDS:
+                form_fields = form_fields.omit(field)
         form_fields['applicant_id'].for_display = True
         form_fields['reg_number'].for_display = True
@@ -165 +174 @@
         note = translate(_(
             u"""<br /><br /><br />
-The tranzaction code for eTranzact payments is <strong>${a}</strong>.""",
+The tranzaction code is <strong>${a}</strong>.""",
             mapping = {'a':tcode}))
         return note

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

@@ -32 +32 @@
 from waeup.fceokene.payments.interfaces import ICustomOnlinePayment
 
+UG_OMIT_DISPLAY_FIELDS = ('locked', 'course_admitted', 'password')
+UG_OMIT_MANAGE_FIELDS = ()
+UG_OMIT_EDIT_FIELDS = UG_OMIT_MANAGE_FIELDS + ('locked', 'course_admitted',
+    'student_id', 'screening_score', 'screening_venue')
+
+PG_OMIT_DISPLAY_FIELDS = ('locked', 'course_admitted', 'password')
+PG_OMIT_MANAGE_FIELDS = ()
+PG_OMIT_EDIT_FIELDS = PG_OMIT_MANAGE_FIELDS + ('locked', 'course_admitted',
+    'student_id', 'screening_score', 'screening_venue')
+
 class IUGApplicant(IApplicantBaseData):
     """An undergraduate applicant.
 
+    This interface defines the least common multiple of all fields
+    in ug application forms. In customized forms, fields can be excluded by
+    adding them to the UG_OMIT* tuples.
     """
 
@@ -58 +71 @@
     """A postgraduate applicant.
 
+    This interface defines the least common multiple of all fields
+    in pg application forms. In customized forms, fields can be excluded by
+    adding them to the PG_OMIT* tuples.
     """
 

main/waeup.fceokene/trunk/src/waeup/fceokene/applicants/tests.py

@@ -123 +123 @@
         self.browser.open(pgapplicant_path + '/application_slip.pdf')
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
-        # If we lool at the applicant in the ug container,
+        # If we view the applicant in the ug container,
         # the employer field doesn't appear
         ugapplicant_path = ('http://localhost/app/applicants/app2011/%s'