From 20c041abc3a1474202accc6bb47dfc636d08c6c2 Mon Sep 17 00:00:00 2001 From: gzbender Date: Tue, 31 Jul 2018 23:43:39 +0500 Subject: [PATCH 1/3] Fix LIL-603 --- apps/user/templates/user/profile.html | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/apps/user/templates/user/profile.html b/apps/user/templates/user/profile.html index 6b0f0b07..e1deb25b 100644 --- a/apps/user/templates/user/profile.html +++ b/apps/user/templates/user/profile.html @@ -67,8 +67,8 @@
{% if owner %} - - #} + {% endif %} @@ -78,6 +78,7 @@
{% if owner %} + {% comment %}
{% if is_purchased_future %}
@@ -108,7 +109,8 @@ {% endif %} {% endif %}
-
+ {% endcomment %} +
{% if paid.exists %} From f9b4308bf53f88fc1dded45f3e9ebf92430ebcb4 Mon Sep 17 00:00:00 2001 From: gzbender Date: Wed, 1 Aug 2018 03:37:35 +0500 Subject: [PATCH 2/3] Fix LIL-603 --- apps/school/views.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/school/views.py b/apps/school/views.py index ec7f9233..3f269067 100644 --- a/apps/school/views.py +++ b/apps/school/views.py @@ -181,7 +181,8 @@ class SummerSchoolView(TemplateView): is_previous = 'is_previous' in self.request.GET date_now = now().date() yesterday = date_now - timedelta(days=1) - month_start = date_now.replace(day=1) + # month_start = date_now.replace(day=1) + month_start = datetime(2018, 7, 1).date() now_time = now() try: school_schedule = SchoolSchedule.objects.get(weekday=now_time.isoweekday()) @@ -211,7 +212,7 @@ class SummerSchoolView(TemplateView): ).annotate( joined_weekdays=Func(F('weekdays'), function='unnest',) ).distinct().values_list('joined_weekdays', flat=True) - all_schedules_purchased = map(lambda x: 1 if x == 7 else x+1, all_schedules_purchased) + all_schedules_purchased = list(map(lambda x: 1 if x == 7 else x+1, all_schedules_purchased)) school_payment = SchoolPayment.objects.filter( user=self.request.user, From f90bc9d8eda5ac1d87ca351a84d4fedffd4622a9 Mon Sep 17 00:00:00 2001 From: nikita Date: Wed, 1 Aug 2018 08:37:15 +0300 Subject: [PATCH 3/3] Promo off --- project/templates/blocks/promo.html | 66 ++++++++++++++--------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/project/templates/blocks/promo.html b/project/templates/blocks/promo.html index 43ce8075..e05a1e88 100644 --- a/project/templates/blocks/promo.html +++ b/project/templates/blocks/promo.html @@ -11,39 +11,39 @@
Lil School — первая образовательная онлайн-платформа креативного мышления для детей
- {% if user.is_authenticated and online %} -
- Сейчас идёт прямой эфир урока «{{ school_schedule.title }}, {{ school_schedule.current_live_lesson.title }}» -
- - {% elif user.is_authenticated and online_coming_soon and school_schedule and school_schedule.start_at_humanize %} -
- Урок «{{ school_schedule.title }}, {{ school_schedule.current_live_lesson.title }}» начнётся -
-
- {{ school_schedule.start_at_humanize }} -
- + {% if False and user.is_authenticated and online %} +
+ Сейчас идёт прямой эфир урока «{{ school_schedule.title }}, {{ school_schedule.current_live_lesson.title }}» +
+ + {% elif False and user.is_authenticated and online_coming_soon and school_schedule and school_schedule.start_at_humanize %} +
+ Урок «{{ school_schedule.title }}, {{ school_schedule.current_live_lesson.title }}» начнётся +
+
+ {{ school_schedule.start_at_humanize }} +
+ {% else %}
{# Присоединяйтесь в Рисовальный лагерь #}