Changeset 10550

Timestamp:

28 Aug 2013, 09:43:00 (11 years ago)

Author:

Henrik Bettermann

Message:

Rename StudentsReport? to StudentStatisticsReport?.

Location:

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

Files:

• browser_templates/studentstatisticsreportgeneratorpage.pt (moved) (moved from main/waeup.kofa/trunk/src/waeup/kofa/students/reports/browser_templates/studentsreportgeneratorpage.pt)
• student_reports.py (modified) (7 diffs)
• tests/test_student_reports.py (modified) (6 diffs)

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

@@ -26 +26 @@
 from waeup.kofa.reports import IReport
 
-class IStudentsReport(IReport):
+class IStudentStatisticsReport(IReport):
 
     session = Attribute('Session to report')
@@ -118 +118 @@
     ]
 
-@implementer(IStudentsReport)
-class StudentsReport(Report):
+@implementer(IStudentStatisticsReport)
+class StudentStatisticsReport(Report):
     data = None
     session = None
@@ -125 +125 @@
 
     def __init__(self, session, mode, author='System'):
-        super(StudentsReport, self).__init__(
+        super(StudentStatisticsReport, self).__init__(
             args=[session, mode], kwargs={'author':author})
         self.session = academic_sessions_vocab.getTerm(session).title
@@ -150 +150 @@
 
 @implementer(IReportGenerator)
-class StudentsReportGenerator(grok.GlobalUtility):
+class StudentStatisticsReportGenerator(grok.GlobalUtility):
 
     title = _('Students')
@@ -156 +156 @@
 
     def generate(self, site, session=None, mode=None, author=None):
-        result = StudentsReport(session=session, mode=mode, author=author)
+        result = StudentStatisticsReport(session=session, mode=mode, author=author)
         return result
 
@@ -168 +168 @@
 from waeup.kofa.reports import get_generators
 grok.templatedir('browser_templates')
-class StudentsReportGeneratorPage(KofaPage):
-
-    grok.context(StudentsReportGenerator)
+class StudentStatisticsReportGeneratorPage(KofaPage):
+
+    grok.context(StudentStatisticsReportGenerator)
     grok.name('index.html')
     grok.require('waeup.manageReports')
@@ -215 +215 @@
         return
 
-class StudentsReportPDFView(grok.View):
-
-    grok.context(IStudentsReport)
+class StudentStatisticsReportPDFView(grok.View):
+
+    grok.context(IStudentStatisticsReport)
     grok.name('pdf')
     grok.require('waeup.Public')
 
     def render(self):
-        filename = 'StudentsReport_%s_%s_%s.pdf' % (
+        filename = 'StudentStatisticsReport_%s_%s_%s.pdf' % (
             self.context.session, self.context.mode,
             self.context.creation_dt_string)

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

@@ -5 +5 @@
 from zope.component import getUtility
 from waeup.kofa.interfaces import IJobManager
-from waeup.kofa.students.reports import (
-    get_students_by, StudentsReport, IStudentsReport)
+from waeup.kofa.students.reports.student_reports import (
+    get_students_by, StudentStatisticsReport, IStudentStatisticsReport)
 from waeup.kofa.students.tests.test_catalog import CatalogTestSetup
 from waeup.kofa.students.tests.test_browser import StudentsFullSetup
@@ -12 +12 @@
 from waeup.kofa.tests.test_async import FunctionalAsyncTestCase
 
-class StudentsReportTests(CatalogTestSetup):
+class StudentStatisticsReportTests(CatalogTestSetup):
 
     layer = FunctionalLayer
@@ -23 +23 @@
     def test_iface(self):
         # ensure we fullfill interface contracts
-        obj = StudentsReport(2010, 'Undergraduate Full-Time')
-        verifyClass(IStudentsReport, StudentsReport)
-        verifyObject(IStudentsReport, obj)
+        obj = StudentStatisticsReport(2010, 'Undergraduate Full-Time')
+        verifyClass(IStudentStatisticsReport, StudentStatisticsReport)
+        verifyObject(IStudentStatisticsReport, obj)
         return
 
@@ -69 +69 @@
     def test_create_pdf(self):
         self.create_cert('FAC2', 'dept2', 'CERT2')
-        report = StudentsReport(2010, 'Undergraduate Full-Time')
+        report = StudentStatisticsReport(2010, 'Undergraduate Full-Time')
         result = report.create_pdf()
         self.assertTrue(result.startswith('%PDF-'))
         return
 
-class StudentsReportUITests(StudentsFullSetup, FunctionalAsyncTestCase):
+class StudentStatisticsReportUITests(StudentsFullSetup, FunctionalAsyncTestCase):
 
     layer = FunctionalLayer
@@ -116 +116 @@
                          'application/pdf')
         self.assertTrue(
-            'filename="StudentsReport_2004_2005_All_' in
+            'filename="StudentStatisticsReport_2004_2005_All_' in
             self.browser.headers['content-disposition'])
         self.assertEqual(len(self.app['reports'].running_report_jobs), 1)
@@ -129 +129 @@
         logcontent = open(logfile).read()
         self.assertTrue(
-            'INFO - zope.mgr - students.reports.StudentsReportGeneratorPage - '
+            'INFO - zope.mgr - students.reports.student_reports.StudentStatisticsReportGeneratorPage - '
             'report %s created: Students (session=2004, mode=All)'
             % job_id in logcontent
             )
         self.assertTrue(
-            'INFO - zope.mgr - students.reports.StudentsReportPDFView - '
-            'report %s downloaded: StudentsReport_2004_2005_All_'
+            'INFO - zope.mgr - students.reports.student_reports.StudentStatisticsReportPDFView - '
+            'report %s downloaded: StudentStatisticsReport_2004_2005_All_'
             % job_id in logcontent
             )