Split student_statistics into two functions

Author: matijapretnar

web/courses/models.py

@@ -309,16 +309,7 @@ def results_archive(self, user):
         files.append((spreadsheet_filename, spreadsheet_contents))
         return archive_name, files
 
-    def student_statistics(self, student=None):
-        if student is None:
-            students = self.course.observed_students()
-            parts = Part.objects.filter(problem__problem_set=self)
-        else:
-            students = User.objects.filter(id=student.id)
-            parts = Part.objects.filter(
-                problem__problem_set=self, problem__visible=True
-            )
-        outcomes = Outcome.group_dict(parts, students, ("id",), ())
+    def outcomes_statistics(self, outcomes):
         statistics = []
         for problem in self.problems.prefetch_related("parts"):
             parts = []
@@ -341,6 +332,18 @@ def student_statistics(self, student=None):
             )
         return statistics
 
+    def single_student_statistics(self, student):
+        students = User.objects.filter(id=student.id)
+        parts = Part.objects.filter(problem__problem_set=self, problem__visible=True)
+        outcomes = Outcome.group_dict(parts, students, ("id",), ())
+        return self.outcomes_statistics(outcomes)
+
+    def all_students_statistics(self):
+        students = self.course.observed_students()
+        parts = Part.objects.filter(problem__problem_set=self)
+        outcomes = Outcome.group_dict(parts, students, ("id",), ())
+        return self.outcomes_statistics(outcomes)
+
     def toggle_visible(self):
         self.visible = not self.visible
         self.save()

web/courses/views.py

@@ -103,10 +103,9 @@ def problem_set_detail(request, problem_set_pk):
         part__problem__problem_set=problem_set, part__problem__visible=True
     )
     if request.user.is_teacher(problem_set.course):
-        student_statistics = problem_set.student_statistics()
+        student_statistics = problem_set.all_students_statistics()
     else:
-        user_attempts = user_attempts.filter(part__problem__visible=True)
-        student_statistics = problem_set.student_statistics(student=request.user)
+        student_statistics = problem_set.single_student_statistics(request.user)
     valid_parts_ids = user_attempts.filter(valid=True).values_list("part_id", flat=True)
     invalid_parts_ids = user_attempts.filter(valid=False).values_list(
         "part_id", flat=True