Нельзя было добавить урок на дату окончания школы

remotes/origin/hotfix/lessons-date-range-31-05-19
gzbender 7 years ago
parent 0aa30e1d09
commit 847a6492ad
  1. 6
      apps/school/views.py

@ -38,12 +38,12 @@ class LiveLessonsView(ListView):
def get_queryset(self):
date_start = (now() - timedelta(days=7)).date()
date_start, date_end = SchoolPayment.get_date_range(date_start, days=17, is_camp=False)
date_start, date_end = SchoolPayment.get_date_range(date_start, days=16, is_camp=False)
date_range = Q(
date__range=[date_start, date_end]
)
exist_dates = LiveLesson.objects.filter(date_range, is_camp=False).values_list('date', flat=True)
for i in range((date_end - date_start).days):
for i in range((date_end - date_start).days + 1):
d = date_start + timedelta(days=i)
if d not in exist_dates:
try:
@ -74,7 +74,7 @@ class DrawingCampLessonsView(ListView):
date__range=[date_start, date_end]
)
exist_dates = LiveLesson.objects.filter(date_range, is_camp=True).values_list('date', flat=True)
for i in range((date_end - date_start).days):
for i in range((date_end - date_start).days + 1):
d = date_start + timedelta(days=i)
if d.isoweekday() in DrawingCampPayment.WEEKDAYS and d not in exist_dates:
try:

Loading…
Cancel
Save