Fix previous live lessons

remotes/origin/hasaccess
Ivlev Denis 8 years ago
parent a76fa6dfa5
commit 91edbc59f5
  1. 2
      apps/school/templates/blocks/_schedule_purchased_item.html
  2. 7
      apps/school/views.py

@ -12,7 +12,7 @@
<div class="timing__buy"> <div class="timing__buy">
<div class="timing__time">{{ school_schedule.start_at }} (МСК)</div> <div class="timing__time">{{ school_schedule.start_at }} (МСК)</div>
{% if school_schedule.weekday in school_schedules_purchased %} {% if school_schedule.weekday in school_schedules_purchased %}
{% if live_lesson and school_schedule.is_online or live_lesson and is_previous %} {% if live_lesson and school_schedule.is_online or live_lesson and is_previous and live_lesson in live_lessons %}
{% include './open_lesson.html' %} {% include './open_lesson.html' %}
{% endif %} {% endif %}
{% else %} {% else %}

@ -105,15 +105,18 @@ class SchoolView(TemplateView):
school_payment_exists = False school_payment_exists = False
school_schedules_purchased = [] school_schedules_purchased = []
if school_payment_exists and is_previous: if school_payment_exists and is_previous:
live_lessons_exists = LiveLesson.objects.filter( live_lessons = LiveLesson.objects.filter(
date__gte=school_payment.last().date_start, date__gte=school_payment.last().date_start,
date__range=[(now_time - timedelta(days=8)).date(), (now_time - timedelta(days=1)).date()], date__range=[(now_time - timedelta(days=8)).date(), (now_time - timedelta(days=1)).date()],
deactivated_at__isnull=True, deactivated_at__isnull=True,
).exists() )
live_lessons_exists = live_lessons.exists()
else: else:
live_lessons = None
live_lessons_exists = False live_lessons_exists = False
context.update({ context.update({
'online': online, 'online': online,
'live_lessons': live_lessons,
'live_lessons_exists': live_lessons_exists, 'live_lessons_exists': live_lessons_exists,
'is_previous': is_previous, 'is_previous': is_previous,
'course_items': Course.objects.filter(status=Course.PUBLISHED)[:6], 'course_items': Course.objects.filter(status=Course.PUBLISHED)[:6],

Loading…
Cancel
Save