From 82880ef0af448e50514d2f92405e831669538078 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Mon, 23 Apr 2018 22:13:58 +0300 Subject: [PATCH] Add stream to live lesson template --- apps/school/models.py | 22 +++++++++++++++---- .../templates/school/livelesson_detail.html | 10 ++++++--- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/apps/school/models.py b/apps/school/models.py index 2cba4dd4..e1b0d350 100644 --- a/apps/school/models.py +++ b/apps/school/models.py @@ -1,4 +1,4 @@ -from datetime import timedelta +from datetime import datetime, timedelta from django.db import models from django.utils.timezone import now @@ -120,10 +120,24 @@ class LiveLesson(BaseModel, DeactivatedMixin): created_at = models.DateTimeField(auto_now_add=True) update_at = models.DateTimeField(auto_now=True) - def __str__(self): - return self.title - class Meta: verbose_name = 'Урок онлайн школы' verbose_name_plural = 'Уроки онлайн школы' ordering = ('title',) + + def __str__(self): + return self.title + + def stream_index(self): + return self.stream.split('/')[-1] + + def is_online(self): + weekday = self.date.isoweekday() if self.date else None + try: + school_schedule = SchoolSchedule.objects.get(weekday=weekday) + except SchoolSchedule.DoesNotExist: + return False + else: + start_at = school_schedule.start_at + end_at = datetime.combine(now().today(), start_at) + timedelta(hours=2) + return start_at <= now().time() and end_at.time() >= now().time() diff --git a/apps/school/templates/school/livelesson_detail.html b/apps/school/templates/school/livelesson_detail.html index cd0c2011..03b667fc 100644 --- a/apps/school/templates/school/livelesson_detail.html +++ b/apps/school/templates/school/livelesson_detail.html @@ -9,14 +9,18 @@
{{ livelesson.title }}
{{ livelesson.short_description }}
+ {% if livelesson.is_online %} + + + {% else %} {% if livelesson.cover %} {% else %} {% endif %} - - - + {% endif %}