From dc27dab7a1ec5354df1168cff03fb638eaa660d5 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Thu, 3 May 2018 18:22:07 +0300 Subject: [PATCH] Fix school view --- apps/school/views.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/apps/school/views.py b/apps/school/views.py index e921758e..ecb5d74e 100644 --- a/apps/school/views.py +++ b/apps/school/views.py @@ -2,7 +2,7 @@ from datetime import datetime, timedelta from django.contrib.auth import get_user_model from django.contrib.auth.decorators import login_required, user_passes_test -from django.db.models import Min, F +from django.db.models import Min, F, Func from django.http import Http404 from django.shortcuts import get_object_or_404 from django.utils.decorators import method_decorator @@ -99,8 +99,11 @@ class SchoolView(TemplateView): date_end__gte=date_now ) school_payment_exists = school_payment.exists() - school_schedules_purchased = school_payment.values_list('weekdays', flat=True) - school_schedules_purchased = school_schedules_purchased[0] if school_schedules_purchased else [] + # school_schedules_purchased = school_payment.values_list('weekdays', flat=True) + school_schedules_purchased = school_payment.objects.annotate( + joined_weekdays=Func(F('weekdays'), function='unnest',) + ).values_list('joined_weekdays', flat=True).distinct() + # school_schedules_purchased = school_schedules_purchased[0] if school_schedules_purchased else [] else: school_payment_exists = False school_schedules_purchased = []