Fix current_live_lesson & previous_live_lesson in SchoolSchedule

remotes/origin/hasaccess
Ivlev Denis 8 years ago
parent 56694b9291
commit 749b90acf8
  1. 4
      apps/school/models.py

@ -50,7 +50,7 @@ class SchoolSchedule(models.Model):
now_time = now()
live_lesson = LiveLesson.objects.filter(
date__week_day=self.weekday % 7 + 1,
date__week=now_time.date().isocalendar()[1],
date__range=[now_time.date(), (now_time + timedelta(days=7)).date()],
deactivated_at__isnull=True,
).first()
return live_lesson
@ -59,7 +59,7 @@ class SchoolSchedule(models.Model):
now_time = now()
live_lesson = LiveLesson.objects.filter(
date__week_day=self.weekday % 7 + 1,
date__week=(now_time.date() - timedelta(weeks=1)).isocalendar()[1],
date__range=[(now_time - timedelta(days=7)).date(), now_time.date()],
deactivated_at__isnull=True,
).first()
return live_lesson

Loading…
Cancel
Save