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

Timestamp:

2 Nov 2021, 13:03:05 (3 years ago)

Author:

Henrik Bettermann

Message:

Filter out students with extension levels higher than selected level

File:

• main/waeup.aaue/trunk/src/waeup/aaue/students/reports/level_report.py (modified) (1 diff)

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

@@ -75 +75 @@
 
     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'):