.

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 == "":

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()