From a18a6922e0ef2ad2c1aed2740517cd27411f96b7 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Thu, 19 Apr 2018 13:07:51 +0300 Subject: [PATCH] Add previous_live_lesson getter to SchoolSchedule --- apps/school/models.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/apps/school/models.py b/apps/school/models.py index 83a08407..9285d203 100644 --- a/apps/school/models.py +++ b/apps/school/models.py @@ -1,3 +1,5 @@ +from datetime import timedelta + from django.db import models from django.utils.timezone import now @@ -59,14 +61,22 @@ class SchoolSchedule(models.Model): def current_live_lesson(self): now_time = now() - weekday = self.weekday live_lesson = LiveLesson.objects.filter( - date__week_day=weekday + 1 if weekday % 7 else 1, + date__week_day=self.weekday + 1 if self.weekday % 7 else 1, date__week=now_time.date().isocalendar()[1], deactivated_at__isnull=True, ).first() return live_lesson + def previous_live_lesson(self): + now_time = now() + live_lesson = LiveLesson.objects.filter( + date__week_day=self.weekday + 1 if self.weekday % 7 else 1, + date__week=(now_time.date() - timedelta(weeks=1)).isocalendar()[1], + deactivated_at__isnull=True, + ).first() + return live_lesson + class SchoolScheduleImage(models.Model): schoolschedule = models.ForeignKey(