From a266ec6afcb389555aefd8c12796d753a46b06bf Mon Sep 17 00:00:00 2001 From: gzbender Date: Tue, 2 Oct 2018 18:22:47 +0500 Subject: [PATCH] =?UTF-8?q?LIL-683=20=D0=9A=D0=BB=D0=B8=D0=B5=D0=BD=D1=82?= =?UTF-8?q?=20=D0=B4=D0=BE=D0=BB=D0=B6=D0=B5=D0=BD=20=D0=B2=D0=B8=D0=B4?= =?UTF-8?q?=D0=B5=D1=82=D1=8C=20=D0=B7=D0=B0=D0=BF=D0=B8=D1=81=D0=B8=20?= =?UTF-8?q?=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=D0=B4=D0=BD=D0=B5=D0=B9=20=D0=BD?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BB=D0=B8=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5?= =?UTF-8?q?=20=D0=BE=D0=BA=D0=BE=D0=BD=D1=87=D0=B0=D0=BD=D0=B8=D1=8F=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=B4=D0=BF=D0=B8=D1=81=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/school/views.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/apps/school/views.py b/apps/school/views.py index 7158353f..6fbb1615 100644 --- a/apps/school/views.py +++ b/apps/school/views.py @@ -166,11 +166,11 @@ class SchoolView(TemplateView): school_schedules_purchased = [] school_purchased_future = False if is_previous: - prev_range = [yesterday - timedelta(days=7), yesterday] + prev_range = [yesterday - timedelta(days=7), date_now] live_lessons = [] # берем все подписки, которые были в периоде for sp in SchoolPayment.objects.filter( - date_start__lte=prev_range[1], + date_start__lt=prev_range[1], date_end__gte=prev_range[0], user=self.request.user, status__in=[ @@ -187,10 +187,12 @@ class SchoolView(TemplateView): date__week_day__in=list(map(lambda x: 1 if x == 7 else x+1, sp.weekdays)), ).values_list('id', flat=True) live_lessons = LiveLesson.objects.filter(id__in=set(live_lessons)).order_by('-date') - for ll in live_lessons: - ll.school_schedule = school_schedules_dict.get(ll.date.isoweekday()) live_lessons_exists = live_lessons.exists() - live_lessons = live_lessons or None + if live_lessons_exists: + for ll in live_lessons: + ll.school_schedule = school_schedules_dict.get(ll.date.isoweekday()) + else: + live_lessons = None context.update({ 'online': online,