Changeset 10017

Timestamp:

12 Mar 2013, 09:24:07 (12 years ago)

Author:

Henrik Bettermann

Message:

Filter course tickets correctly.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/students/export.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/students/export.py

@@ -62 +62 @@
     """Get course tickets of `students`.
 
-    If code is passed through filter course tickets
-    which belong to this course code.
+    If code is passed through, filter course tickets
+    which belong to this course code and meets level
+    and level_session.
     """
     tickets = []
     code = kw.get('code', None)
+    level = kw.get('level', None)
+    level_session = kw.get('level_session', None)
     if code is None:
-        for level in get_levels(students):
-            for ticket in level.values():
+        for level_obj in get_levels(students):
+            for ticket in level_obj.values():
                 tickets.append(ticket)
     else:
-        for level in get_levels(students):
-            for ticket in level.values():
-                if ticket.code == code:
-                    tickets.append(ticket)
+        for level_obj in get_levels(students):
+            for ticket in level_obj.values():
+                if ticket.code != code:
+                    continue
+                if level is not None and int(level) != level_obj.level:
+                    continue
+                if level_session is not None and \
+                    int(level_session) != level_obj.level_session:
+                    continue
+                tickets.append(ticket)
     return tickets