Changeset 11843

Timestamp:

14 Oct 2014, 17:45:38 (10 years ago)

Author:

Henrik Bettermann

Message:

Adjust registration forms. Add localization.

Location:

main/kofacustom.pcn/trunk/src/kofacustom/pcn

Files:

• applicants/browser.py (modified) (2 diffs)
• applicants/browser_templates/applicantdisplaypage.pt (added)
• applicants/browser_templates/applicanteditpage.pt (added)
• applicants/interfaces.py (modified) (2 diffs)
• locales/de/LC_MESSAGES/kofacustom.pcn.po (added)
• locales/en/LC_MESSAGES/kofacustom.pcn.mo (added)
• locales/en/LC_MESSAGES/kofacustom.pcn.po (added)
• locales/en/LC_MESSAGES/waeup.kofa.mo (modified) (previous)
• locales/en/LC_MESSAGES/waeup.kofa.po (modified) (4 diffs)
• locales/fr/LC_MESSAGES/kofacustom.pcn.po (added)
• locales/ha/LC_MESSAGES/kofacustom.pcn.po (added)
• locales/kofacustom.pcn.pot (added)
• locales/yo/LC_MESSAGES/kofacustom.pcn.po (added)

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

@@ -20 +20 @@
 import grok
 from waeup.kofa.applicants.browser import (
-    ApplicantRegistrationPage, ApplicantsContainerPage)
+    ApplicantRegistrationPage,
+    ApplicantsContainerPage,
+    ApplicantDisplayFormPage,
+    ApplicantManageFormPage,
+    ApplicantEditFormPage)
 from waeup.kofa.applicants.viewlets import (
     StudentCreateActionButton,
-    ApplicantsRootCreateStudentsActionButton
+    ApplicantsRootCreateStudentsActionButton,
     )
+from kofacustom.pcn.applicants.interfaces import (
+    ICustomApplicant, ICustomApplicantEdit)
 from kofacustom.pcn.interfaces import MessageFactory as _
 
@@ -42 +48 @@
         """
         return
+
+class CustomApplicantDisplayFormPage(ApplicantDisplayFormPage):
+    """A display view for applicant data.
+    """
+    grok.template('applicantdisplaypage')
+
+    @property
+    def form_fields(self):
+        form_fields = grok.AutoFields(ICustomApplicant).omit(
+            'locked', 'course_admitted', 'password', 'suspended')
+        return form_fields
+
+class CustomApplicantManageFormPage(ApplicantManageFormPage):
+    """A full edit view for applicant data.
+    """
+    grok.template('applicanteditpage')
+
+    @property
+    def form_fields(self):
+        form_fields = grok.AutoFields(ICustomApplicant)
+        form_fields['applicant_id'].for_display = True
+        return form_fields
+
+class CustomApplicantEditFormPage(ApplicantEditFormPage):
+    """An applicant-centered edit view for applicant data.
+    """
+    grok.template('applicanteditpage')
+
+    @property
+    def form_fields(self):
+        form_fields = grok.AutoFields(ICustomApplicantEdit).omit(
+            'locked', 'course_admitted',
+            'suspended'
+            )
+        form_fields['applicant_id'].for_display = True
+        form_fields['reg_number'].for_display = True
+        return form_fields

main/kofacustom.pcn/trunk/src/kofacustom/pcn/applicants/interfaces.py

@@ -18 +18 @@
 """Customized interfaces of the university application package.
 """
-
+from datetime import datetime
+from grokcore.content.interfaces import IContainer
+from zc.sourcefactory.contextual import BasicContextualSourceFactory
+from zope import schema
+from zope.component import queryUtility, getUtility
+from zope.catalog.interfaces import ICatalog
+from zope.interface import Interface, Attribute, implements, directlyProvides
+from zope.schema.interfaces import (
+    ValidationError, ISource, IContextSourceBinder)
+from waeup.kofa.browser.interfaces import IApplicantBase
+from waeup.kofa.schema import TextLineChoice, FormattedDate
+from waeup.kofa.interfaces import (
+    IKofaObject, validate_email,
+    SimpleKofaVocabulary)
+from waeup.kofa.interfaces import MessageFactory as _
+from waeup.kofa.payments.interfaces import IOnlinePayment
+from waeup.kofa.schema import PhoneNumber
+from waeup.kofa.students.vocabularies import GenderSource, RegNumberSource
+from waeup.kofa.university.vocabularies import (
+    AppCatSource, CertificateSource, SpecialApplicationSource)
 from waeup.kofa.applicants.interfaces import (
-    IApplicantBaseData,
-    IApplicantOnlinePayment,
-    IApplicantEdit,
-    )
+    contextual_reg_num_source, AppCatCertificateSource,
+    IApplicantOnlinePayment)
 from kofacustom.pcn.interfaces import MessageFactory as _
 
-class ICustomApplicant(IApplicantBaseData):
-    """A custom applicant.
+class ICustomApplicant(IApplicantBase):
+    """The data for an applicant.
 
+    This is a base interface with no field
+    required. For use with processors, forms, etc., please use one of
+    the derived interfaces below, which set more fields to required
+    state, depending on use-case.
     """
 
-class ICustomApplicantEdit(IApplicantEdit):
+    def writeLogMessage(view, comment):
+        """Adds an INFO message to the log file
+        """
+
+    def createStudent():
+        """Create a student object from applicatnt data
+        and copy applicant object.
+        """
+
+    history = Attribute('Object history, a list of messages')
+    state = Attribute('The application state of an applicant')
+    display_fullname = Attribute('The fullname of an applicant')
+    application_date = Attribute('UTC datetime of submission, used for export only')
+    password = Attribute('Encrypted password of a applicant')
+    application_number = Attribute('The key under which the record is stored')
+
+    suspended = schema.Bool(
+        title = _(u'Account suspended'),
+        default = False,
+        required = False,
+        )
+
+    applicant_id = schema.TextLine(
+        title = _(u'Applicant Id'),
+        required = False,
+        readonly = False,
+        )
+    reg_number = TextLineChoice(
+        title = _(u'Registration Number'),
+        readonly = False,
+        required = True,
+        source = contextual_reg_num_source,
+        )
+    firstname = schema.TextLine(
+        title = _(u'First Name'),
+        required = True,
+        )
+    middlename = schema.TextLine(
+        title = _(u'Middle Name'),
+        required = False,
+        )
+    lastname = schema.TextLine(
+        title = _(u'Last Name (Surname)'),
+        required = True,
+        )
+    date_of_birth = FormattedDate(
+        title = _(u'Date of Birth'),
+        required = False,
+        #date_format = u'%d/%m/%Y', # Use grok-instance-wide default
+        show_year = True,
+        )
+    sex = schema.Choice(
+        title = _(u'Sex'),
+        source = GenderSource(),
+        required = True,
+        )
+    email = schema.ASCIILine(
+        title = _(u'Email Address'),
+        required = False,
+        constraint=validate_email,
+        )
+    phone = PhoneNumber(
+        title = _(u'Phone'),
+        description = u'',
+        required = False,
+        )
+    course1 = schema.Choice(
+        title = _(u'1st Choice Course of Study'),
+        source = AppCatCertificateSource(),
+        required = True,
+        )
+
+    notice = schema.Text(
+        title = _(u'Notice'),
+        required = False,
+        )
+
+    course_admitted = schema.Choice(
+        title = _(u'Admitted Course of Study'),
+        source = CertificateSource(),
+        required = False,
+        )
+    locked = schema.Bool(
+        title = _(u'Form locked'),
+        default = False,
+        required = False,
+        )
+
+class ICustomApplicantEdit(ICustomApplicant):
     """A custom applicant interface for editing.
 
@@ -41 +150 @@
     We cannot omit fields here. This has to be done in the
     respective form page.
+
     """
+
+    email = schema.ASCIILine(
+        title = _(u'Email Address'),
+        required = True,
+        constraint=validate_email,
+        )
+    course1 = schema.Choice(
+        title = _(u'1st Choice Course of Study'),
+        source = AppCatCertificateSource(),
+        required = True,
+        )
+    course_admitted = schema.Choice(
+        title = _(u'Admitted Course of Study'),
+        source = CertificateSource(),
+        required = False,
+        readonly = True,
+        )
+    notice = schema.Text(
+        title = _(u'Notice'),
+        required = False,
+        readonly = True,
+        )
 
 class ICustomApplicantOnlinePayment(IApplicantOnlinePayment):

main/kofacustom.pcn/trunk/src/kofacustom/pcn/locales/en/LC_MESSAGES/waeup.kofa.po

@@ -16 +16 @@
 
 msgid "Academic Section"
-msgstr "PCN Offices"
+msgstr "Office Section"
 
 msgid "Manage academic section"
@@ -154 +154 @@
 
 msgid "No application record found."
-msgstr "No registrant record found."
+msgstr "No registration record found."
 
 msgid "Manage application section"
-msgstr "Manage registrant section"
+msgstr "Manage registration section"
 
 msgid "Applicant Id"
@@ -166 +166 @@
 
 msgid "Application Section"
-msgstr "Registrant Section"
+msgstr "Registration Section"
 
 msgid "Application State"
@@ -205 +205 @@
 
 msgid "Register for application"
-msgstr "Subscribe"
+msgstr "Register"
 
 msgid "View application record"