Changeset 10559

Timestamp:

29 Aug 2013, 12:35:42 (11 years ago)

Author:

Henrik Bettermann

Message:

Rename students_by to student_statistics

Location:

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

Files:

• student_statistics.py (modified) (3 diffs)
• tests/test_student_statistics.py (modified) (5 diffs)

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

@@ -32 +32 @@
     creation_dt_string = Attribute('Human readable report creation datetime')
 
-def get_students_by(session, mode):
+def get_student_stats(session, mode):
     """Get students in a certain session and study mode.
 
@@ -133 +133 @@
         self.creation_dt_string = self.creation_dt.astimezone(
             getUtility(IKofaUtils).tzinfo).strftime("%Y-%m-%d %H:%M:%S %Z")
-        self.data = get_students_by(session, mode)
+        self.data = get_student_stats(session, mode)
 
     def create_pdf(self):
@@ -154 +154 @@
 class StudentStatisticsReportGenerator(grok.GlobalUtility):
 
-    title = _('Students Statistics')
-    grok.name('students_stats')
+    title = _('Student Statistics')
+    grok.name('student_stats')
 
     def generate(self, site, session=None, mode=None, author=None):

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

@@ -6 +6 @@
 from waeup.kofa.interfaces import IJobManager
 from waeup.kofa.students.reports.student_statistics import (
-    get_students_by, StudentStatisticsReport, IStudentStatisticsReport)
+    get_student_stats, StudentStatisticsReport, IStudentStatisticsReport)
 from waeup.kofa.students.tests.test_catalog import CatalogTestSetup
 from waeup.kofa.students.tests.test_browser import StudentsFullSetup
@@ -29 +29 @@
         return
 
-    def test_get_students_by_session_simple(self):
+    def test_get_student_stats_by_session_simple(self):
         # we can get a table with one student
-        result1 = get_students_by(2010, 'Undergraduate Full-Time')
-        result2 = get_students_by(2009, 'Undergraduate Full-Time')
+        result1 = get_student_stats(2010, 'Undergraduate Full-Time')
+        result2 = get_student_stats(2009, 'Undergraduate Full-Time')
         self.assertEqual(
             result1,
@@ -47 +47 @@
         return
 
-    def test_get_students_by_session_multiple(self):
+    def test_get_student_stats_by_session_multiple(self):
         # we can get a table with several students
         self.create_cert('fac2', 'dept2', 'CERT2')
-        result1 = get_students_by(2010, 'Undergraduate Full-Time')
-        result2 = get_students_by(2009, 'Undergraduate Full-Time')
+        result1 = get_student_stats(2010, 'Undergraduate Full-Time')
+        result2 = get_student_stats(2009, 'Undergraduate Full-Time')
         self.assertEqual(
             result1,
@@ -102 +102 @@
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.browser.getLink("Create new report").click()
-        self.browser.getControl(name="generator").value = ['students_by']
+        self.browser.getControl(name="generator").value = ['student_stats']
         self.browser.getControl("Configure").click()
         self.browser.getControl(name="mode").value = ['All']
@@ -134 +134 @@
         self.assertTrue(
             'INFO - zope.mgr - students.reports.student_statistics.StudentStatisticsReportGeneratorPage - '
-            'report %s created: Students (session=2004, mode=All)'
+            'report %s created: Student Statistics (session=2004, mode=All)'
             % job_id in logcontent
             )