From 6900bf71ffbf5da190aa06e6231489197e973feb Mon Sep 17 00:00:00 2001 From: Ross Date: Sat, 11 Sep 2021 19:48:34 +0100 Subject: [PATCH] . --- longs/models.py | 13 +++++++++++++ .../longs/mark_question_double_overview.html | 1 + 2 files changed, 14 insertions(+) diff --git a/longs/models.py b/longs/models.py index f6fcacb1..9c775a71 100644 --- a/longs/models.py +++ b/longs/models.py @@ -778,6 +778,19 @@ class CidUserAnswer(models.Model): s = ", ".join(f"{str(i.marker)} ({i.score})" for i in mark_objects) return f"Marked by {s}" + + def get_markers(self): + mark_objects = self.mark.all() + if not mark_objects: + return "None" + return "/".join(f"{str(i.marker)}" for i in mark_objects) + + def get_mark_scores(self): + mark_objects = self.mark.all() + count = mark_objects.count() + if count < 2: + return "hidden" + return "/".join(f"{str(i.score)}" for i in mark_objects) def get_answer_score(self): if self.score == "": diff --git a/longs/templates/longs/mark_question_double_overview.html b/longs/templates/longs/mark_question_double_overview.html index f03d313d..cc2501dc 100644 --- a/longs/templates/longs/mark_question_double_overview.html +++ b/longs/templates/longs/mark_question_double_overview.html @@ -21,6 +21,7 @@
  • {{answer.cid}}: + Score {{answer.get_answer_score}} [Markers: {{answer.get_markers}}] [Scores: {{answer.get_mark_scores}}] {% if answer.is_marked %} Score {{answer.get_answer_score}} {% else %}