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

Make filters incremental.

parent 7f47f710
No related branches found
No related tags found
No related merge requests found
...@@ -20,18 +20,21 @@ from .util import current_week ...@@ -20,18 +20,21 @@ from .util import current_week
def timetable(request: HttpRequest) -> HttpResponse: def timetable(request: HttpRequest) -> HttpResponse:
context = {} context = {}
lesson_periods = LessonPeriod.objects.all() if request.GET:
lesson_periods = LessonPeriod.objects.all()
if 'group' in request.GET: # Incrementally filter lesson periods by GET parameters
lesson_periods = lesson_periods.filter( if 'group' in request.GET:
lesson__groups__pk=int(request.GET['group'])) lesson_periods = lesson_periods.filter(
elif 'teacher' in request.GET: lesson__groups__pk=int(request.GET['group']))
lesson_periods = lesson_periods.filter( if 'teacher' in request.GET:
lesson__teachers__pk=int(request.GET['teacher'])) lesson_periods = lesson_periods.filter(
elif 'room' in request.GET: lesson__teachers__pk=int(request.GET['teacher']))
lesson_periods = lesson_periods.filter( if 'room' in request.GET:
room__pk=int(request.GET['room'])) lesson_periods = lesson_periods.filter(
room__pk=int(request.GET['room']))
else: else:
# Redirect to a selected view if no filter provided
if request.user.person: if request.user.person:
if request.user.person.primary_group: if request.user.person.primary_group:
return redirect(reverse('timetable') + '?group=%d' % request.user.person.primary_group.pk) return redirect(reverse('timetable') + '?group=%d' % request.user.person.primary_group.pk)
......
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