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

Timestamp:

22 Feb 2017, 11:20:40 (8 years ago)

Author:

Henrik Bettermann

Message:

Exclude graduated students from LevelReport, SessionResultsPresentation
and RawScoreReport.

Location:

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

Files:

• level_report.py (modified) (2 diffs)
• raw_score_report.py (modified) (2 diffs)
• session_results_presentation.py (modified) (2 diffs)

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

@@ -23 +23 @@
 from zope.interface import implementer, Interface, Attribute
 from waeup.kofa.interfaces import (
-    IKofaUtils,
+    IKofaUtils, GRADUATED,
     academic_sessions_vocab, registration_states_vocab)
 from waeup.kofa.interfaces import MessageFactory as _
@@ -59 +59 @@
     for stud in result:
         if not stud['studycourse'].has_key(str(level)):
+            continue
+        if stud.state == GRADUATED:
             continue
         level_obj = stud['studycourse'][str(level)]

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

@@ -23 +23 @@
 from zope.interface import implementer, Interface, Attribute
 from waeup.kofa.interfaces import (
-    IKofaUtils,
+    IKofaUtils, GRADUATED,
     academic_sessions_vocab, registration_states_vocab)
 from waeup.kofa.interfaces import MessageFactory as _
@@ -77 +77 @@
     for stud in result:
         if not stud['studycourse'].has_key(str(level)):
+            continue
+        if stud.state == GRADUATED:
             continue
         level_obj = stud['studycourse'][str(level)]

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

@@ -22 +22 @@
 from zope.interface import implementer, Interface, Attribute
 from waeup.kofa.interfaces import (
-    IKofaUtils,
+    IKofaUtils, GRADUATED,
     academic_sessions_vocab, registration_states_vocab)
 from waeup.kofa.students.vocabularies import StudyLevelSource
@@ -61 +61 @@
         table.append([])
     for stud in result:
+        if stud.state == GRADUATED:
+            continue
         line = (stud.student_id,
                 stud.matric_number,