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

Merge branch '240-custom-excuse-types-aren-t-counted-correctly-in' into 'prepare-release-3.0b0'

Resolve "Custom excuse types aren't counted correctly in generate_person_list_with_class_register_statistics"

See merge request AlekSIS/official/AlekSIS-App-Alsijil!326
parents 3990cdd3 71aad3cf
No related branches found
No related tags found
2 merge requests!326Resolve "Custom excuse types aren't counted correctly in generate_person_list_with_class_register_statistics",!323Prepare release 3.0b0
Pipeline #123948 failed
...@@ -15,6 +15,7 @@ Fixed ...@@ -15,6 +15,7 @@ Fixed
persons threw an error. persons threw an error.
* The redirection to generated class register PDF printouts did not work. * The redirection to generated class register PDF printouts did not work.
* Some columns in the table showing statistics for the members of a group were labled wrongly. * Some columns in the table showing statistics for the members of a group were labled wrongly.
* Absences with custom excuse types were not counted correctly.
`3.0b0`_ - 2022-02-28 `3.0b0`_ - 2022-02-28
--------------------- ---------------------
......
...@@ -482,7 +482,7 @@ def generate_person_list_with_class_register_statistics( ...@@ -482,7 +482,7 @@ def generate_person_list_with_class_register_statistics(
persons = persons.annotate( persons = persons.annotate(
**{ **{
excuse_type.count_label: Count( excuse_type.count_label: Count(
"filtered_personal_notes__absent", "filtered_personal_notes",
filter=Q( filter=Q(
filtered_personal_notes__absent=True, filtered_personal_notes__absent=True,
filtered_personal_notes__excuse_type=excuse_type, filtered_personal_notes__excuse_type=excuse_type,
......
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