.

2021-10-16 12:45:19 +01:00
parent b4febccde5
commit dc38d8e026
3 changed files with 13 additions and 10 deletions
@@ -278,15 +278,18 @@ class Rapid(models.Model):

        return len(self.get_unmarked_user_answers(exam_pk, marker=marker))

-    def get_user_answers(self, exam_pk=None):
+    def get_user_answers(self, exam_pk=None, include_normal=True):
        if exam_pk is None:
-            user_answers = set(
-                [i.answer_compare for i in self.cid_user_answers.all()]
-            )
+            queryset = self.cid_user_answers.all()
        else:
-            user_answers = set(
-                [i.answer_compare for i in self.cid_user_answers.filter(exam__id=exam_pk)]
-            )
+            queryset = self.cid_user_answers.filter(exam__id=exam_pk)
+
+        if not include_normal:
+            queryset = queryset.filter(normal=False)
+
+        user_answers = set(
+            [i.answer_compare for i in queryset]
+        )

        return user_answers