Changeset 8928

Timestamp:

7 Jul 2012, 09:25:03 (12 years ago)

Author:

Henrik Bettermann

Message:

Start using components and interfaces in kofacustom.nigeria. Unfortunately, this does not reduce the code in waeup.uniben very much, only because we are still using an old LGAs dictionary.

Move applicants tests into 'tests' package.

Location:

main/waeup.uniben/trunk/src/waeup/uniben/applicants

Files:

• applicant.py (modified) (1 diff)
• browser.py (modified) (7 diffs)
• export.py (modified) (2 diffs)
• interfaces.py (modified) (8 diffs)
• payment.py (modified) (1 diff)
• tests (added)
• tests.py (deleted)
• tests/__init__.py (added)
• tests/test_applicant.py (added)
• tests/test_browser.py (added)

main/waeup.uniben/trunk/src/waeup/uniben/applicants/applicant.py

@@ -22 +22 @@
 from waeup.kofa.utils.helpers import attrs_to_fields
 from waeup.uniben.applicants.interfaces import(
-    ICustomApplicant, IUGApplicantEdit, IPGApplicantEdit, IPUTMEApplicantEdit)
+    ICustomApplicant, ICustomUGApplicantEdit, ICustomPGApplicantEdit, IPUTMEApplicantEdit)
 
 class CustomApplicant(Applicant):
 
-    grok.implements(ICustomApplicant, IUGApplicantEdit,
-        IPGApplicantEdit, IPUTMEApplicantEdit)
+    grok.implements(ICustomApplicant, ICustomUGApplicantEdit,
+        ICustomPGApplicantEdit, IPUTMEApplicantEdit)
     grok.provides(ICustomApplicant)
 

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

@@ -36 +36 @@
 from waeup.kofa.applicants.pdf import PDFApplicationSlip
 from waeup.uniben.applicants.interfaces import (
-    IPGApplicant, IUGApplicant, IPGApplicantEdit, IUGApplicantEdit,
+    ICustomPGApplicant, ICustomUGApplicant, ICustomPGApplicantEdit, ICustomUGApplicantEdit,
     ICustomApplicantOnlinePayment, IPUTMEApplicantEdit,
     UG_OMIT_DISPLAY_FIELDS, PG_OMIT_DISPLAY_FIELDS,
@@ -81 +81 @@
         target = getattr(self.context.__parent__, 'prefix', None)
         if target is not None and target.startswith('pg'):
-            form_fields = grok.AutoFields(IPGApplicant)
+            form_fields = grok.AutoFields(ICustomPGApplicant)
             for field in PG_OMIT_PDF_FIELDS:
                 form_fields = form_fields.omit(field)
         else:
-            form_fields = grok.AutoFields(IUGApplicant)
+            form_fields = grok.AutoFields(ICustomUGApplicant)
             if self._reduced_slip():
                 for field in UG_OMIT_RESULT_SLIP_FIELDS:
@@ -104 +104 @@
         target = getattr(self.context.__parent__, 'prefix', None)
         if target is not None and target.startswith('pg'):
-            form_fields = grok.AutoFields(IPGApplicant)
+            form_fields = grok.AutoFields(ICustomPGApplicant)
             for field in PG_OMIT_DISPLAY_FIELDS:
                 form_fields = form_fields.omit(field)
         else:
-            form_fields = grok.AutoFields(IUGApplicant)
+            form_fields = grok.AutoFields(ICustomUGApplicant)
             for field in UG_OMIT_DISPLAY_FIELDS:
                 form_fields = form_fields.omit(field)
@@ -121 +121 @@
         target = getattr(self.context.__parent__, 'prefix', None)
         if target is not None and target.startswith('pg'):
-            form_fields = grok.AutoFields(IPGApplicant)
+            form_fields = grok.AutoFields(ICustomPGApplicant)
             for field in PG_OMIT_MANAGE_FIELDS:
                 form_fields = form_fields.omit(field)
         else:
-            form_fields = grok.AutoFields(IUGApplicant)
+            form_fields = grok.AutoFields(ICustomUGApplicant)
             for field in UG_OMIT_MANAGE_FIELDS:
                 form_fields = form_fields.omit(field)
@@ -140 +140 @@
         target = getattr(self.context.__parent__, 'prefix', None)
         if target is not None and target.startswith('pg'):
-            form_fields = grok.AutoFields(IPGApplicantEdit)
+            form_fields = grok.AutoFields(ICustomPGApplicantEdit)
             for field in PG_OMIT_EDIT_FIELDS:
                 form_fields = form_fields.omit(field)
@@ -148 +148 @@
                 form_fields = form_fields.omit(field)
         else:
-            form_fields = grok.AutoFields(IUGApplicantEdit)
+            form_fields = grok.AutoFields(ICustomUGApplicantEdit)
             for field in UG_OMIT_EDIT_FIELDS:
                 form_fields = form_fields.omit(field)
@@ -164 +164 @@
     form_fields[
         'payment_date'].custom_widget = FriendlyDatetimeDisplayWidget('le')
-
-class CustomApplicationFeePaymentAddPage(ApplicationFeePaymentAddPage):
-    """ Page to add an online payment ticket
-    """
-    factory = u'waeup.CustomApplicantOnlinePayment'
 
 class CustomExportPDFPaymentSlipPage(ExportPDFPaymentSlipPage):

main/waeup.uniben/trunk/src/waeup/uniben/applicants/export.py

@@ -21 +21 @@
 from waeup.kofa.applicants.interfaces import IApplicantBaseData
 from waeup.kofa.applicants.export import ApplicantsExporter
-from waeup.uniben.applicants.interfaces import IUGApplicant, IPGApplicant
+from waeup.uniben.applicants.interfaces import ICustomUGApplicant, ICustomPGApplicant
 
 class CustomApplicantsExporter(ApplicantsExporter):
@@ -28 +28 @@
 
     fields = tuple(sorted(set(
-        IUGApplicant.names() +
-        IPGApplicant.names() +
+        ICustomUGApplicant.names() +
+        ICustomPGApplicant.names() +
         IApplicantBaseData.names()
         ))) + ('container_code',)

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

@@ -29 +29 @@
 from waeup.kofa.students.vocabularies import nats_vocab, GenderSource
 from waeup.kofa.applicants.interfaces import contextual_reg_num_source
-from kofacustom.nigeria.interfaces import (
-    LGASource, high_qual, high_grade, exam_types)
+from kofacustom.nigeria.applicants.interfaces import (
+    LGASource, high_qual, high_grade, exam_types,
+    INigeriaUGApplicant, INigeriaPGApplicant,
+    INigeriaApplicantOnlinePayment,
+    UG_OMIT_DISPLAY_FIELDS,
+    UG_OMIT_PDF_FIELDS,
+    UG_OMIT_MANAGE_FIELDS,
+    UG_OMIT_EDIT_FIELDS,
+    PUTME_OMIT_EDIT_FIELDS,
+    UG_OMIT_RESULT_SLIP_FIELDS,
+    PG_OMIT_DISPLAY_FIELDS,
+    PG_OMIT_PDF_FIELDS,
+    PG_OMIT_MANAGE_FIELDS,
+    PG_OMIT_EDIT_FIELDS,
+    )
 from waeup.uniben.interfaces import MessageFactory as _
 from waeup.uniben.payments.interfaces import ICustomOnlinePayment
@@ -43 +56 @@
 ############################################################
 
-UG_OMIT_DISPLAY_FIELDS = ('locked', 'course_admitted',
-    'password', 'result_uploaded')
-UG_OMIT_PDF_FIELDS = UG_OMIT_DISPLAY_FIELDS + ('email', 'phone')
-UG_OMIT_MANAGE_FIELDS = ()
-UG_OMIT_EDIT_FIELDS = UG_OMIT_MANAGE_FIELDS + ('locked', 'course_admitted',
-    'student_id', 'screening_score', 'screening_venue', 'notice',
-    'screening_date', 'result_uploaded')
-PUTME_OMIT_EDIT_FIELDS = UG_OMIT_EDIT_FIELDS + (
-    'firstname', 'middlename', 'lastname', 'sex',
-    'course1', 'lga', 'jamb_score', 'jamb_subjects')
-UG_OMIT_RESULT_SLIP_FIELDS = UG_OMIT_DISPLAY_FIELDS + ('email', 'phone',
-    'date_of_birth', 'sex',
-    'nationality', 'lga', 'perm_address', 'course2', 'screening_venue',
-    'screening_date')
-
-PG_OMIT_DISPLAY_FIELDS = ('locked', 'course_admitted', 'password')
-PG_OMIT_PDF_FIELDS = UG_OMIT_DISPLAY_FIELDS + ('email', 'phone')
-PG_OMIT_MANAGE_FIELDS = ()
-PG_OMIT_EDIT_FIELDS = PG_OMIT_MANAGE_FIELDS + (
-    'locked', 'course_admitted',
-    'student_id', 'screening_score', 'screening_venue', 'notice',
-    'screening_date')
-
-class IUGApplicant(IApplicantBaseData):
+class ICustomUGApplicant(INigeriaUGApplicant):
     """An undergraduate applicant.
 
@@ -146 +136 @@
         )
 
-class IPGApplicant(IApplicantBaseData):
+class ICustomPGApplicant(INigeriaPGApplicant):
     """A postgraduate applicant.
 
@@ -325 +315 @@
         )
 
