From 91edbc59f55dfb6ca9dacff1038710ddbb82afa1 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Mon, 30 Apr 2018 14:38:34 +0300 Subject: [PATCH] Fix previous live lessons --- apps/school/templates/blocks/_schedule_purchased_item.html | 2 +- apps/school/views.py | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/apps/school/templates/blocks/_schedule_purchased_item.html b/apps/school/templates/blocks/_schedule_purchased_item.html index 5d87320a..9c4ea4b1 100644 --- a/apps/school/templates/blocks/_schedule_purchased_item.html +++ b/apps/school/templates/blocks/_schedule_purchased_item.html @@ -12,7 +12,7 @@
{{ school_schedule.start_at }} (МСК)
{% if school_schedule.weekday in school_schedules_purchased %} - {% if live_lesson and school_schedule.is_online or live_lesson and is_previous %} + {% if live_lesson and school_schedule.is_online or live_lesson and is_previous and live_lesson in live_lessons %} {% include './open_lesson.html' %} {% endif %} {% else %} diff --git a/apps/school/views.py b/apps/school/views.py index 10886f6f..e921758e 100644 --- a/apps/school/views.py +++ b/apps/school/views.py @@ -105,15 +105,18 @@ class SchoolView(TemplateView): school_payment_exists = False school_schedules_purchased = [] if school_payment_exists and is_previous: - live_lessons_exists = LiveLesson.objects.filter( + live_lessons = LiveLesson.objects.filter( date__gte=school_payment.last().date_start, date__range=[(now_time - timedelta(days=8)).date(), (now_time - timedelta(days=1)).date()], deactivated_at__isnull=True, - ).exists() + ) + live_lessons_exists = live_lessons.exists() else: + live_lessons = None live_lessons_exists = False context.update({ 'online': online, + 'live_lessons': live_lessons, 'live_lessons_exists': live_lessons_exists, 'is_previous': is_previous, 'course_items': Course.objects.filter(status=Course.PUBLISHED)[:6],