|
|
|
|
@ -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 = [] |
|
|
|
|
|