From 0abe6f70587abb0faa68a6606e1c4d84b03ba292 Mon Sep 17 00:00:00 2001
From: Ivlev Denis <di-erz@yandex.ru>
Date: Thu, 19 Apr 2018 12:20:09 +0300
Subject: [PATCH] Add last courses block to school schedules template

---
 .../school/templates/blocks/last_courses.html | 21 +++++++++++++++++++
 .../templates/blocks/schedule_purchased.html  |  1 +
 apps/school/views.py                          |  6 ++++--
 3 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 apps/school/templates/blocks/last_courses.html

diff --git a/apps/school/templates/blocks/last_courses.html b/apps/school/templates/blocks/last_courses.html
new file mode 100644
index 00000000..158acd9c
--- /dev/null
+++ b/apps/school/templates/blocks/last_courses.html
@@ -0,0 +1,21 @@
+{% load static %} {% if course_items %}
+<div class="section section_courses">
+  <div class="section__center center">
+    <div class="text">
+      <p>Хотите ещё? :)
+        <br>Для Вас у нас есть дополнительные видео-курсы на самые душещипательные темы.</p>
+    </div>
+    <div class="head">
+      <div class="head__title title title_center">Видео-курсы</div>
+    </div>
+    <div class="courses">
+      <div class="courses__list">
+        {% include "course/course_items.html" %}
+      </div>
+      <div class="courses__load load">
+        <a class="load__btn btn" href="{% url 'courses' %}">Узнать подробнее</a>
+      </div>
+    </div>
+  </div>
+</div>
+{% endif %}
diff --git a/apps/school/templates/blocks/schedule_purchased.html b/apps/school/templates/blocks/schedule_purchased.html
index 8df3f0f6..0fbf018e 100644
--- a/apps/school/templates/blocks/schedule_purchased.html
+++ b/apps/school/templates/blocks/schedule_purchased.html
@@ -122,4 +122,5 @@
       </div>
     </div>
   </div>
+  {% include './last_courses.html' %}
 </div>
diff --git a/apps/school/views.py b/apps/school/views.py
index 68a2a50e..93e9493d 100644
--- a/apps/school/views.py
+++ b/apps/school/views.py
@@ -7,6 +7,7 @@ from django.utils.decorators import method_decorator
 from django.utils.timezone import now
 from django.views.generic import ListView, UpdateView, TemplateView, DetailView
 
+from apps.course.models import Course
 from apps.payment.models import SchoolPayment
 from .models import LiveLesson, SchoolSchedule
 
@@ -79,9 +80,10 @@ class SchoolView(TemplateView):
         school_payment = SchoolPayment.objects.filter(date_start__lte=date_now, date_end__gte=date_now)
         school_payment_exists = school_payment.exists()
         context.update({
-            'subscription_ends': school_payment.first().date_end if school_payment_exists else None,
+            'course_items': Course.objects.filter(status=Course.PUBLISHED)[:6],
             'is_purchased': school_payment_exists,
-            'school_schedules': SchoolSchedule.objects.all(),
             'min_school_price': SchoolSchedule.objects.aggregate(Min('month_price'))['month_price__min'],
+            'school_schedules': SchoolSchedule.objects.all(),
+            'subscription_ends': school_payment.first().date_end if school_payment_exists else None,
         })
         return context