From bdda452a04217eef76526e869b3e5feaec4b413a Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Mon, 30 Apr 2018 12:00:01 +0300 Subject: [PATCH] Fix schedules order --- apps/school/views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/school/views.py b/apps/school/views.py index 22942053..ce25f018 100644 --- a/apps/school/views.py +++ b/apps/school/views.py @@ -96,8 +96,8 @@ class SchoolView(TemplateView): 'is_purchased': school_payment_exists, 'min_school_price': SchoolSchedule.objects.aggregate(Min('month_price'))['month_price__min'], 'school_schedules': SchoolSchedule.objects.annotate( - width=date_now.weekday()-F('weekday') % 7, - ).order_by('-width'), + width=(F('weekday') - date_now.isoweekday()) % 7, + ).order_by('width'), 'school_schedules_purchased': school_schedules_purchased, 'subscription_ends': school_payment.filter(add_days=False).first().date_end if school_payment_exists else None, })