From 044c7dd51271cdfb1a392e9a86c4863b5bb31661 Mon Sep 17 00:00:00 2001 From: Ross Date: Sat, 18 Dec 2021 17:52:36 +0000 Subject: [PATCH] . --- anatomy/models.py | 6 ------ anatomy/templates/anatomy/exam_scores.html | 2 +- rapids/templates/rapids/exam_scores.html | 2 +- sbas/templates/sbas/exam_scores.html | 14 +++++++------- 4 files changed, 9 insertions(+), 15 deletions(-) diff --git a/anatomy/models.py b/anatomy/models.py index 03e5c00a..82681137 100644 --- a/anatomy/models.py +++ b/anatomy/models.py @@ -468,12 +468,6 @@ class CidUserAnswer(models.Model): # s = s.translate(str.maketrans('', '', string.punctuation)) # return s - def get_blank_answer(self): - return 0 - - def get_blank_answer_string(self): - return "" - def get_answer_score(self, cached=True): if cached and self.score: if self.score == Answer.MarkOptions.CORRECT: diff --git a/anatomy/templates/anatomy/exam_scores.html b/anatomy/templates/anatomy/exam_scores.html index d7be3c94..8c0fd1c2 100644 --- a/anatomy/templates/anatomy/exam_scores.html +++ b/anatomy/templates/anatomy/exam_scores.html @@ -32,7 +32,7 @@ {% for user, value in user_answers_marks.items %} - {% comment %} {{user}} {% endcomment %} + {{user}} {{user}} {{user_scores|get_item:user}} diff --git a/rapids/templates/rapids/exam_scores.html b/rapids/templates/rapids/exam_scores.html index 2a0d9042..d4f0f2db 100644 --- a/rapids/templates/rapids/exam_scores.html +++ b/rapids/templates/rapids/exam_scores.html @@ -33,7 +33,7 @@ {% for user, value in user_answers_marks.items %} - {{user}} + {{user}} {{user_scores|get_item:user}} {{user_scores_normalised|get_item:user}} diff --git a/sbas/templates/sbas/exam_scores.html b/sbas/templates/sbas/exam_scores.html index 15e56721..177e1acd 100644 --- a/sbas/templates/sbas/exam_scores.html +++ b/sbas/templates/sbas/exam_scores.html @@ -23,7 +23,7 @@ {% for user, value in user_answers_marks.items %} - {{user}} + {{user}} {{user_scores|get_item:user}} {% endfor %} @@ -33,13 +33,13 @@

Results as a table

- - - {% for cid in cids %} - - {% endfor %} + + + {% for cid in cids %} + + {% endfor %} - + {% for question in questions %}
Candidate{{cid}}
Candidate{{cid}}