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

Timestamp:

11 Oct 2021, 06:25:26 (3 years ago)

Author:

Henrik Bettermann

Message:

Filter out all students with extension levels (only if end_level has been selected) - part 2

Location:

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

Files:

• raw_score_report.py (modified) (1 diff)
• session_results_presentation.py (modified) (1 diff)

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

@@ -72 +72 @@
         final_level = max(level_obj.student['studycourse'].keys())
         # Filter out all students with extension levels.
-        if int(final_level) > level_obj.student['studycourse'].certificate.end_level:
-            return True
+        # Filter out all students with extension levels (only if end_level has been selected)
+        if level_obj.level == level_obj.student['studycourse'].certificate.end_level:
+            if int(final_level) > level_obj.student['studycourse'].certificate.end_level:
+                return True
         final_level_obj = level_obj.student['studycourse'][final_level]
         if final_level_obj.remark not in (

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

@@ -127 +127 @@
         """
         final_level = max(level_obj.student['studycourse'].keys())
-        # Filter out all students with extension levels.
-        if int(final_level) > level_obj.student['studycourse'].certificate.end_level:
-            return True
+        # Filter out all students with extension levels (only if end_level has been selected)
+        if level_obj.level == level_obj.student['studycourse'].certificate.end_level:
+            if int(final_level) > level_obj.student['studycourse'].certificate.end_level:
+                return True
         final_level_obj = level_obj.student['studycourse'][final_level]
         if final_level_obj.remark not in (