remotes/origin/hotfix/LIL-661
gzbender 8 years ago
parent 4312b61e3b
commit 6e142ff693
  1. 2
      apps/school/views.py
  2. 4
      project/views.py

@ -130,7 +130,7 @@ class SchoolView(TemplateView):
online = ( online = (
school_schedule.start_at <= now_time.time() and school_schedule.start_at <= now_time.time() and
(end_at + timedelta(hours=1)).time() >= now_time.time() and (end_at + timedelta(hours=1)).time() >= now_time.time() and
school_schedule.current_live_lesson() school_schedule.current_live_lesson
) )
school_schedules = SchoolSchedule.objects.all() school_schedules = SchoolSchedule.objects.all()

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

Loading…
Cancel
Save