From 8591295bb3ff1fba4d8860907f7590794f60982b Mon Sep 17 00:00:00 2001
From: Dominik George <nik@naturalnet.de>
Date: Sat, 7 Sep 2019 21:46:14 +0200
Subject: [PATCH] Also find substitution lessons for teacher timetable. Closes
#17.
---
biscuit/apps/chronos/views.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/biscuit/apps/chronos/views.py b/biscuit/apps/chronos/views.py
index fe6cc442..62d06b97 100644
--- a/biscuit/apps/chronos/views.py
+++ b/biscuit/apps/chronos/views.py
@@ -46,7 +46,7 @@ def timetable(request: HttpRequest, week: Optional[int] = None) -> HttpResponse:
Q(lesson__groups__pk=int(request.GET['group'])) | Q(lesson__groups__parent_groups__pk=int(request.GET['group'])))
if 'teacher' in request.GET and request.GET['teacher']:
lesson_periods = lesson_periods.filter(
- lesson__teachers__pk=int(request.GET['teacher']))
+ Q(substitutions__teachers__pk=int(request.GET['teacher']), substitutions__week=wanted_week) | Q(lesson__teachers__pk=int(request.GET['teacher'])))
if 'room' in request.GET and request.GET['room']:
lesson_periods = lesson_periods.filter(
room__pk=int(request.GET['room']))
--
GitLab