Skip to content
Snippets Groups Projects
Verified Commit 723361a3 authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Add some explanatory comments

parent 6a62f1af
No related branches found
No related tags found
1 merge request!120Resolve "Support events and extra lessons in class register"
Pipeline #6049 passed
...@@ -385,6 +385,9 @@ def generate_person_list_with_class_register_statistics( ...@@ -385,6 +385,9 @@ def generate_person_list_with_class_register_statistics(
"""Get with class register statistics annotated list of all members.""" """Get with class register statistics annotated list of all members."""
if persons is None: if persons is None:
persons = self.members.all() persons = self.members.all()
# Build reusable Q objects for filtering by school term and by groups
# Necessary for the following annotations
school_term_q = ( school_term_q = (
Q(personal_notes__lesson_period__lesson__validity__school_term=self.school_term) Q(personal_notes__lesson_period__lesson__validity__school_term=self.school_term)
| Q(personal_notes__extra_lesson__school_term=self.school_term) | Q(personal_notes__extra_lesson__school_term=self.school_term)
......
...@@ -89,7 +89,10 @@ def annotate_documentations( ...@@ -89,7 +89,10 @@ def annotate_documentations(
def register_objects_sorter(register_object: Union[LessonPeriod, Event, ExtraLesson]) -> int: def register_objects_sorter(register_object: Union[LessonPeriod, Event, ExtraLesson]) -> int:
"""Sort key for sorted/sort for sorting a list of class register objects.""" """Sort key for sorted/sort for sorting a list of class register objects.
This will sort the objects by the start period.
"""
if hasattr(register_object, "period"): if hasattr(register_object, "period"):
return register_object.period.period return register_object.period.period
elif isinstance(register_object, Event): elif isinstance(register_object, Event):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment