Changeset 6648

Timestamp:

29 Aug 2011, 07:05:17 (13 years ago)

Author:

Henrik Bettermann

Message:

Reorganize vocabularies. The vocabs of the students package are the basis. In the application package only additional sources and vocabs should be defined.

Location:

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

Files:

• applicants/interfaces.py (modified) (1 diff)
• applicants/lgas.py (deleted)
• applicants/vocabularies.py (modified) (3 diffs)
• students/interfaces.py (modified) (2 diffs)
• students/lgas.py (added)
• students/vocabularies.py (added)

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

@@ -38 +38 @@
 from waeup.sirp.interfaces import IWAeUPObject
 from waeup.sirp.university.vocabularies import application_categories
+from waeup.sirp.students.vocabularies import (
+  year_range, lgas_vocab, CertificateSource, GenderSource,
+  )
 from waeup.sirp.applicants.vocabularies import (
-  year_range, application_types_vocab, application_pins_vocab,
-  lgas_vocab, CertificateSource, AppCatCertificateSource, GenderSource,
+  application_types_vocab, application_pins_vocab,
+  AppCatCertificateSource,
   )
 

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

@@ -7 +7 @@
 from zc.sourcefactory.contextual import BasicContextualSourceFactory
 from waeup.sirp.interfaces import SimpleWAeUPVocabulary
-from waeup.sirp.applicants.lgas import LGAS
+from waeup.sirp.students.lgas import LGAS
+from waeup.sirp.students.vocabularies import (
+    entry_session_vocab, CertificateSource, GenderSource)
 
 #: Types of applications we support.
@@ -29 +31 @@
 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):
@@ -72 +45 @@
                     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'

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

@@ -4 +4 @@
 from zope import schema
 from waeup.sirp.interfaces import IWAeUPObject
+from waeup.sirp.students.vocabularies import (
+  year_range, lgas_vocab, CertificateSource, GenderSource,
+  )
 
 class IStudentNavigation(IWAeUPObject):
@@ -102 +105 @@
     """
 
-    certificate_code = schema.TextLine(
-        title = u'Certificate Code',
-        default = u'None',
+    certificate = schema.Choice(
+        title = u'Certificate',
+        source = CertificateSource(),
+        default = None,
         required = True,
         )