Changeset 7681 for main/waeup.sirp/trunk/src/waeup/sirp/university

Timestamp:

22 Feb 2012, 21:14:09 (13 years ago)

Author:

Henrik Bettermann

Message:

Uses sources instead of vocabularies and feed sources with dictionaries defined in SIRPUtils. This way we can easily customize the sources.

Location:

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

Files:

• __init__.py (modified) (1 diff)
• department.py (modified) (3 diffs)
• faculty.py (modified) (2 diffs)
• interfaces.py (modified) (6 diffs)
• tests/test_faculty.py (modified) (2 diffs)
• vocabularies.py (modified) (1 diff)

main/waeup.sirp/trunk/src/waeup/sirp/university/__init__.py

@@ -2 +2 @@
 from waeup.sirp.university.course import Course
 from waeup.sirp.university.coursescontainer import CoursesContainer
+from waeup.sirp.university.certificate import Certificate
+from waeup.sirp.university.certificatescontainer import CertificatesContainer
 from waeup.sirp.university.faculty import Faculty
+from waeup.sirp.university.department import Department
 from waeup.sirp.university.facultiescontainer import FacultiesContainer
 __all__ = (
-    'Course', 'CoursesContainer', 'Faculty', 'FacultiesContainer')
+    'Course', 'CoursesContainer',
+    'Certificate', 'CertificatesContainer',
+    'Faculty', 'FacultiesContainer', 'Department')

main/waeup.sirp/trunk/src/waeup/sirp/university/department.py

@@ -19 +19 @@
 """
 import grok
-from zope.component import createObject
 from zope.component.interfaces import IFactory
 from zope.interface import implementedBy
+from zope.component import getUtility
+from waeup.sirp.university.coursescontainer import CoursesContainer
+from waeup.sirp.university.certificatescontainer import CertificatesContainer
+from waeup.sirp.interfaces import ISIRPUtils
 from waeup.sirp.university.interfaces import IDepartment, IDepartmentAdd
-from waeup.sirp.university.vocabularies import inst_types
 
 class Department(grok.Container):
@@ -53 +55 @@
         self.title_prefix = title_prefix
         self.code = code
-        self.courses = createObject(u'waeup.CoursesContainer')
+        self.courses = CoursesContainer()
         self.courses.__parent__ = self
         self.courses.__name__ = 'courses'
-        self.certificates = createObject(u'waeup.CertificatesContainer')
+        self.certificates = CertificatesContainer()
         self.certificates.__parent__ = self
         self.certificates.__name__ = 'certificates'
@@ -71 +73 @@
 
     def longtitle(self):
+        insttypes_dict = getUtility(ISIRPUtils).getInstTypeDict()
         return "%s %s (%s)" % (
-            inst_types.getTerm(self.title_prefix).title,
+            insttypes_dict[self.title_prefix],
             self.title, self.code)
 

main/waeup.sirp/trunk/src/waeup/sirp/university/faculty.py

@@ -22 +22 @@
 from zope.component.interfaces import IFactory
 from zope.interface import implementedBy
+from zope.component import getUtility
+from waeup.sirp.interfaces import ISIRPUtils
 from waeup.sirp.university.interfaces import (
     IFaculty, IFacultyAdd, IDepartment)
-from waeup.sirp.university.vocabularies import inst_types
 
 class Faculty(grok.Container):
@@ -60 +61 @@
 
     def longtitle(self):
-        try:
-            result = "%s %s (%s)" % (
-                inst_types.getTerm(
-                    self.title_prefix).title,
-                self.title, self.code)
-        except:
-            result = "%s (%s)" % (self.title, self.code)
+        insttypes_dict = getUtility(ISIRPUtils).getInstTypeDict()
+        result = "%s %s (%s)" % (
+            insttypes_dict[self.title_prefix],
+            self.title, self.code)
         return result
 

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

@@ -26 +26 @@
 from waeup.sirp.university.vocabularies import (
     course_levels,
-    semester,
-    application_categories,
-    study_modes,
-    inst_types,
     CourseSource,
+    StudyModeSource,
+    AppCatSource,
+    InstTypeSource,
+    SemesterSource,
     )
 
@@ -53 +53 @@
         title = u'Name prefix',
         default = u'faculty',
-        vocabulary = inst_types,
+        source = InstTypeSource(),
         required = True,
         )
@@ -100 +100 @@
     title_prefix = schema.Choice(
         title = u'Name prefix',
-        vocabulary = inst_types,
+        source = InstTypeSource(),
         default = u'department',
         required = True,
@@ -166 +166 @@
         title = u'Semester/Term',
         default = 9,
-        vocabulary = semester,
+        source = SemesterSource(),
         required = True,
         )
@@ -206 +206 @@
     study_mode = schema.Choice(
         title = u'Study Mode',
-        vocabulary = study_modes,
+        source = StudyModeSource(),
         default = u'ug_ft',
         required = True,
@@ -227 +227 @@
     application_category = schema.Choice(
         title = u'Application Category',
-        vocabulary = application_categories,
+        source = AppCatSource(),
         default = u'basic',
         required = True,

main/waeup.sirp/trunk/src/waeup/sirp/university/tests/test_faculty.py

@@ -22 +22 @@
 import unittest
 from zope.interface.verify import verifyObject, verifyClass
-from waeup.sirp.university import Faculty
-from waeup.sirp.university.interfaces import IFaculty
+from waeup.sirp.university import Faculty, Department
+from waeup.sirp.university.interfaces import IFaculty, IDepartment
 
-class FacultyTests(unittest.TestCase):
+class FacultyAndDepartmentTests(unittest.TestCase):
 
     def test_ifaces(self):
@@ -32 +32 @@
         verifyClass(IFaculty, Faculty)
         verifyObject(IFaculty, fac)
+        dep = Department()
+        verifyClass(IDepartment, Department)
+        verifyObject(IDepartment, dep)
         return
-
-    def test_longtitle(self):
-        # Make sure we get a longtitle
-        fac = Faculty()
-        self.assertEqual(fac.longtitle(),
-                         u'Faculty of Unnamed Faculty (NA)')
-
-    def test_longtitle_no_terms(self):
-        # Make sure we get a longtitle also if no term for the title
-        # prefix is available
-        fac = Faculty()
-        fac.title_prefix = 'Studio for' # Not a valid prefix
-        self.assertEqual(fac.longtitle(),
-                         u'Unnamed Faculty (NA)')

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

@@ -19 +19 @@
 """
 from zc.sourcefactory.basic import BasicSourceFactory
