From dd546c648dd29ab6220d33eea39548f1a371c16b Mon Sep 17 00:00:00 2001 From: gzbender Date: Thu, 13 Dec 2018 00:26:48 +0500 Subject: [PATCH 1/3] =?UTF-8?q?LIL-720=20=D0=9E=D1=88=D0=B8=D0=B1=D0=BA?= =?UTF-8?q?=D0=B8=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=D0=B0=20=D1=81=D0=BF?= =?UTF-8?q?=D0=B8=D1=81=D0=BA=D0=B0=20=D0=B7=D0=B0=D0=BF=D0=B8=D1=81=D0=B5?= =?UTF-8?q?=D0=B9=20=D0=BD=D0=B0=20=D0=B5=D0=B4=D0=B8=D0=BD=D0=BE=D0=B9=20?= =?UTF-8?q?=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/school/views.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/apps/school/views.py b/apps/school/views.py index 71029683..29d38622 100644 --- a/apps/school/views.py +++ b/apps/school/views.py @@ -179,12 +179,12 @@ class SchoolView(TemplateView): # берем все подписки, которые были в периоде for sp in prev_school_payments: # берем все уроки в оплаченном промежутке - date_range = [max(sp.date_start, prev_range[0]), min(sp.date_end, prev_range[1])] - prev_live_lessons = LiveLesson.objects.filter( + date_range = [max(sp.date_start, prev_range[0]), min(sp.date_end, prev_range[1] - timedelta(days=1))] + prev_live_lessons += list(LiveLesson.objects.filter( date__range=date_range, deactivated_at__isnull=True, date__week_day__in=list(map(lambda x: 1 if x == 7 else x+1, sp.weekdays)), - ).values_list('id', flat=True) + ).values_list('id', flat=True)) prev_live_lessons = LiveLesson.objects.filter(id__in=set(prev_live_lessons)).order_by('-date') prev_live_lessons_exists = prev_live_lessons.exists() if prev_live_lessons_exists: @@ -192,8 +192,6 @@ class SchoolView(TemplateView): school_schedules_dict[0] = school_schedules_dict.get(7) for ll in prev_live_lessons: ll.school_schedule = school_schedules_dict.get(ll.date.isoweekday()) - else: - prev_live_lessons = [] context.update({ 'online': online, From 7f8cf6ebe97b684451ec1fb3d2246ed130f204c3 Mon Sep 17 00:00:00 2001 From: gzbender Date: Thu, 13 Dec 2018 00:50:41 +0500 Subject: [PATCH 2/3] LIL-720 --- 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 29d38622..b58869b5 100644 --- a/apps/school/views.py +++ b/apps/school/views.py @@ -137,7 +137,7 @@ class SchoolView(TemplateView): school_schedules_purchased = [] school_purchased_future = False prev_school_payments = None - prev_range = [date_now - timedelta(days=8), date_now] + prev_range = [date_now - timedelta(days=8), date_now - timedelta(days=1)] if self.request.user.is_authenticated: school_payment = SchoolPayment.objects.filter( user=self.request.user, @@ -165,7 +165,7 @@ class SchoolView(TemplateView): ).values_list('joined_weekdays', flat=True).distinct() prev_school_payments = SchoolPayment.objects.filter( - date_start__lt=prev_range[1], + date_start__lte=prev_range[1], date_end__gte=prev_range[0], user=self.request.user, status__in=[ @@ -179,7 +179,7 @@ class SchoolView(TemplateView): # берем все подписки, которые были в периоде for sp in prev_school_payments: # берем все уроки в оплаченном промежутке - date_range = [max(sp.date_start, prev_range[0]), min(sp.date_end, prev_range[1] - timedelta(days=1))] + date_range = [max(sp.date_start, prev_range[0]), min(sp.date_end, prev_range[1])] prev_live_lessons += list(LiveLesson.objects.filter( date__range=date_range, deactivated_at__isnull=True, From 63410790db16172b1d4ac7847c60613622550069 Mon Sep 17 00:00:00 2001 From: nikita Date: Thu, 13 Dec 2018 14:03:22 +0300 Subject: [PATCH 3/3] js cache reset --- project/templates/lilcity/edit_index.html | 2 +- project/templates/lilcity/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project/templates/lilcity/edit_index.html b/project/templates/lilcity/edit_index.html index 70691489..a88a7e84 100644 --- a/project/templates/lilcity/edit_index.html +++ b/project/templates/lilcity/edit_index.html @@ -321,7 +321,7 @@ var schoolAmountForDiscount = parseFloat({{ config.SERVICE_DISCOUNT_MIN_AMOUNT }}); {% block foot %}{% endblock foot %} - + diff --git a/project/templates/lilcity/index.html b/project/templates/lilcity/index.html index 6e994250..73fa1394 100644 --- a/project/templates/lilcity/index.html +++ b/project/templates/lilcity/index.html @@ -155,7 +155,7 @@ {% include 'templates/blocks/lil_store_js.html' %} {% block pre_app_js %}{% endblock pre_app_js %} - +