Changeset 6256

Timestamp:

31 May 2011, 08:24:43 (13 years ago)

Author:

Henrik Bettermann

Message:

Move vocabularies and sources into a separate module like in university package. Unfortunately, ApplicantContainerProviderSource? can't be moved because it calls IApplicantsContainerProvider from the interface module.

Location:

main/waeup.sirp/trunk/src/waeup/sirp/applicants

Files:

• interfaces.py (modified) (3 diffs)
• tests/test_interfaces.py (modified) (1 diff)
• vocabularies.py (added)

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

@@ -24 +24 @@
 import os
 import waeup.sirp.browser
-from datetime import datetime
+
 from grokcore.content.interfaces import IContainer
-from zc.sourcefactory.basic import BasicSourceFactory
-from zc.sourcefactory.contextual import BasicContextualSourceFactory
+
 from zope import schema
+from zope.interface import Interface, Attribute
 from zope.component import getUtility, getUtilitiesFor
-from zope.interface import Interface, Attribute
-from zope.catalog.interfaces import ICatalog
 from zope.pluggableauth.interfaces import IPrincipalInfo
 from zope.security.interfaces import IGroupClosureAwarePrincipal as IPrincipal
+from zc.sourcefactory.basic import BasicSourceFactory
 from waeup.sirp.image.schema import ImageFile
 from waeup.sirp.image.image import WAeUPImageFile
-from waeup.sirp.interfaces import IWAeUPObject, SimpleWAeUPVocabulary
+from waeup.sirp.interfaces import IWAeUPObject
 from waeup.sirp.university.vocabularies import application_categories
-from waeup.sirp.applicants.lgas import LGAS
-
+from waeup.sirp.applicants.vocabularies import (
+  year_range, application_types_vocab, application_pins_vocab,
+  lgas_vocab, CertificateSource, AppCatCertificateSource,
+  GenderSource, entry_session_vocab
+  )
 
 IMAGE_PATH = os.path.join(
@@ -54 +56 @@
     )
 
-#: Types of applications we support.
-APPLICATION_TYPES = (
-    ('General Studies', 'app','APP'),
-    ('Pre-NCE Programme', 'prence','PRE'),
-    ('Post UME Screening Test', 'pume','PUME'),
-    ('Post UDE Screening', 'pude','PUDE'),
-    ('Part Time Degree in Education', 'sandwich','SAND'),
-    ('Part-Time Degree Programmes', 'pt','PTP'),
-    ('Diploma Programmes', 'dp','DPP'),
-    ('PCE Screening', 'pce','PCE'),
-    ('Certificate Programmes', 'ct','CTP'),
-    ('Common Entry Screening Test', 'cest','CEST'),
-    )
-
-#: A :class:`waeup.sirp.interfaces.SimpleWAeUPVocabulary` of supported
-#: application or screening types.
-application_types_vocab = SimpleWAeUPVocabulary(
-    *[(x[0],x[1]) for x in APPLICATION_TYPES])
-application_pins_vocab = SimpleWAeUPVocabulary(
-    *[(u"%s (%s)" % (x[2],x[0]),x[2]) for x in APPLICATION_TYPES])
-lgas_vocab = SimpleWAeUPVocabulary(
-    *sorted([(x[1],x[0]) for x in LGAS]))
-
-def year_range():
-    curr_year = datetime.now().year
-    return range(curr_year - 2, curr_year + 5)
-
-def entry_sessions():
-    curr_year = datetime.now().year
-    year_range = range(curr_year - 5, curr_year + 2)
-    return [('%s/%s' % (year,year+1), '%s' % year) for year in year_range]
-
-entry_session_vocab = SimpleWAeUPVocabulary(*entry_sessions())
-
-class CertificateSource(BasicContextualSourceFactory):
-    """A certificate source delivers all certificates provided
-    in the portal.
-    """
-    def getValues(self, context):
-        catalog = getUtility(ICatalog, name='certificates_catalog')
-        return sorted(list(
-                catalog.searchResults(
-                    code=('', 'z*'))),
-                    key=lambda value: value.code)
-
-    def getToken(self, context, value):
-        return value.code
-
-    def getTitle(self, context, value):
-        return "%s - %s" % (value.code, value.title[:64])
-
-class AppCatCertificateSource(CertificateSource):
-    """An application certificate source delivers all courses which belong to
-    a certain application_category.
-    """
-    def getValues(self, context):
-        appcat = context.__parent__.application_category
-        catalog = getUtility(ICatalog, name='certificates_catalog')
-        return sorted(list(
-                catalog.searchResults(
-                    code=('', 'z*'),
-                    application_category=(appcat,appcat))),
-                    key=lambda value: value.code)
-
-class GenderSource(BasicSourceFactory):
-    """A gender source delivers basically a mapping
-       ``{'m': 'male', 'f': 'female'}``
-
-       Using a source, we make sure that the tokens (which are
-       stored/expected for instance from CSV files) are something one
-       can expect and not cryptic IntIDs.
-    """
-    def getValues(self):
-        return ['m', 'f']
-
-    def getToken(self, value):
-        return value[0].lower()
-
-    def getTitle(self, value):
-        if value == 'm':
-            return 'male'
-        if value == 'f':
-            return 'female'
-
 class ApplicantContainerProviderSource(BasicSourceFactory):
     """A source offering all available applicants container types.
@@ -192 +110 @@
     """
     pass
-
 
 class IApplicantsContainer(IWAeUPObject):

main/waeup.sirp/trunk/src/waeup/sirp/applicants/tests/test_interfaces.py

@@ -30 +30 @@
 from zope.publisher.browser import TestRequest
 from waeup.sirp.applicants import interfaces
-from waeup.sirp.applicants.interfaces import (
+from waeup.sirp.applicants.vocabularies import (
     APPLICATION_TYPES, application_types_vocab, GenderSource,
     )