diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3a25f056..3d4ff10c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,8 +35,6 @@ deploy_review: - review only: - branches - except: - - master stop-review: stage: stop @@ -51,8 +49,6 @@ stop-review: when: manual only: - branches - except: - - master tags: - review @@ -66,7 +62,5 @@ prod-db: when: manual only: - branches - except: - - master tags: - review diff --git a/apps/school/models.py b/apps/school/models.py index ead3f30a..24ce0590 100644 --- a/apps/school/models.py +++ b/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() diff --git a/apps/school/templates/blocks/_schedule_purchased_item.html b/apps/school/templates/blocks/_schedule_purchased_item.html index 416a4f4f..b9d1db1f 100644 --- a/apps/school/templates/blocks/_schedule_purchased_item.html +++ b/apps/school/templates/blocks/_schedule_purchased_item.html @@ -6,15 +6,17 @@ {{ school_schedule }} {% if live_lesson %} - +