Changeset 14048 for main/waeup.aaue/trunk/src

Timestamp:

3 Aug 2016, 09:07:57 (8 years ago)

Author:

Henrik Bettermann

Message:

Implement alternative get_courses method.

Location:

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

Files:

• raw_score_report.py (modified) (5 diffs)
• tests/test_raw_score_report.py (modified) (3 diffs)

main/waeup.aaue/trunk/src/waeup/aaue/students/reports/raw_score_report.py

@@ -40 +40 @@
     creation_dt_string = Attribute('Human readable report creation datetime')
 
-def get_courses(faccode, depcode, level):
-    """Get certificate courses of a certain department at a certain level.
+def get_courses_1(faccode, depcode, session, level):
+    """Method 1: Get certificate courses of a
+    certain department at a certain level.
     """
     site = grok.getSite()
@@ -50 +51 @@
             if certcourse.level == level:
                 course_codes.append(certcourse.getCourseCode())
+    return course_codes
+
+def get_courses_2(faccode, depcode, session, level):
+    """Method 2: Get all courses students of a certain
+    department have registered at a certain level.
+    """
+    cat = queryUtility(ICatalog, name="students_catalog")
+    result = cat.searchResults(
+        depcode = (depcode, depcode), faccode = (faccode, faccode)
+        )
+    course_codes = []
+    for stud in result:
+        if not stud['studycourse'].has_key(str(level)):
+            continue
+        level_obj = stud['studycourse'][str(level)]
+        if level_obj.level_session != session:
+            continue
+        for ticket in level_obj.values():
+            course_codes.append(ticket.code)
+    course_codes = sorted(list(set(course_codes)))
     return course_codes
 
@@ -104 +125 @@
     def draw(self):
         canvas = self.canv
-        canvas.rotate(45)
+        canvas.rotate(60)
         canvas.drawString( 0, -1, self.text)
 
@@ -121 +142 @@
     for code in course_codes:
         course = list(catalog.searchResults(code=(code, code)))[0]
-        col_names += (TTR('%s (%s)' % (course.title, code)),)
+        col_names += (TTR('%s - %s' % (code, course.title)),)
     table = [col_names]
     sn = 1
@@ -177 +198 @@
         self.creation_dt_string = self.creation_dt.astimezone(
             getUtility(IKofaUtils).tzinfo).strftime("%Y-%m-%d %H:%M:%S %Z")
-        self.course_codes = get_courses(faccode, depcode, level)
+        self.course_codes = get_courses_2(faccode, depcode, session, level)
         self.data = get_students(
             faccode, depcode, session, level, self.course_codes)

main/waeup.aaue/trunk/src/waeup/aaue/students/reports/tests/test_raw_score_report.py

@@ -10 +10 @@
 
 from waeup.aaue.students.reports.raw_score_report import (
-    get_students, get_courses, RawScoreReport, IRawScoreReport)
+    get_students, RawScoreReport, IRawScoreReport,
+    get_courses_2 as get_courses)
 from waeup.aaue.testing import FunctionalLayer
 
@@ -35 +36 @@
     def test_get_courses(self):
         # we can get a list with one course code
-        result = get_courses('fac1', 'dep1', 100)
+        result = get_courses('fac1', 'dep1', 2010, 100)
         self.assertEqual(result, [(u'Course1')])
         return
@@ -41 +42 @@
     def test_get_students(self):
         # we can get a table with one student
-        course_codes = get_courses('fac1', 'dep1', 100)
+        course_codes = get_courses('fac1', 'dep1', 2010, 100)
         result = get_students('fac1', 'dep1', 2010, 100, course_codes)
         self.assertEqual(result,