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, 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 }}» -
-
- {% if not is_purchased %}Получить доступ{% else %}Смотреть урок{% endif %} -
- {% 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 not is_purchased %}Получить доступ{% else %}Смотреть урок{% endif %} -
+ {% if False and user.is_authenticated and online %} +
+ Сейчас идёт прямой эфир урока «{{ school_schedule.title }}, {{ school_schedule.current_live_lesson.title }}» +
+
+ {% if not is_purchased %}Получить доступ{% else %}Смотреть урок{% endif %} +
+ {% 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 }} +
+
+ {% if not is_purchased %}Получить доступ{% else %}Смотреть урок{% endif %} +
{% else %}
{# Присоединяйтесь в Рисовальный лагерь #}