From 03bcd0786292c6dec1479abc9646370f9490a05a Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Sun, 12 Sep 2021 09:36:14 +0100
Subject: [PATCH] .

---
 longs/templates/longs/mark_answer.html | 108 +++++++++++++------------
 1 file changed, 58 insertions(+), 50 deletions(-)

diff --git a/longs/templates/longs/mark_answer.html b/longs/templates/longs/mark_answer.html
index daac8dfe..15d2de71 100644
--- a/longs/templates/longs/mark_answer.html
+++ b/longs/templates/longs/mark_answer.html
@@ -1,45 +1,53 @@
 {% extends 'longs/exams.html' %}
 
 {% block content %}
-<a href="{% url 'longs:exam_question_detail' exam.id question_details.current %}" title="View the Question">View</a>
-<a href="{% url 'longs:long_update' question.id %}" title="Edit the Question">Edit</a>
-{% if request.user.is_superuser %}
-<a href="{% url 'admin:longs_long_change' question.id %}" title="Edit the Question using the admin interface">Admin
-    Edit</a> <a href="{% url 'admin:longs_ciduseranswer_change' answer.id %}"
-    title="Edit the user answer using the admin interface">Admin
-    Edit (user answer)</a>
-{% endif %}
-<h2>Marking question <a href="{% url 'longs:mark_question_overview' exam.id question_details.current|add:'-1' %}"
+    <a href="{% url 'longs:exam_question_detail' exam.id question_details.current %}" title="View the Question">View</a>
+    <a href="{% url 'longs:long_update' question.id %}" title="Edit the Question">Edit</a>
+    {% if request.user.is_superuser %}
+        <a href="{% url 'admin:longs_long_change' question.id %}" title="Edit the Question using the admin interface">Admin
+            Edit</a> <a href="{% url 'admin:longs_ciduseranswer_change' answer.id %}"
+                title="Edit the user answer using the admin interface">Admin
+                Edit (user answer)</a>
+    {% endif %}
+    <h2>Marking question <a href="{% url 'longs:mark_question_overview' exam.id question_details.current|add:'-1' %}"
         title="View question answers">{{question_details.current}}</a> of {{question_details.total}}</h2>
 
-{% if discrepancy_form %}
-<div class="alert alert-info sticky-alert" role="alert">
-<h3>This answer has discrepant scores</h3>
-Either edit your score before or set the overall score here.<br/>
+    {% if discrepancy_form %}
+        <div class="alert alert-info sticky-alert" role="alert">
+            <h3>This answer has discrepant scores</h3>
+            Either edit your score before or set the overall score here.<br/>
 
-    <form method="POST" class="post-form">{% csrf_token %}
-        <input type="hidden" name="form_id" value="discrepancy_form">
-        {{ discrepancy_form.as_p }}
-        <button type="submit" name="save" class="save btn btn-default" title="Save score">Save Score</button>
-    </form>
+            <form method="POST" class="post-form">{% csrf_token %}
+                <input type="hidden" name="form_id" value="discrepancy_form">
+                {{ discrepancy_form.as_p }}
+                <button type="submit" name="save" class="save btn btn-default" title="Save score">Save Score</button>
+            </form>
 
-</div>
+            <h4>Marker scores and reason</h4>
+            <ul>
+                {% for mark_objects in answer.mark %}{% endfor %}
+                <li>{{answer.marker}}: answer.score<br/>
+                    {{answer.mark_reason}}
+                </li>
+    {% endfor %}
+    </ul>
+    </div>
 {% endif %}
 
 {% if not next_unmarked_id and not unmarked %}
-<div class="alert alert-info sticky-alert" role="alert">Success! Marking question complete. <br />Return to <a
+    <div class="alert alert-info sticky-alert" role="alert">Success! Marking question complete. <br />Return to <a
         href="{% url 'longs:mark_question_overview' exam.id question_details.current|add:'-1' %}">question
         overview</a>, <a href="{% url 'longs:mark_overview' pk=exam.pk %}">marking
-        overview</a><br />
-    {% if previous_cid %}
-    <a href="{% url 'longs:mark_answer' exam_id=exam.pk question_number=question_details.current|add:'-1' cid=previous_cid %}">Previous
-        candidate</a>
-    {% endif %}
-    {% if next_cid %}
-    <a href="{% url 'longs:mark_answer' exam_id=exam.pk question_number=question_details.current|add:'-1' cid=next_cid %}">Next
-        candidate</a>
-    {% endif %}
-</div>
+            overview</a><br />
+        {% if previous_cid %}
+            <a href="{% url 'longs:mark_answer' exam_id=exam.pk question_number=question_details.current|add:'-1' cid=previous_cid %}">Previous
+                candidate</a>
+        {% endif %}
+        {% if next_cid %}
+            <a href="{% url 'longs:mark_answer' exam_id=exam.pk question_number=question_details.current|add:'-1' cid=next_cid %}">Next
+                candidate</a>
+        {% endif %}
+    </div>
 {% endif %}
 
 <span>Marking CID: {{answer.cid}} ({{unmarked|length}} answer(s) left to mark)</span>
@@ -51,17 +59,17 @@ Either edit your score before or set the overall score here.<br/>
 
     <div class="pre-whitespace multi-image-block"><b>Series:</b>
         {% for series in question.series.all %}
-        <span class="series-block">
-            <span>
-                Series {{ forloop.counter }}:
-                <a href="{% url 'longs:long_series_detail' pk=series.pk %}">
-                    {{series.get_block}}
-                </a>
+            <span class="series-block">
+                <span>
+                    Series {{ forloop.counter }}:
+                    <a href="{% url 'longs:long_series_detail' pk=series.pk %}">
+                        {{series.get_block}}
+                    </a>
 
-                <a href="#"
-                    onclick="return window.create_popup_window('/longs/series/{{series.pk}}', 'Series')">Popup</a>
+                    <a href="#"
+                        onclick="return window.create_popup_window('/longs/series/{{series.pk}}', 'Series')">Popup</a>
+                </span>
             </span>
-        </span>
         {% endfor %}
     </div>
 </details>
@@ -103,22 +111,22 @@ Either edit your score before or set the overall score here.<br/>
         {{ form.as_p }}
         <button type="submit" name="save" class="save btn btn-default" title="Save answer">Save</button>
         {% if next_unmarked_id %}
-        <button type="submit" name="next" class="save btn btn-default"
-            title="Save answer and move to next question">Next answer</button>
-        <!-- <button type="submit" name="skip" class="save btn btn-default">Skip</button> -->
+            <button type="submit" name="next" class="save btn btn-default"
+                title="Save answer and move to next question">Next answer</button>
+            <!-- <button type="submit" name="skip" class="save btn btn-default">Skip</button> -->
         {% else %}
-        {% if not unmarked %}
-        Success! Marking question complete. <a href="{% url 'longs:mark_overview' pk=exam.pk %}">Return to marking
-            overview</a>
-        {% endif %}
+            {% if not unmarked %}
+                Success! Marking question complete. <a href="{% url 'longs:mark_overview' pk=exam.pk %}">Return to marking
+                    overview</a>
+            {% endif %}
         {% endif %}
     </form>
 </div>
 {% if previous_cid %}
-<a href="{% url 'longs:mark_answer' exam_id=exam.pk question_number=question_details.current|add:'-1' cid=previous_cid %}">Previous
-    candidate</a>
+    <a href="{% url 'longs:mark_answer' exam_id=exam.pk question_number=question_details.current|add:'-1' cid=previous_cid %}">Previous
+        candidate</a>
 {% endif %}
 {% if next_cid %}
-<a href="{% url 'longs:mark_answer' exam_id=exam.pk question_number=question_details.current|add:'-1' cid=next_cid %}">Next candidate</a>
+    <a href="{% url 'longs:mark_answer' exam_id=exam.pk question_number=question_details.current|add:'-1' cid=next_cid %}">Next candidate</a>
 {% endif %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}