From 8ce8e47de8db1a6b945ce1451567d88f3ad5fe22 Mon Sep 17 00:00:00 2001 From: Ross Date: Sat, 11 Sep 2021 19:43:15 +0100 Subject: [PATCH] . --- longs/models.py | 11 ++++++++--- longs/views.py | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/longs/models.py b/longs/models.py index b35acd4c..f6fcacb1 100644 --- a/longs/models.py +++ b/longs/models.py @@ -769,10 +769,15 @@ class CidUserAnswer(models.Model): def get_mark_status(self): mark_objects = self.mark.all() - if not mark_objects: + count = mark_objects.count() + if count == 0: return "Unmarked" - markers = ",".join([str(i.marker) for i in mark_objects]) - return f"Marked by {markers}" + + if count == 1: + return f"Marked by {mark_objects.first().marker} (awaiting second marker)" + + s = ", ".join(f"{str(i.marker)} ({i.score})" for i in mark_objects) + return f"Marked by {s}" def get_answer_score(self): if self.score == "": diff --git a/longs/views.py b/longs/views.py index 1bc8dbf0..5cb8f945 100755 --- a/longs/views.py +++ b/longs/views.py @@ -730,7 +730,7 @@ def mark_answer(request, exam_id, question_number, cid): # if they do automatically update teh scoer marks = set(answer.mark.values_list("score", flat=True)) if len(marks) == 1: - answer.score = marks[0] + answer.score = marks.pop() else: answer.score = "" answer.save()