Add check previous live lessons exists

remotes/origin/hasaccess
Ivlev Denis 8 years ago
parent ea894d1120
commit a76fa6dfa5
  1. 4
      apps/school/templates/blocks/schedule_purchased.html
  2. 11
      apps/school/views.py

@ -33,6 +33,9 @@
</div> </div>
<div class="casing__timing timing js-timing"> <div class="casing__timing timing js-timing">
<div class="timing__week"> <div class="timing__week">
{% if is_previous and not live_lessons_exists %}
Записей уроков пока нет
{% else %}
{% for school_schedule in school_schedules %} {% for school_schedule in school_schedules %}
{% if is_previous %} {% if is_previous %}
{% include './_schedule_purchased_item.html' with school_schedule=school_schedule live_lesson=school_schedule.previous_live_lesson %} {% include './_schedule_purchased_item.html' with school_schedule=school_schedule live_lesson=school_schedule.previous_live_lesson %}
@ -40,6 +43,7 @@
{% include './_schedule_purchased_item.html' with school_schedule=school_schedule live_lesson=school_schedule.current_live_lesson %} {% include './_schedule_purchased_item.html' with school_schedule=school_schedule live_lesson=school_schedule.current_live_lesson %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% endif %}
</div> </div>
<div class="timing__week"> <div class="timing__week">
{% comment %} previous week schedules {% endcomment %} {% comment %} previous week schedules {% endcomment %}

@ -1,4 +1,4 @@
from datetime import datetime from datetime import datetime, timedelta
from django.contrib.auth import get_user_model from django.contrib.auth import get_user_model
from django.contrib.auth.decorators import login_required, user_passes_test from django.contrib.auth.decorators import login_required, user_passes_test
@ -104,8 +104,17 @@ class SchoolView(TemplateView):
else: else:
school_payment_exists = False school_payment_exists = False
school_schedules_purchased = [] school_schedules_purchased = []
if school_payment_exists and is_previous:
live_lessons_exists = LiveLesson.objects.filter(
date__gte=school_payment.last().date_start,
date__range=[(now_time - timedelta(days=8)).date(), (now_time - timedelta(days=1)).date()],
deactivated_at__isnull=True,
).exists()
else:
live_lessons_exists = False
context.update({ context.update({
'online': online, 'online': online,
'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],
'is_purchased': school_payment_exists, 'is_purchased': school_payment_exists,

Loading…
Cancel
Save