+from zc.sourcefactory.contextual import BasicContextualSourceFactory
 from zope.catalog.interfaces import ICatalog
 from zope.component import getUtility
-from waeup.sirp.interfaces import SimpleSIRPVocabulary
+from waeup.sirp.interfaces import SimpleSIRPVocabulary, ISIRPUtils
+from waeup.sirp.interfaces import MessageFactory as _
 
-inst_types = SimpleSIRPVocabulary(
-    ('Faculty of','faculty'),
-    ('Department of','department'),
-    ('School of','school'),
-    ('School for','school_for'),
-    ('Institute of','institute'),
-    ('Office for','office'),
-    ('Centre for','centre'),
-    ('College','college'),
+course_levels = SimpleSIRPVocabulary(
+    (_('Pre-Studies'),10),
+    (_('100 (Year 1)'),100),
+    (_('200 (Year 2)'),200),
+    (_('300 (Year 3)'),300),
+    (_('400 (Year 4)'),400),
+    (_('500 (Year 5)'),500),
+    (_('600 (Year 6)'),600),
+    (_('700 (Year 7)'),700),
+    (_('800 (Year 8)'),800),
     )
 
-course_levels = SimpleSIRPVocabulary(
-    ('Pre-Studies', 10),
-    ('100 (Year 1)',100),
-    ('200 (Year 2)',200),
-    ('300 (Year 3)',300),
-    ('400 (Year 4)',400),
-    ('500 (Year 5)',500),
-    ('600 (Year 6)',600),
-    ('700 (Year 7)',700),
-    ('800 (Year 8)',800),
-    )
+class SemesterSource(BasicContextualSourceFactory):
+    """An institution type source delivers semester or term descriptors.
+    """
+    def getValues(self, context):
+        self.semesters_dict = getUtility(ISIRPUtils).getSemesterDict()
+        return self.semesters_dict.keys()
 
-semester = SimpleSIRPVocabulary(
-    ('N/A', 9),
-    ('First Semester', 1),
-    ('Second Semester', 2),
-    ('Combined', 3)
-    )
+    def getToken(self, context, value):
+        return str(value)
 
-application_categories = SimpleSIRPVocabulary(
-    ('PUME, PDE, PCE, PRENCE','basic'),
-    ('Part-Time, Diploma, Certificate','cest'),
-    ('Sandwich','sandwich'),
-    ('Postgraduate','pg'),
-    ('no application','no'),
-    )
+    def getTitle(self, context, value):
+        return self.semesters_dict[value]
 
-study_modes = SimpleSIRPVocabulary(
-    ('UME Full Time','ume_ft'),
-    ('Direct Entry Full Time','de_ft'),
-    ('Direct Entry Part Time','de_pt'),
-    ('Diploma Full Time','dp_ft'),
-    ('Diploma Part Time','dp_pt'),
-    ('Undergraduate Full Time','ug_ft'),
-    ('Undergraduate Part Time','ug_pt'),
-    ('Postgraduate Full Time','pg_ft'),
-    ('Postgraduate Part Time','pg_pt'),
-    ('Certificate Full Time','ct_ft'),
-    ('Certificate Part Time','ct_pt'),
-    ('Remedial','rm_ft'),
-    ('Remedial with deficiencies','rmd_ft'),
-    ('Post Higher Education Full Time','ph_ft'),
-    ('Joint Matriculation Full Time','jm_ft'),
-    ('Transfer Full Time','transfer_ft'),
-    ('Transfer Part Time','transfer_pt'),
-    )
+class InstTypeSource(BasicContextualSourceFactory):
+    """An institution type source delivers types of institutions
+    in the portal.
+    """
+    def getValues(self, context):
+        self.insttypes_dict = getUtility(ISIRPUtils).getInstTypeDict()
+        return sorted(self.insttypes_dict.keys())
+
+    def getToken(self, context, value):
+        return value
+
+    def getTitle(self, context, value):
+        return self.insttypes_dict[value]
+
+class AppCatSource(BasicContextualSourceFactory):
+    """A application category source delivers all application categories
+    provided in the portal.
+    """
+    def getValues(self, context):
+        self.appcats_dict = getUtility(ISIRPUtils).getAppCatDict()
+        return sorted(self.appcats_dict.keys())
+
+    def getToken(self, context, value):
+        return value
+
+    def getTitle(self, context, value):
+        return self.appcats_dict[value]
+
+class StudyModeSource(BasicContextualSourceFactory):
+    """A study modes source delivers all study modes provided
+    in the portal.
+    """
+    def getValues(self, context):
+        self.studymodes_dict = getUtility(ISIRPUtils).getStudyModesDict()
+        return sorted(self.studymodes_dict.keys())
+
+    def getToken(self, context, value):
+        return value
+
+    def getTitle(self, context, value):
+        return self.studymodes_dict[value]
 
 class CourseSource(BasicSourceFactory):