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

Timestamp:

1 Sep 2013, 08:11:34 (11 years ago)

Author:

Henrik Bettermann

Message:

Start implementation of 'Presentation of results to senate' report.

Location:

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

Files:

• level_report.py (modified) (4 diffs)
• level_results_presentation.py (added)
• tests/test_level_report.py (modified) (2 diffs)
• tests/test_level_results_presentation.py (added)
• tests/test_student_statistics.py (modified) (2 diffs)

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

@@ -1 +1 @@
 ## $Id$
 ##
-## Copyright (C) 2012 Uli Fouquet & Henrik Bettermann
+## Copyright (C) 2013 Uli Fouquet & Henrik Bettermann
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -35 +35 @@
     creation_dt_string = Attribute('Human readable report creation datetime')
 
-def get_students_by(faccode, depcode, session, level):
+def get_students(faccode, depcode, session, level):
     """Get students in a certain department who registered courses
     in a certain session at a certain level.
@@ -42 +42 @@
     """
     site = grok.getSite()
-    faccodes = tuple(sorted([x for x in site['faculties'].keys()],
-                             key=lambda x: x.lower()))
     cat = queryUtility(ICatalog, name="students_catalog")
     result = cat.searchResults(
@@ -142 +140 @@
         self.creation_dt_string = self.creation_dt.astimezone(
             getUtility(IKofaUtils).tzinfo).strftime("%Y-%m-%d %H:%M:%S %Z")
-        self.data = get_students_by(faccode, depcode, session, level)
+        self.data = get_students(faccode, depcode, session, level)
 
     def create_pdf(self):

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

@@ -5 +5 @@
 from waeup.kofa.interfaces import IJobManager
 from waeup.kofa.students.reports.level_report import (
-    get_students_by, LevelReport, ILevelReport)
+    get_students, LevelReport, ILevelReport)
 from waeup.kofa.students.tests.test_catalog import CatalogTestSetup
 from waeup.kofa.students.tests.test_browser import StudentsFullSetup
@@ -23 +23 @@
         return
 
-    def test_get_students_by(self):
+    def test_get_students(self):
         # we can get a table with one student
-        result = get_students_by('fac1', 'dep1', 2010, 100)
+        result = get_students('fac1', 'dep1', 2010, 100)
         self.assertEqual(result,
             [(u'K1000000', u'1234', u'Bob Tester', 30, 30, 5.0, [])])

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

@@ -29 +29 @@
         return
 
-    def test_get_student_stats_by_session_simple(self):
+    def test_get_student_stats_session_simple(self):
         # we can get a table with one student
         result1 = get_student_stats(2010, 'Undergraduate Full-Time')
@@ -47 +47 @@
         return
 
-    def test_get_student_stats_by_session_multiple(self):
+    def test_get_student_stats_session_multiple(self):
         # we can get a table with several students
         self.create_cert('fac2', 'dept2', 'CERT2')