From d047409fce7739921c27e7179091109213bc9656 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Thu, 10 May 2018 18:51:58 +0300 Subject: [PATCH] Fix school current day in profile --- apps/user/views.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/user/views.py b/apps/user/views.py index e98ee454..8bdc6824 100644 --- a/apps/user/views.py +++ b/apps/user/views.py @@ -85,7 +85,10 @@ class UserView(DetailView): context['subscription_ends'] = school_payment.last().date_end context['school_schedules'] = SchoolSchedule.objects.filter( weekday__in=school_schedules_purchased if school_payment.exists() else [], - ) + ).annotate( + calk=F('weekday') - now().isoweekday(), + weight=(7 + F('calk') % 7) % 7, + ).order_by('weight') return context