From 847a6492adc65caaad26d439e42ee58788573547 Mon Sep 17 00:00:00 2001 From: gzbender Date: Fri, 31 May 2019 13:05:27 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B5=D0=BB=D1=8C=D0=B7=D1=8F=20=D0=B1?= =?UTF-8?q?=D1=8B=D0=BB=D0=BE=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D1=82?= =?UTF-8?q?=D1=8C=20=D1=83=D1=80=D0=BE=D0=BA=20=D0=BD=D0=B0=20=D0=B4=D0=B0?= =?UTF-8?q?=D1=82=D1=83=20=D0=BE=D0=BA=D0=BE=D0=BD=D1=87=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=20=D1=88=D0=BA=D0=BE=D0=BB=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/school/views.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/school/views.py b/apps/school/views.py index 37a63dc2..212d3c84 100644 --- a/apps/school/views.py +++ b/apps/school/views.py @@ -38,12 +38,12 @@ class LiveLessonsView(ListView): def get_queryset(self): date_start = (now() - timedelta(days=7)).date() - date_start, date_end = SchoolPayment.get_date_range(date_start, days=17, is_camp=False) + date_start, date_end = SchoolPayment.get_date_range(date_start, days=16, is_camp=False) date_range = Q( date__range=[date_start, date_end] ) exist_dates = LiveLesson.objects.filter(date_range, is_camp=False).values_list('date', flat=True) - for i in range((date_end - date_start).days): + for i in range((date_end - date_start).days + 1): d = date_start + timedelta(days=i) if d not in exist_dates: try: @@ -74,7 +74,7 @@ class DrawingCampLessonsView(ListView): date__range=[date_start, date_end] ) exist_dates = LiveLesson.objects.filter(date_range, is_camp=True).values_list('date', flat=True) - for i in range((date_end - date_start).days): + for i in range((date_end - date_start).days + 1): d = date_start + timedelta(days=i) if d.isoweekday() in DrawingCampPayment.WEEKDAYS and d not in exist_dates: try: