2 files changed, 5 insertions, 6 deletions
diff --git a/models.py b/models.py
index 59301e0..cd19259 100644
--- a/models.py
+++ b/models.py
@@ -158,9 +158,10 @@ class CourseManager(Manager):
         return self.get_queryset() \
                    .filter(**criteria) \
                    .order_by("groups__name", "year", "week") \
-                   .annotate(_=Count(("groups", "year", "week", "begin")),
-                             year=ExtractYear("begin"),
-                             week=ExtractWeek("begin"))
+                   .annotate(year=ExtractYear("begin"),
+                             week=ExtractWeek("begin")) \
+                   .values("groups__mention",
+                           "groups__subgroup", "year", "week")
 
 
 class Course(models.Model):
diff --git a/views.py b/views.py
index d4df8db..f1ec8d5 100644
--- a/views.py
+++ b/views.py
@@ -42,9 +42,7 @@ def group_list(request, year_slug, timetable_slug):
     start, _ = get_week(*get_current_week())
     end = start + datetime.timedelta(weeks=4)
 
-    groups_weeks = Course.objects.get_weeks(begin__gte=start, begin__lt=end, groups__in=groups) \
-                                 .values("groups__mention", "groups__subgroup",
-                                         "year", "week")
+    groups_weeks = Course.objects.get_weeks(begin__gte=start, begin__lt=end, groups__in=groups)
 
     for group in groups:
         for group_week in groups_weeks: