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

Merge branch...

Merge branch '93-show-substitutions-extra-lessons-events-in-which-a-person-is-the-new-teacher-in-my-timetable' into 'master'

Resolve "Show extra lessons in which a person is the new teacher in "My timetable""

Closes #93

See merge request !91
parents 5c93c60f d4d87959
No related branches found
No related tags found
1 merge request!91Resolve "Show extra lessons in which a person is the new teacher in "My timetable""
Pipeline #3833 passed
......@@ -244,6 +244,10 @@ def build_timetable(
if period in lesson_periods_per_period and not holiday:
col += lesson_periods_per_period[period]
# Add extra lessons
if period in extra_lessons_per_period and not holiday:
col += extra_lessons_per_period[period]
# Add events
if period in events_per_period and not holiday:
col += events_per_period[period]
......
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