Merge branch 'master' into 58-models-for-advanced-features-from-schoolapps-imported-from-untis

aleksis/apps/chronos/models.py

@@ -255,12 +255,17 @@ class LessonSubstitutionQuerySet(LessonDataQuerySet):
     def affected_teachers(self):
         """ Return all teachers which are affected by selected substitutions (as substituted or substituting) """
 
-        return Person.objects.filter(Q(lessons_as_teacher__in=self.affected_lessons()) | Q(lesson_substitutions__in=self))
+        return Person.objects.filter(
+            Q(lessons_as_teacher__in=self.affected_lessons())
+            | Q(lesson_substitutions__in=self)
+        ).annotate(lessons_count=Count("lessons_as_teacher"))
 
     def affected_groups(self):
         """ Return all groups which are affected by selected substitutions """
 
-        return Group.objects.filter(lessons__in=self.affected_lessons())
+        return Group.objects.filter(lessons__in=self.affected_lessons()).annotate(
+            lessons_count=Count("lessons")
+        )
 
 
 class TimePeriod(models.Model):