Changeset 9806

Timestamp:

17 Dec 2012, 08:06:52 (12 years ago)

Author:

Henrik Bettermann

Message:

Move filter students pages to students package.

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• browser/pages.py (modified) (2 diffs)
• browser/templates/filterstudentspage.pt (deleted)
• students/browser.py (modified) (3 diffs)
• students/browser_templates/filterstudentspage.pt (added)

main/waeup.kofa/trunk/src/waeup/kofa/browser/pages.py

@@ -62 +62 @@
     get_users_with_role)
 
-from waeup.kofa.students.catalog import search as searchstudents
-from waeup.kofa.students.catalog import StudentQueryResultItem
 from waeup.kofa.university.catalog import search
 from waeup.kofa.university.vocabularies import course_levels
@@ -1881 +1879 @@
             yield(dict(url=url, name=key, container=val))
 
-class FilterStudentsInDepartmentPage(KofaPage):
-    """Page that filters and lists students.
-    """
-    grok.context(IDepartment)
-    grok.require('waeup.showStudents')
-    grok.name('students')
-    grok.template('filterstudentspage')
-    pnav = 1
-    session_label = _('in session')
-    level_label = _('at level')
-
-    def label(self):
-        return 'Students in %s ...' % self.context.longtitle()
-
-    def _set_session_values(self):
-        vocab_terms = academic_sessions_vocab.by_value.values()
-        self.sessions = sorted(
-            [(x.title, x.token) for x in vocab_terms], reverse=True)
-        self.sessions += [('All Sessions', 'all')]
-        return
-
-    def _set_level_values(self):
-        vocab_terms = course_levels.by_value.values()
-        self.levels = sorted(
-            [(x.title, x.token) for x in vocab_terms])
-        self.levels += [('All Levels', 'all')]
-        return
-
-    def _searchCatalog(self, session, level):
-        if level not in (10, 999, None):
-            start_level = 100 * (level // 100)
-            end_level = start_level + 90
-        else:
-            start_level = end_level = level
-        cat = queryUtility(ICatalog, name='students_catalog')
-        students = cat.searchResults(
-            current_session=(session, session),
-            current_level=(start_level, end_level),
-            depcode=(self.context.code, self.context.code)
-            )
-        hitlist = []
-        for student in students:
-            hitlist.append(StudentQueryResultItem(student, view=self))
-        return hitlist
-
-    def update(self, SHOW=None, session=None, level=None):
-        datatable.need()
-        self.parent_url = self.url(self.context.__parent__)
-        self._set_session_values()
-        self._set_level_values()
-        self.hitlist = []
-        self.session_default = session
-        self.level_default = level
-        if SHOW is not None:
-            if session != 'all':
-                self.session = int(session)
-                self.session_string = '%s %s/%s' % (
-                    self.session_label, self.session, self.session+1)
-            else:
-                self.session = None
-                self.session_string = _('in any session')
-            if level != 'all':
-                self.level = int(level)
-                self.level_string = '%s %s' % (self.level_label, self.level)
-            else:
-                self.level = None
-                self.level_string = _('at any level')
-            self.hitlist = self._searchCatalog(self.session, self.level)
-            if not self.hitlist:
-                self.flash(_('No student found.'))
-        return
-
-class FilterStudentsInCertificatePage(FilterStudentsInDepartmentPage):
-    """Page that filters and lists students.
-    """
-    grok.context(ICertificate)
-
-    def label(self):
-        return 'Students studying %s ...' % self.context.longtitle()
-
-    def _searchCatalog(self, session, level):
-        if level not in (10, 999, None):
-            start_level = 100 * (level // 100)
-            end_level = start_level + 90
-        else:
-            start_level = end_level = level
-        cat = queryUtility(ICatalog, name='students_catalog')
-        students = cat.searchResults(
-            current_session=(session, session),
-            current_level=(start_level, end_level),
-            certcode=(self.context.code, self.context.code)
-            )
-        hitlist = []
-        for student in students:
-            hitlist.append(StudentQueryResultItem(student, view=self))
-        return hitlist
-
-class FilterStudentsInCoursePage(FilterStudentsInDepartmentPage):
-    """Page that filters and lists students.
-    """
-    grok.context(ICourse)
-
-    def label(self):
-        return 'Students registered for %s ...' % self.context.longtitle()
-
-    def _searchCatalog(self, session, level):
-        if level not in (10, 999, None):
-            start_level = 100 * (level // 100)
-            end_level = start_level + 90
-        else:
-            start_level = end_level = level
-        cat = queryUtility(ICatalog, name='coursetickets_catalog')
-        coursetickets = cat.searchResults(
-            session=(session, session),
-            level=(start_level, end_level),
-            code=(self.context.code, self.context.code)
-            )
-        hitlist = []
-        for ticket in coursetickets:
-            # XXX: If students have registered the same courses twice
-            # they will be listed twice.
-            hitlist.append(StudentQueryResultItem(ticket.student, view=self))
-        return hitlist
-
 class DepartmentManageFormPage(KofaEditFormPage):
     """Manage the basic properties of a `Department` instance.

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

@@ -52 +52 @@
     FriendlyDatetimeDisplayWidget)
 from waeup.kofa.mandates.mandate import PasswordMandate
+from waeup.kofa.university.interfaces import (
+    IDepartment, ICertificate, ICourse)
 from waeup.kofa.university.department import (
     VirtualDepartmentExportJobContainer,)
@@ -67 +69 @@
     IBedTicket, IStudentsUtils, IStudentRequestPW
     )
-from waeup.kofa.students.catalog import search, StudentsQuery
+from waeup.kofa.students.catalog import search, StudentQueryResultItem
 from waeup.kofa.students.export import EXPORTER_NAMES
 from waeup.kofa.students.studylevel import StudentStudyLevel, CourseTicket
@@ -2503 +2505 @@
         return
 
+class FilterStudentsInDepartmentPage(KofaPage):
+    """Page that filters and lists students.
+    """
+    grok.context(IDepartment)
+    grok.require('waeup.showStudents')
+    grok.name('students')
+    grok.template('filterstudentspage')
+    pnav = 1
+    session_label = _('in session')
+    level_label = _('at level')
+
+    def label(self):
+        return 'Students in %s ...' % self.context.longtitle()
+
+    def _set_session_values(self):
+        vocab_terms = academic_sessions_vocab.by_value.values()
+        self.sessions = sorted(
+            [(x.title, x.token) for x in vocab_terms], reverse=True)
+        self.sessions += [('All Sessions', 'all')]
+        return
+
+    def _set_level_values(self):
+        vocab_terms = course_levels.by_value.values()
+        self.levels = sorted(
+            [(x.title, x.token) for x in vocab_terms])
+        self.levels += [('All Levels', 'all')]
+        return
+
+    def _searchCatalog(self, session, level):
+        if level not in (10, 999, None):
+            start_level = 100 * (level // 100)
+            end_level = start_level + 90
+        else:
+            start_level = end_level = level
+        cat = queryUtility(ICatalog, name='students_catalog')
+        students = cat.searchResults(
+            current_session=(session, session),
+            current_level=(start_level, end_level),
+            depcode=(self.context.code, self.context.code)
+            )
+        hitlist = []
+        for student in students:
+            hitlist.append(StudentQueryResultItem(student, view=self))
+        return hitlist
+
+    def update(self, SHOW=None, session=None, level=None):
+        datatable.need()
+        self.parent_url = self.url(self.context.__parent__)
+        self._set_session_values()
+        self._set_level_values()
+        self.hitlist = []
+        self.session_default = session
+        self.level_default = level
+        if SHOW is not None:
+            if session != 'all':
+                self.session = int(session)
+                self.session_string = '%s %s/%s' % (
+                    self.session_label, self.session, self.session+1)
+            else:
+                self.session = None
+                self.session_string = _('in any session')
+            if level != 'all':
+                self.level = int(level)
+                self.level_string = '%s %s' % (self.level_label, self.level)
+            else:
+                self.level = None
+                self.level_string = _('at any level')
+            self.hitlist = self._searchCatalog(self.session, self.level)
+            if not self.hitlist:
+                self.flash(_('No student found.'))
+        return
+
+class FilterStudentsInCertificatePage(FilterStudentsInDepartmentPage):
+    """Page that filters and lists students.
+    """
+    grok.context(ICertificate)
+
+    def label(self):
+        return 'Students studying %s ...' % self.context.longtitle()
+
+    def _searchCatalog(self, session, level):
+        if level not in (10, 999, None):
+            start_level = 100 * (level // 100)
+            end_level = start_level + 90
+        else:
+            start_level = end_level = level
+        cat = queryUtility(ICatalog, name='students_catalog')
+        students = cat.searchResults(
+            current_session=(session, session),
+            current_level=(start_level, end_level),
+            certcode=(self.context.code, self.context.code)
+            )
+        hitlist = []
+        for student in students:
+            hitlist.append(StudentQueryResultItem(student, view=self))
+        return hitlist
+
+class FilterStudentsInCoursePage(FilterStudentsInDepartmentPage):
+    """Page that filters and lists students.
+    """
+    grok.context(ICourse)
+
+    def label(self):
+        return 'Students registered for %s ...' % self.context.longtitle()
+
+    def _searchCatalog(self, session, level):
+        if level not in (10, 999, None):
+            start_level = 100 * (level // 100)
+            end_level = start_level + 90
+        else:
+            start_level = end_level = level
+        cat = queryUtility(ICatalog, name='coursetickets_catalog')
+        coursetickets = cat.searchResults(
+            session=(session, session),
+            level=(start_level, end_level),
+            code=(self.context.code, self.context.code)
+            )
+        hitlist = []
+        for ticket in coursetickets:
+            # XXX: If students have registered the same courses twice
+            # they will be listed twice.
+            hitlist.append(StudentQueryResultItem(ticket.student, view=self))
+        return hitlist
+
 class DepartmentExportJobContainerOverview(KofaPage):
     """Page that filters and lists students.