From afc9f62cc44c6f6a05e46b46ce53a3c49e7ead6e Mon Sep 17 00:00:00 2001 From: Alban Gruin Date: Tue, 24 Jan 2017 17:36:50 +0100 Subject: Le tri des semaines affichées est effectué directement dans la base de données --- views.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/views.py b/views.py index 424e355..40c08b9 100644 --- a/views.py +++ b/views.py @@ -14,17 +14,17 @@ def index(request): groups = Group.objects.filter(tp__isnull=False).order_by("name") current_year, current_week, _ = timezone.now().isocalendar() + start, _ = get_week(current_year, current_week) for group in groups: - courses = Course.objects.get_courses_for_group(group).values("begin").annotate(count=Count("begin")) + courses = Course.objects.get_courses_for_group(group, begin__gte=start).values("begin").annotate(count=Count("begin")) weeks = [] for course in courses: year, week, _ = course["begin"].isocalendar() + date, _ = get_week(year, week) - if year >= current_year and week >= current_week: - date, _ = get_week(year, week) - if date not in weeks: - weeks.append(date) + if date not in weeks: + weeks.append(date) group.weeks = weeks -- cgit v1.2.1