This commit is contained in:
Ross
2021-09-11 19:48:34 +01:00
parent 8ce8e47de8
commit 6900bf71ff
2 changed files with 14 additions and 0 deletions
+13
View File
@@ -778,6 +778,19 @@ class CidUserAnswer(models.Model):
s = ", ".join(f"{str(i.marker)} ({i.score})" for i in mark_objects) s = ", ".join(f"{str(i.marker)} ({i.score})" for i in mark_objects)
return f"Marked by {s}" 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): def get_answer_score(self):
if self.score == "": if self.score == "":
@@ -21,6 +21,7 @@
<li> <li>
<a href="{% url 'longs:mark_answer' exam.id question_details.current|add:'-1' answer.cid %}" <a href="{% url 'longs:mark_answer' exam.id question_details.current|add:'-1' answer.cid %}"
title="Click to mark"> {{answer.cid}}</a>: title="Click to mark"> {{answer.cid}}</a>:
Score {{answer.get_answer_score}} [Markers: {{answer.get_markers}}] [Scores: {{answer.get_mark_scores}}]
{% if answer.is_marked %} {% if answer.is_marked %}
Score {{answer.get_answer_score}} Score {{answer.get_answer_score}}
{% else %} {% else %}