Changeset 5977 for main/waeup.sirp/trunk/src/waeup/sirp/university/interfaces.py

Timestamp:

26 Apr 2011, 10:35:52 (13 years ago)

Author:

Henrik Bettermann

Message:

Implement a vocabulary module in university and move some vocabularies to it.

Rebuild the certificatepage page template.

Rename Course Reference to Course Referrer. It's very difficult to find a proper name for these 'certificatecourse' objects. But we have to clearly distinguish courses and referrers of courses as they are not the same.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/university/interfaces.py (modified) (6 diffs)

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

@@ -1 +1 @@
 """Interfaces of academics specific objects.
 """
-from zc.sourcefactory.basic import BasicSourceFactory
 from zope import schema
-try:
-    from zope.catalog.interfaces import ICatalog
-except ImportError:
-    # BBB
-    from zope.app.catalog.interfaces import ICatalog
-from zope.component import getUtility
 from zope.interface import Attribute
-from waeup.sirp.interfaces import (IWAeUPObject, IWAeUPContainer,
-                                   SimpleWAeUPVocabulary)
-
-class CourseSource(BasicSourceFactory):
-    """A course source delivers all courses inside the portal by looking
-       up a catalog.
-    """
-    def getValues(self):
-        catalog = getUtility(ICatalog, name='courses_catalog')
-        return list(catalog.searchResults(code=('', 'z*')))
-
-    def getToken(self, value):
-        return value.code
-        
-    def getTitle(self, value):
-        return "%s - %s" % (value.code, value.title[:64])
+from waeup.sirp.interfaces import (IWAeUPObject, IWAeUPContainer)
+                                   
+from waeup.sirp.university.vocabularies import (course_levels,
+                                                semester, CourseSource)                                   
 
 class IFaculty(IWAeUPContainer):
@@ -151 +132 @@
         title = u'Semester/Term',
         default = 0,
-        vocabulary = SimpleWAeUPVocabulary(
-            ('N/A', 0), ('First Semester', 1),
-            ('Second Semester', 2), ('Combined', 3)),
+        vocabulary = semester,
         required = True,
         )
@@ -199 +178 @@
         )
 
-    start_level = schema.TextLine(
+    start_level = schema.Choice(
         title = u'Start Level',
-        default = u'100',
-        required = True,
-        )
-    
-    end_level = schema.TextLine(
+        #source = LevelSource(),
+        vocabulary = course_levels,
+        default = 100,
+        required = True,
+        )
+    
+    end_level = schema.Choice(
         title = u'End Level',
-        default = u'500',
+        #source = LevelSource(),
+        vocabulary = course_levels,
+        default = 500,
         required = True,
         )
@@ -240 +223 @@
 
 class ICertificateCourse(IWAeUPObject):
-    """A certificatecourse is a course referenced by a certificate, which
+    """A certificatecourse is referring a course and 
        provides some own attributes.
     """
     course = schema.Choice(
-        title = u'Course referenced',
+        title = u'Course referrer',
         source = CourseSource(),
         readonly = True,
         )
     
-    level = schema.Int(
+    level = schema.Choice(
         title = u'Level',
         required = True,
-        default = 100,
+        #source = LevelSource(),
+        vocabulary = course_levels,
         readonly = False,
         )
@@ -263 +247 @@
 
     def getCourseCode():
-        """Return the code of the referenced course.
+        """Return the code of the course referred to.
 
         This is needed for cataloging.
@@ -270 +254 @@
         
 class ICertificateCourseAdd(ICertificateCourse):
-    """A certificatecourse is a course referenced by a certificate, which
+    """A certificatecourse is referring a course and 
        provides some own attributes.
     """
     course = schema.Choice(
-        title = u'Course to be referenced',
+        title = u'Course',
         source = CourseSource(),
         readonly = False,