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

Merge branch '223-data-check-holiday-lessondocumentation' into 'master'

Fix LessonDocumentationOnHolidaysDataCheck

Closes #223

See merge request AlekSIS/official/AlekSIS-App-Alsijil!301
parents 5c8fe455 5519c82b
No related branches found
No related tags found
1 merge request!301Fix LessonDocumentationOnHolidaysDataCheck
Pipeline #86705 canceled
......@@ -14,6 +14,7 @@ Fixed
* Register absence form wasn't accessible without direct access to class register.
* Printing the full group register failed when a person had no personal notes.
* Data checks reported all Lesson Documentations as being during Holidays if there was no Holiday object.
`2.1`_ - 2022-06-25
-------------------
......
......@@ -113,7 +113,7 @@ class LessonDocumentationOnHolidaysDataCheck(DataCheck):
documentations = LessonDocumentation.objects.not_empty().annotate_date_range()
q = Q()
q = Q(pk__in=[])
for holiday in holidays:
q = q | Q(day_end__gte=holiday.date_start, day_start__lte=holiday.date_end)
documentations = documentations.filter(q)
......@@ -147,7 +147,7 @@ class PersonalNoteOnHolidaysDataCheck(DataCheck):
personal_notes = PersonalNote.objects.not_empty().annotate_date_range()
q = Q()
q = Q(pk__in=[])
for holiday in holidays:
q = q | Q(day_end__gte=holiday.date_start, day_start__lte=holiday.date_end)
personal_notes = personal_notes.filter(q)
......
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