1 files changed, 4 insertions, 3 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):