Changeset 14629

Timestamp:

15 Mar 2017, 12:07:24 (8 years ago)

Author:

Henrik Bettermann

Message:

Use final level for detecting graduating students.

Location:

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

Files:

• level_report.py (modified) (2 diffs)
• tests/test_level_report.py (modified) (2 diffs)

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

@@ -77 +77 @@
         """
         """
-        if level_obj.remark not in (
+        final_level = max(level_obj.student['studycourse'].keys())
+        final_level_obj = level_obj.student['studycourse'][final_level]
+        if final_level_obj.remark not in (
             'Pass', '3s_rd_s', '2s_2_s', '2s_1_s', '1s_st_s'):
             return True
@@ -84 +86 @@
 class GradLevelReportGenerator(LevelReportGenerator):
 
-    title = 'Graduating Students Summary of Results'
+    title = 'Summary of Graduating Students Results'
     grok.name('grad_level_report')
 

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

@@ -10 +10 @@
 
 from waeup.aaue.students.reports.level_report import (
-    CustomLevelReport, GradLevelReport)
+    CustomLevelReport, GradLevelReport, IGradLevelReport)
 
 from waeup.aaue.testing import FunctionalLayer
@@ -53 +53 @@
     def test_iface(self):
         # ensure we fullfill interface contracts
-        obj = CustomLevelReport('fac1', 'dep1', 'CERT1', 2010, 100)
-        verifyClass(ILevelReport, GradLevelReport)
-        verifyObject(ILevelReport, obj)
+        obj = GradLevelReport('fac1', 'dep1', 'CERT1', 2010, 100)
+        verifyClass(IGradLevelReport, GradLevelReport)
+        verifyObject(IGradLevelReport, obj)
         return