Skip to content
Snippets Groups Projects
Commit 4ae705e6 authored by Jonathan Weth's avatar Jonathan Weth :keyboard: Committed by Nik | Klampfradler
Browse files

Resolve "[Full register printout] Events are also shown for days which are not...

Resolve "[Full register printout] Events are also shown for days which are not in the timetable schema"
parent 87c7f5e1
No related branches found
No related tags found
1 merge request!313Resolve "[Full register printout] Events are also shown for days which are not in the timetable schema"
...@@ -21,6 +21,7 @@ Fixed ...@@ -21,6 +21,7 @@ Fixed
* Extra marks and excused absences were counted multiple times in some class register views. * 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. * 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 `2.1.1`_ - 2022-09-01
--------------------- ---------------------
......
...@@ -87,6 +87,11 @@ def generate_full_register_printout(group: int, file_object: int, recorder: Prog ...@@ -87,6 +87,11 @@ def generate_full_register_printout(group: int, file_object: int, recorder: Prog
day = event.date_start + timedelta(days=i) day = event.date_start + timedelta(days=i)
event_copy = deepcopy(event) event_copy = deepcopy(event)
event_copy.annotate_day(day) 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( register_objects_by_day.setdefault(day, []).append(
( (
event_copy, event_copy,
......
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