From 4d5cd763fe2a33e261dacb9ba31dfe0484ab07e9 Mon Sep 17 00:00:00 2001 From: Ross Date: Wed, 8 Sep 2021 12:21:05 +0100 Subject: [PATCH] . --- rapids/models.py | 7 +++++++ rapids/views.py | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/rapids/models.py b/rapids/models.py index ed379bb8..d6e2ea9f 100644 --- a/rapids/models.py +++ b/rapids/models.py @@ -257,6 +257,13 @@ class Rapid(models.Model): def get_unmarked_answer_count(self): return len(self.get_unmarked_answers()) + def get_user_answers(self): + user_answers = set( + [i.answer_compare for i in self.cid_user_answers.all()] + ) + + return user_answers + def get_compare_answers(self): return set( [ diff --git a/rapids/views.py b/rapids/views.py index f976ead8..d2733906 100755 --- a/rapids/views.py +++ b/rapids/views.py @@ -776,6 +776,10 @@ def mark(request, pk, sk): half_mark_answers = question.answers.filter(status=Answer.MarkOptions.HALF_MARK) incorrect_answers = question.answers.filter(status=Answer.MarkOptions.INCORRECT) + # this could be improved + if question.normal: + incorrect_answers = question.get_user_answers + return render( request, "rapids/mark.html",