Skip to content
Snippets Groups Projects
Commit 4628598d authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Merge branch '142-extra-marks-and-custom-excuses-potentially-counted-multiple-times' into 'master'

Resolve "Extra marks and custom excuses (potentially) counted multiple times"

Closes #142

See merge request !148
parents 23258aba 9dd38abe
No related branches found
No related tags found
1 merge request!148Resolve "Extra marks and custom excuses (potentially) counted multiple times"
Pipeline #6110 failed
......@@ -448,6 +448,7 @@ def generate_person_list_with_class_register_statistics(
extra_mark.count_label: Count(
"personal_notes",
filter=Q(personal_notes__extra_marks=extra_mark) & school_term_q & groups_q,
distinct=True,
)
}
)
......@@ -460,6 +461,7 @@ def generate_person_list_with_class_register_statistics(
filter=Q(personal_notes__absent=True, personal_notes__excuse_type=excuse_type,)
& school_term_q
& groups_q,
distinct=True,
)
}
)
......
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