Changeset 16693 for main

Timestamp:

2 Nov 2021, 17:21:20 (3 years ago)

Author:

Henrik Bettermann

Message:

... same for other graduation reports

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

@@ -68 +68 @@
 
     def _excluded(self, level_obj):
-        """
-        """
-        final_level = max(level_obj.student['studycourse'].keys())
-        # Filter out all students with extension levels.
-        # 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 (
+        # Do not list student if selecetd level is not final or an extension
+        if level_obj.level < level_obj.student['studycourse'].certificate.end_level:
+            return True
+        # Filter out students with extension levels higher than selected level
+        final_level = int(max(level_obj.student['studycourse'].keys()))
+        if final_level > level_obj.level:
+            return True
+        if level_obj.remark not in (
             'Pass', '3s_rd_s', '2s_2_s', '2s_1_s', '1s_st_s'):
             return True

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

@@ -124 +124 @@
 
     def _excluded(self, level_obj):
-        """
-        """
-        final_level = max(level_obj.student['studycourse'].keys())
-        # 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 (
+        # Do not list student if selecetd level is not final or an extension
+        if level_obj.level < level_obj.student['studycourse'].certificate.end_level:
+            return True
+        # Filter out students with extension levels higher than selected level
+        final_level = int(max(level_obj.student['studycourse'].keys()))
+        if final_level > level_obj.level:
+            return True
+        if level_obj.remark not in (
             'Pass', '3s_rd_s', '2s_2_s', '2s_1_s', '1s_st_s',
             'Merit', 'Credit', 'Distinction'):