Changeset 9653

Timestamp:

17 Nov 2012, 07:15:04 (12 years ago)

Author:

Henrik Bettermann

Message:

It's not a report of a single student but a report of subsets of students.

Location:

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

Files:

• browser_templates/studentsreportgeneratorpage.pt (moved) (moved from main/waeup.kofa/trunk/src/waeup/kofa/students/browser_templates/studentreportgeneratorpage.pt)
• reports.py (modified) (8 diffs)
• tests/test_reports.py (modified) (2 diffs)

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

@@ -26 +26 @@
 from waeup.kofa.reports import IReport
 
-class IStudentReport(IReport):
+class IStudentsReport(IReport):
     pass
 
@@ -112 +112 @@
     ]
 
-@implementer(IStudentReport)
-class StudentReport(Report):
+@implementer(IStudentsReport)
+class StudentsReport(Report):
     data = None
     session = None
@@ -119 +119 @@
 
     def __init__(self, session, mode, author='System'):
-        super(StudentReport, self).__init__(
+        super(StudentsReport, self).__init__(
             args=[session, mode], kwargs={'author':author})
         self.session = academic_sessions_vocab.getTerm(session).title
@@ -127 +127 @@
 
     def __repr__(self):
-        return 'StudentReport (session=%s, mode=%s)' % (
+        return 'StudentsReport (session=%s, mode=%s)' % (
             self.session, self.mode)
 
@@ -152 +152 @@
 
 @implementer(IReportGenerator)
-class StudentReportGenerator(grok.GlobalUtility):
+class StudentsReportGenerator(grok.GlobalUtility):
 
     title = _('Students')
@@ -162 +162 @@
 
     def generate(self, site, session=None, mode=None, author=None):
-        result = StudentReport(session=session, mode=mode, author=author)
+        result = StudentsReport(session=session, mode=mode, author=author)
         return result
 
@@ -174 +174 @@
 from waeup.kofa.reports import get_generators
 grok.templatedir('browser_templates')
-class StudentReportGeneratorPage(KofaPage):
-
-    grok.context(StudentReportGenerator)
+class StudentsReportGeneratorPage(KofaPage):
+
+    grok.context(StudentsReportGenerator)
     grok.name('index.html')
     grok.require('waeup.manageReports')
@@ -219 +219 @@
         return
 
-class StudentReportPDFView(grok.View):
-
-    grok.context(IStudentReport)
+class StudentsReportPDFView(grok.View):
+
+    grok.context(IStudentsReport)
     grok.name('pdf')
     grok.require('waeup.Public')

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_reports.py

@@ -1 +1 @@
 # Tests for student related reports
 from waeup.kofa.students.reports import (
-    get_students_by, StudentReport)
+    get_students_by, StudentsReport)
 from waeup.kofa.students.tests.test_catalog import CatalogTestSetup
 from waeup.kofa.testing import FunctionalLayer
 
-class StudentReportTests(CatalogTestSetup):
+class StudentsReportTests(CatalogTestSetup):
 
     layer = FunctionalLayer
@@ -54 +54 @@
     def test_create_pdf(self):
         self.create_cert('FAC2', 'dept2', 'CERT2')
-        report = StudentReport(2010, 'Undergraduate Full-Time')
+        report = StudentsReport(2010, 'Undergraduate Full-Time')
         result = report.create_pdf()
         self.assertTrue(result.startswith('%PDF-'))