diff --git a/apps/school/views.py b/apps/school/views.py index 37a63dc2..212d3c84 100644 --- a/apps/school/views.py +++ b/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: