Changeset 9787 for main/waeup.kofa/trunk/src/waeup

Timestamp:

7 Dec 2012, 10:57:21 (12 years ago)

Author:

uli

Message:

Make use of new students query (replacing the old filter) and simplify level list creation for studylevelsoverview exporter.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/students/export.py (modified) (6 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/students/export.py

@@ -20 +20 @@
 import grok
 from datetime import datetime
-from zope.catalog.interfaces import ICatalog
-from zope.component import queryUtility
 from waeup.kofa.interfaces import MessageFactory as _
+from waeup.kofa.students.catalog import StudentsQuery
 from waeup.kofa.students.interfaces import (
     IStudent, IStudentStudyCourse, IStudentStudyLevel, ICourseTicket,
     IStudentOnlinePayment, ICSVStudentExporter, IBedTicket)
+from waeup.kofa.students.vocabularies import study_levels
 from waeup.kofa.utils.batching import ExporterBase
 from waeup.kofa.utils.helpers import iface_names
@@ -34 +34 @@
                   'coursetickets', 'studentpayments')
 
-class StudentsExportFilter(object):
-    """A filter to find students that match certain criteria.
-
-    The filter is meant as a component to aggregate search parameters
-    for students. This way we can tell some exporter to use 'this
-    filter' instead of passing in all (probably different) parameters.
-
-    Just an idea right now. There might be better ways.
-    """
-    cat_name = 'students_catalog'
-    default_params = dict(student_id=None)
-
-    def __init__(self, **kw):
-        self._kw = dict(self.default_params)
-        self._kw.update(kw)
-        return
-
-    def query_catalog(self, catalog):
-        query = dict([(idx_name, (value, value))
-                     for idx_name, value in self._kw.items()])
-        result = catalog.searchResults(**query)
-        return result
-
-    def query(self, context=None):
-        catalog = queryUtility(
-            ICatalog, context=context, name=self.cat_name, default=None)
-        if catalog is None:
-            return []
-        return self.query_catalog(catalog)
-
-def get_students(site, stud_filter=StudentsExportFilter()):
+def get_students(site, stud_filter=StudentsQuery()):
     """Get all students registered in catalog in `site`.
     """
-    return stud_filter.query(context=site)
+    return stud_filter.query()
 
 def get_studycourses(students):
@@ -134 +104 @@
         """Export all students denoted by the given parameters.
         """
-        filter_inst = StudentsExportFilter(
+        filter_inst = StudentsQuery(
             current_session=session, current_level=level,
             faccode=faccode, depcode=depcode)
@@ -393 +363 @@
     grok.name('studylevelsoverview')
 
-    levels = ['10',]
-    levels += [str(level) for level in range(100,1000,10) if level % 100 < 30]
-    levels.append('999')
-    level_range_tuple = tuple(levels)
+    avail_levels = tuple([str(x) for x in study_levels(None)])
 
     #: Fieldnames considered by this exporter
@@ -402 +369 @@
         'state', 'certcode', 'faccode', 'depcode', 'is_postgrad',
         'entry_session', 'current_level', 'current_session',
-        ) + level_range_tuple
+        ) + avail_levels
 
     #: The title under which this exporter will be displayed
@@ -408 +375 @@
 
     def mangle_value(self, value, name, context=None):
-        if name in self.level_range_tuple and context is not None:
+        if name in self.avail_levels and context is not None:
             value = ''
             for level in context['studycourse'].values():