.

2021-09-08 18:53:41 +01:00
parent afc2746a70
commit 54ff4490d9
8 changed files with 65 additions and 35 deletions
@@ -157,8 +157,8 @@ class AnatomyQuestion(models.Model):
        exams = ", ".join(e)
        return exams

-    def get_unmarked_answer_string(self):
-        unmarked_answers = self.get_unmarked_answers()
+    def get_unmarked_answer_string(self, exam_pk=None):
+        unmarked_answers = self.get_unmarked_answers(exam_pk)

        if not unmarked_answers:
            return "No answers to mark"
@@ -168,16 +168,22 @@ class AnatomyQuestion(models.Model):
            )
        )

-    def get_unmarked_answers(self):
-        user_answers = set(
-            [i.answer_compare for i in self.cid_user_answers.all()]
-        )
+    def get_unmarked_answers(self, exam_pk=None):
+        if exam_pk is None:
+            user_answers = set(
+                [i.answer_compare for i in self.cid_user_answers.all()]
+            )
+        else:
+            user_answers = set(
+                [i.answer_compare for i in self.cid_user_answers.filter(exam__id=exam_pk)]
+            )
+
        unmarked_answers = user_answers - self.get_marked_answers()

        return unmarked_answers

-    def get_unmarked_answer_count(self):
-        return len(self.get_unmarked_answers())
+    def get_unmarked_answer_count(self, exam_pk=None):
+        return len(self.get_unmarked_answers(exam_pk))

    def get_marked_answers(self):
        return set(