diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 7680489d9c9af051329fee2a02f1576d037bd787..6e62cd43e7ab02e65aa4842396c554d629fc0aae 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -21,6 +21,7 @@ Fixed * Extra marks and excused absences were counted multiple times in some class register views. * Substitution teachers couldn't see any persons in the person list of a substituted lesson. +* Events were shown for days not being inside the timetable schema in full register printout. `2.1.1`_ - 2022-09-01 --------------------- diff --git a/aleksis/apps/alsijil/tasks.py b/aleksis/apps/alsijil/tasks.py index aa8de7b5a075b9a1ae37b129b1870482966577a5..7eaf8c01a5186ef08c12a5e4b19e9fc1e853d4d2 100644 --- a/aleksis/apps/alsijil/tasks.py +++ b/aleksis/apps/alsijil/tasks.py @@ -87,6 +87,11 @@ def generate_full_register_printout(group: int, file_object: int, recorder: Prog day = event.date_start + timedelta(days=i) event_copy = deepcopy(event) event_copy.annotate_day(day) + + # Skip event days if it isn't inside the timetable schema + if not (event_copy.raw_period_from_on_day and event_copy.raw_period_to_on_day): + continue + register_objects_by_day.setdefault(day, []).append( ( event_copy,