-class ICustomApplicant(IUGApplicant, IPGApplicant):
+class ICustomApplicant(ICustomUGApplicant, ICustomPGApplicant):
     """An interface for both types of applicants.
 
-    Attention: The IPGApplicant field seetings will be overwritten
-    by IPGApplicant field settings. If a field is defined
+    Attention: The ICustomPGApplicant field seetings will be overwritten
+    by ICustomPGApplicant field settings. If a field is defined
     in both interfaces zope.schema validates only against the
-    constraints in IUGApplicant. This does not affect the forms
-    since they are build on either IUGApplicant or IPGApplicant.
+    constraints in ICustomUGApplicant. This does not affect the forms
+    since they are build on either ICustomUGApplicant or ICustomPGApplicant.
     """
 
@@ -344 +334 @@
         """
 
-class IUGApplicantEdit(IUGApplicant):
+class ICustomUGApplicantEdit(ICustomUGApplicant):
     """An undergraduate applicant interface for edit forms.
 
@@ -367 +357 @@
         )
 
-IUGApplicantEdit[
-    'date_of_birth'].order =  IUGApplicant['date_of_birth'].order
-IUGApplicantEdit[
-    'email'].order =  IUGApplicant['email'].order
-
-class IPGApplicantEdit(IPGApplicant):
+ICustomUGApplicantEdit[
+    'date_of_birth'].order =  ICustomUGApplicant['date_of_birth'].order
+ICustomUGApplicantEdit[
+    'email'].order =  ICustomUGApplicant['email'].order
+
+class ICustomPGApplicantEdit(ICustomPGApplicant):
     """A postgraduate applicant interface for editing.
 
@@ -395 +385 @@
         )
 
-IPGApplicantEdit[
-    'date_of_birth'].order =  IPGApplicant['date_of_birth'].order
-IPGApplicantEdit[
-    'email'].order =  IPGApplicant['email'].order
-
-class ICustomApplicantOnlinePayment(ICustomOnlinePayment):
+ICustomPGApplicantEdit[
+    'date_of_birth'].order =  ICustomPGApplicant['date_of_birth'].order
+ICustomPGApplicantEdit[
+    'email'].order =  ICustomPGApplicant['email'].order
+
+class ICustomApplicantOnlinePayment(INigeriaApplicantOnlinePayment):
     """An applicant payment via payment gateways.
 
     """
 
-class IPUTMEApplicantEdit(IUGApplicant):
+class IPUTMEApplicantEdit(ICustomUGApplicant):
     """An undergraduate applicant interface for editing.
 
@@ -428 +418 @@
 
 IPUTMEApplicantEdit[
-    'date_of_birth'].order =  IUGApplicant['date_of_birth'].order
+    'date_of_birth'].order =  ICustomUGApplicant['date_of_birth'].order
 IPUTMEApplicantEdit[
-    'email'].order =  IUGApplicant['email'].order
+    'email'].order =  ICustomUGApplicant['email'].order
 
 class ICustomApplicantUpdateByRegNo(ICustomApplicant):

main/waeup.uniben/trunk/src/waeup/uniben/applicants/payment.py

@@ -48 +48 @@
     """
     grok.implements(IFactory)
-    grok.name(u'waeup.CustomApplicantOnlinePayment')
+    grok.name(u'waeup.ApplicantOnlinePayment')
     title = u"Create a new online payment.",
     description = u"This factory instantiates new online payment instances."