diff --git a/sbas/models.py b/sbas/models.py index 51dce7a2..d961d55b 100644 --- a/sbas/models.py +++ b/sbas/models.py @@ -124,6 +124,19 @@ class Question(models.Model): self.e_answer, ) + def get_answer_by_choice(self, choice): + if choice == "a": + return self.a_answer + if choice == "b": + return self.b_answer + if choice == "c": + return self.c_answer + if choice == "d": + return self.d_answer + if choice == "e": + return self.e_answer + + def get_correct_answer(self): if self.best_answer == "a": return self.a_answer diff --git a/sbas/templates/sbas/exam_scores_user.html b/sbas/templates/sbas/exam_scores_user.html index 1dc39ed9..c4ba942a 100644 --- a/sbas/templates/sbas/exam_scores_user.html +++ b/sbas/templates/sbas/exam_scores_user.html @@ -6,10 +6,10 @@

Candidate: {{ cid }}

Answers: diff --git a/sbas/views.py b/sbas/views.py index da3ea0b0..2f5d4d13 100644 --- a/sbas/views.py +++ b/sbas/views.py @@ -126,7 +126,8 @@ def exam_scores_cid_user(request, pk, cid, passcode): answers_marks.append(answer_score) merged_ans = (ans, answer_score, correct_answer) - answers_and_marks.append((q, *merged_ans)) + chosen_answer = q.get_answer_by_choice(ans) + answers_and_marks.append((q, *merged_ans, chosen_answer)) total_score = sum(answers_marks)