From a9df90013aa7330fc2917517f8859f35dc950ebb Mon Sep 17 00:00:00 2001
From: Dominik George <dominik.george@teckids.org>
Date: Wed, 21 Aug 2019 22:20:56 +0200
Subject: [PATCH] Determine lesson period for lesson view. Advances #1.
---
.../alsijil/templates/alsijil/lesson.html | 0
biscuit/apps/alsijil/urls.py | 2 ++
biscuit/apps/alsijil/views.py | 20 +++++++++++++++++--
3 files changed, 20 insertions(+), 2 deletions(-)
create mode 100644 biscuit/apps/alsijil/templates/alsijil/lesson.html
diff --git a/biscuit/apps/alsijil/templates/alsijil/lesson.html b/biscuit/apps/alsijil/templates/alsijil/lesson.html
new file mode 100644
index 000000000..e69de29bb
diff --git a/biscuit/apps/alsijil/urls.py b/biscuit/apps/alsijil/urls.py
index 1f5cbaf1e..28c8688df 100644
--- a/biscuit/apps/alsijil/urls.py
+++ b/biscuit/apps/alsijil/urls.py
@@ -5,4 +5,6 @@ from . import views
urlpatterns = [
path('lesson', views.lesson, name='lesson'),
+ path('lesson/<int:week>/<int:period_id>', views.lesson,
+ name='lesson_by_week_and_period'),
]
diff --git a/biscuit/apps/alsijil/views.py b/biscuit/apps/alsijil/views.py
index 3e8d14795..97c5dd82a 100644
--- a/biscuit/apps/alsijil/views.py
+++ b/biscuit/apps/alsijil/views.py
@@ -2,7 +2,23 @@ from django.contrib.auth.decorators import login_required
from django.shortcuts import render
from django.utils.translation import gettext_lazy as _
+from biscuit.apps.chronos.models import LessonPeriod
+from biscuit.apps.chronos.util import current_lesson_periods, current_week
+
@login_required
-def lesson(request):
- pass
+def lesson(request, week=None, period_id=None):
+ context = {}
+
+ if week and period_id:
+ lesson_period = LessonPeriod.objects.get(pk=period_id)
+ wanted_week = week
+ else:
+ lesson_period = current_lesson_periods().filter(
+ lesson__teachers=request.user.person).first()
+ wanted_week = current_week()
+
+ context['lesson_period'] = lesson_period
+ context['week'] = wanted_week
+
+ return render(request, 'alsijil/lesson.html', context)
--
GitLab