From 61ac45d507d9f76891281e49324a93f60a58d946 Mon Sep 17 00:00:00 2001 From: Ross Date: Mon, 1 Feb 2021 12:51:39 +0000 Subject: [PATCH] . --- rapids/models.py | 2 ++ rapids/views.py | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/rapids/models.py b/rapids/models.py index 84f9f221..83fbb41b 100644 --- a/rapids/models.py +++ b/rapids/models.py @@ -222,6 +222,8 @@ class Rapid(models.Model): def GetPrimaryAnswer(self): if len(self.answers.all()) > 0: return self.answers.all().first().answer + elif self.normal: + return "Normal" else: return "None yet..." diff --git a/rapids/views.py b/rapids/views.py index a4799c22..2776da47 100755 --- a/rapids/views.py +++ b/rapids/views.py @@ -1017,16 +1017,19 @@ def exam_scores_cid_user(request, pk, sk): for q in questions: # Get user answer user_answer = q.cid_user_answers.filter(cid=cid).first() + + if not user_answer: # skip if no answer answers_marks.append(0) answers.append("") answer_score = 0 ans = "Not answered" + elif user_answer.normal: + ans = "Normal" else: ans = user_answer.answer - - answer_score = user_answer.get_answer_score() + answer_score = user_answer.get_answer_score() correct_answer = q.GetPrimaryAnswer()