Update school in user profile

remotes/origin/hasaccess
Ivlev Denis 8 years ago
parent b261ee692d
commit 436cb3ad86
  1. 2
      apps/school/templates/blocks/schedule_purchased.html
  2. 12
      apps/user/templates/user/profile.html
  3. 5
      apps/user/views.py

@ -19,6 +19,7 @@
</div>
</div>
<div class="casing__col">
{% if not profile %}
<div class="casing__head">
{% if is_previous %}
<div class="casing__title title">Запись уроков</div>
@ -32,6 +33,7 @@
</span>
</label>
</div>
{% endif %}
<div class="casing__timing timing js-timing">
<div class="timing__week">
{% if is_previous and not live_lessons_exists %}

@ -63,6 +63,7 @@
<div class="section__center center">
<div class="tabs js-tabs">
<div class="tabs__nav">
<button class="tabs__btn js-tabs-btn">ШКОЛА</button>
<button class="tabs__btn js-tabs-btn">ПРИОБРЕТЕННЫЕ
<span class="mobile-hide">КУРСЫ</span>
</button>
@ -71,9 +72,11 @@
<span class="mobile-hide">КУРСЫ</span>
</button>
{% endif %}
<button class="tabs__btn js-tabs-btn">ШКОЛА</button>
</div>
<div class="tabs__container">
<div class="tabs__item js-tabs-item">
{% include "blocks/schedule_purchased.html" %}
</div>
<div class="tabs__item js-tabs-item">
<div class="courses courses_scroll">
<div class="courses__list">
@ -90,13 +93,6 @@
</div>
</div>
{% endif %}
<div class="tabs__item js-tabs-item">
<div class="courses courses_scroll">
<div class="courses__list">
{% include "course/school.html" %}
</div>
</div>
</div>
</div>
</div>
</div>

@ -77,9 +77,12 @@ class UserView(DetailView):
school_schedules_purchased = school_payment.annotate(
joined_weekdays=Func(F('weekdays'), function='unnest',)
).values_list('joined_weekdays', flat=True).distinct()
context['school_schedules_purchased'] = school_schedules_purchased
context['school_payment'] = school_payment
context['is_purchased'] = school_payment.exists()
context['profile'] = True
if school_payment.exists() and school_payment.last().date_end:
context['school_days_left'] = (school_payment.last().date_end - now().date()).days
context['subscription_ends'] = school_payment.last().date_end
context['school_schedules'] = SchoolSchedule.objects.filter(
weekday__in=school_schedules_purchased if school_payment.exists() else [],
)

Loading…
Cancel
Save