Merge branch 'master' of https://gitlab.com/lilcity/backend into feature/LIL-523

apps/school/models.py

@@ -44,7 +44,7 @@ class SchoolSchedule(models.Model):
         return dict(self.WEEKDAY_CHOICES).get(self.weekday, '')
 
     def is_online(self):
-        end_at = datetime.combine(now().today(), self.start_at) + timedelta(hours=2)
+        end_at = datetime.combine(now().today(), self.start_at) + timedelta(hours=1)
         return self.start_at <= now().time() and end_at.time() >= now().time() and self.weekday == now().isoweekday()
 
     def current_live_lesson(self):
@@ -132,5 +132,5 @@ class LiveLesson(BaseModel, DeactivatedMixin):
             return False
         else:
             start_at = school_schedule.start_at
-            end_at = datetime.combine(now().today(), start_at) + timedelta(hours=2)
+            end_at = datetime.combine(now().today(), start_at) + timedelta(hours=1)
             return start_at <= now().time() and end_at.time() >= now().time()

apps/school/templates/blocks/_schedule_purchased_item.html

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

apps/school/templates/blocks/schedule_purchased.html

@@ -9,7 +9,6 @@
           <div class="casing__msg">Подписка истекает
             <span class="bold">{{ subscription_ends }}</span>
           </div>
-          {% include './prolong_btn.html' %}
           {% else %}
           <div class="casing__msg">Подписка
             <span class="bold">истекла</span>

apps/school/templates/school/livelesson_detail.html

@@ -10,7 +10,7 @@
       <div class="lesson__content">{{ livelesson.short_description }}</div>
       <a class="lesson__video video" href="#">
         {% if livelesson.stream_index %}
-        <iframe class="lesson__video_frame" src="https://player.vimeo.com/video/{{ livelesson.stream_index }}" frameborder="0" webkitallowfullscreen
+        <iframe class="lesson__video_frame" src="https://player.vimeo.com/video/{{ livelesson.stream_index }}?autoplay=1" frameborder="0" webkitallowfullscreen
           mozallowfullscreen allowfullscreen>
         </iframe>
         <a href="#" onclick="location.reload();">Если видео не загрузилось обновите страницу</a>

apps/school/templates/summer/_schedule_purchased_item.html

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

apps/school/templates/summer/schedule_purchased.html

@@ -9,7 +9,6 @@
           <div class="casing__msg">Подписка истекает
             <span class="bold">{{ subscription_ends }}</span>
           </div>
-          {% include './prolong_btn.html' %}
           {% else %}
           <div class="casing__msg">Подписка
             <span class="bold">истекла</span>

apps/school/views.py

@@ -61,26 +61,26 @@ class LiveLessonsDetailView(DetailView):
 
     def get(self, request, pk=None):
         response = super().get(request, pk=pk)
-        try:
-            school_payment = SchoolPayment.objects.get(
-                user=request.user,
-                add_days=False,
-                date_start__lte=now(),
-                date_end__gte=now(),
-                status__in=[
-                    Pingback.PINGBACK_TYPE_REGULAR,
-                    Pingback.PINGBACK_TYPE_GOODWILL,
-                    Pingback.PINGBACK_TYPE_RISK_REVIEWED_ACCEPTED,
-                ],
-            )
-        except SchoolPayment.DoesNotExist:
-            school_payment = None
-        if request.user.role not in [User.ADMIN_ROLE, User.TEACHER_ROLE] and not (
-            request.user.role == User.USER_ROLE and
-            school_payment and
-            school_payment.is_deliverable()
-        ):
-            raise Http404
+        #try:
+        #    school_payment = SchoolPayment.objects.get(
+        #        user=request.user,
+        #        add_days=False,
+        #        date_start__lte=now(),
+        #        date_end__gte=now(),
+        #        status__in=[
+        #            Pingback.PINGBACK_TYPE_REGULAR,
+        #            Pingback.PINGBACK_TYPE_GOODWILL,
+        #            Pingback.PINGBACK_TYPE_RISK_REVIEWED_ACCEPTED,
+        #        ],
+        #    )
+        #except SchoolPayment.DoesNotExist:
+        #    school_payment = None
+        #if request.user.role not in [User.ADMIN_ROLE, User.TEACHER_ROLE] and not (
+        #    request.user.role == User.USER_ROLE and
+        #    school_payment and
+        #    school_payment.is_deliverable()
+        #):
+        #    raise Http404
 
         return response
 
@@ -122,7 +122,7 @@ class SchoolView(TemplateView):
             end_at = datetime.combine(now_time.today(), school_schedule.start_at)
             online = (
                 school_schedule.start_at <= now_time.time() and
-                (end_at + timedelta(hours=2)).time() >= now_time.time() and
+                (end_at + timedelta(hours=1)).time() >= now_time.time() and
                 school_schedule.current_live_lesson()
             )
         if self.request.user.is_authenticated:
@@ -183,7 +183,7 @@ class SummerSchoolView(TemplateView):
             end_at = datetime.combine(now_time.today(), school_schedule.start_at)
             online = (
                 school_schedule.start_at <= now_time.time() and
-                (end_at + timedelta(hours=2)).time() >= now_time.time() and
+                (end_at + timedelta(hours=1)).time() >= now_time.time() and
                 school_schedule.current_live_lesson()
             )
         if self.request.user.is_authenticated:

project/templates/blocks/promo.html

@@ -12,9 +12,13 @@
       <span class="main__bold">Lil School</span> — первая образовательная онлайн-платформа креативного мышления для детей
     </div>
     <div class="main__subtitle">
-      Присоединяйтесь в Рисовальный лагерь
+      Урок <b>Рисовальный лагерь, Альбрехт Дюрер</b> завершен <br/>
+      Следующий урок пройдет 4 июля
     </div>
     <div class="main__actions">
+      {% if is_purchased %}
+        <a class="main__btn btn" href="/school/lessons/214">Перейти в урок</a>
+      {% else %}
       <a
         {% if not is_purchased_future %}
           {% if not user.is_authenticated %}
@@ -28,8 +32,8 @@
         >
         {% if not is_purchased and not is_purchased_future %}Получить доступ{% endif %}
         {% if is_purchased_future and not is_purchased %}ваша подписка начинается {{school_purchased_future.date_start}}{% endif %}
-        {% if is_purchased %}ваша подписка истекает {{ subscription_ends_humanize }}<br/>перейти к оплате{% endif %}
       </a>
+      {% endif %}
 
       <a class="main__btn btn btn_white" href="{% url 'school:summer-school' %}">О лагере</a>
     </div>

project/views.py

@@ -31,7 +31,7 @@ class IndexView(TemplateView):
             end_at = datetime.combine(now_time.today(), school_schedule.start_at)
             online = (
                 school_schedule.start_at <= now_time.time() and
-                (end_at + timedelta(hours=2)).time() >= now_time.time() and
+                (end_at + timedelta(hours=1)).time() >= now_time.time() and
                 school_schedule.current_live_lesson()
             )
         date_now = now_time.date()