From 749b90acf82f2e60068ee288631bd859736ab8af Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Sun, 29 Apr 2018 19:05:10 +0300 Subject: [PATCH] Fix current_live_lesson & previous_live_lesson in SchoolSchedule --- apps/school/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/school/models.py b/apps/school/models.py index 1899f27d..3bb50c31 100644 --- a/apps/school/models.py +++ b/apps/school/models.py @@ -50,7 +50,7 @@ class SchoolSchedule(models.Model): now_time = now() live_lesson = LiveLesson.objects.filter( date__week_day=self.weekday % 7 + 1, - date__week=now_time.date().isocalendar()[1], + date__range=[now_time.date(), (now_time + timedelta(days=7)).date()], deactivated_at__isnull=True, ).first() return live_lesson @@ -59,7 +59,7 @@ class SchoolSchedule(models.Model): now_time = now() live_lesson = LiveLesson.objects.filter( date__week_day=self.weekday % 7 + 1, - date__week=(now_time.date() - timedelta(weeks=1)).isocalendar()[1], + date__range=[(now_time - timedelta(days=7)).date(), now_time.date()], deactivated_at__isnull=True, ).first() return live_lesson