From e89067ecba34a243287850c4dffa857a9c1e81a1 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Tue, 7 Dec 2021 16:29:12 +0000
Subject: [PATCH] .

---
 anatomy/templates/anatomy/mark.html | 95 ++++++++++++++++-------------
 1 file changed, 51 insertions(+), 44 deletions(-)

diff --git a/anatomy/templates/anatomy/mark.html b/anatomy/templates/anatomy/mark.html
index 77a6ea72..4c4dcd45 100644
--- a/anatomy/templates/anatomy/mark.html
+++ b/anatomy/templates/anatomy/mark.html
@@ -1,49 +1,56 @@
 {% extends 'anatomy/exams.html' %}
 
 {% block content %}
-<h2>Marking question {{question_details.current}} of {{question_details.total}}</h2>
-<a href="{% url 'anatomy:question_detail' question.id %}" title="View the Question">View</a> <a href="{% url 'anatomy:anatomy_question_update' question.id %}" title="Edit the Question">Edit</a> <a href="{% url 'admin:anatomy_anatomyquestion_change' question.id %}" title="Edit the Question using the admin interface">Admin Edit</a>
-<h3>{{ question.question_type }}</h3>
+    <h2>Marking question {{question_details.current}} of {{question_details.total}}</h2>
+    <a href="{% url 'anatomy:question_detail' question.id %}" title="View the Question">View</a> <a href="{% url 'anatomy:anatomy_question_update' question.id %}" title="Edit the Question">Edit</a> <a href="{% url 'admin:anatomy_anatomyquestion_change' question.id %}" title="Edit the Question using the admin interface">Admin Edit</a>
+    <h3>{{ question.question_type }}</h3>
 
-<div id="single-dicom-viewer" class="marking-dicom" data-images="{{ question.get_image_url_array }}" data-annotations='{{question.get_image_annotations}}'>
-</div>
-<div class="marking">
-<form method="POST" class="post-form">{% csrf_token %}
-    Click each answer to toggle through marks awarded (as per colour)
-    <div class="marking-list">
-        Unmarked:
-        <ul id="new-answer-list" class="answer-list">
-            {% for answer in user_answers %}
-            <li><pre><span class="answer not-marked">{{ answer }}</span></pre></li>
-            {% endfor %}
-        </ul>
-        Marked:
-        <ul id="marked-answer-list" class="answer-list">
-            {% for answer in correct_answers %}
-            <li><pre><span class="answer correct" title="{{answer}}">{{ answer }}</span></pre></li>
-            {% endfor %}
-            {% for answer in half_mark_answers %}
-            <li><pre><span class="answer half-correct" title="{{answer}}">{{ answer }}</span></pre></li>
-            {% endfor %}
-            {% for answer in incorrect_answers %}
-            <li><pre><span class="answer incorrect" title="{{answer}}">{{ answer }}</span></pre></li>
-            {% endfor %}
-        </ul>
-        <div class="answer-list key">Key: <span class="correct">2 Marks</span>, <span class="half-correct">1
-                Mark</span>, <span class="incorrect">0 Marks</span></div>
-        {% if question_details.current > 1 %}
-        <button type="submit" name="previous" class="save btn btn-default">Previous</button>
-        {% endif %}
-        <button type="submit" name="save" class="save btn btn-default">Save</button>
-        {% if question_details.current >= question_details.total %}
-        {% else %}
-        <button type="submit" name="next" class="save btn btn-default">Next</button>
-        <button type="submit" name="skip" class="save btn btn-default">Skip</button>
-        {% endif %}
+    <div id="single-dicom-viewer" class="marking-dicom" data-images="{{ question.get_image_url_array }}" data-annotations='{{question.get_image_annotations}}'>
     </div>
-    <span class=hide>
-        {{ form.as_p }}
-    </span>
-</form>
-</div>
-{% endblock %}
\ No newline at end of file
+    <div class="marking">
+        <form method="POST" class="post-form">{% csrf_token %}
+            Click each answer to toggle through marks awarded (as per colour)
+            {% if not review %}
+                {% if unmarked_exam_answers_only %}
+                    Showing unmarked exam answers only <a href="{% url 'rapids:mark_all' exam.id question_number %}">(view all answers for question)</a>
+                {% else %}
+                    Showing all answers <a href="{% url 'rapids:mark' exam.id question_number %}">(view unmarked exam answers only)</a>
+                {% endif %}
+            {% endif %}
+            <div class="marking-list">
+                Unmarked:
+                <ul id="new-answer-list" class="answer-list">
+                    {% for answer in user_answers %}
+                        <li><pre><span class="answer not-marked">{{ answer }}</span></pre></li>
+                    {% endfor %}
+                </ul>
+                Marked:
+                <ul id="marked-answer-list" class="answer-list">
+                    {% for answer in correct_answers %}
+                        <li><pre><span class="answer correct" title="{{answer}}">{{ answer }}</span></pre></li>
+                    {% endfor %}
+                    {% for answer in half_mark_answers %}
+                        <li><pre><span class="answer half-correct" title="{{answer}}">{{ answer }}</span></pre></li>
+                    {% endfor %}
+                    {% for answer in incorrect_answers %}
+                        <li><pre><span class="answer incorrect" title="{{answer}}">{{ answer }}</span></pre></li>
+                    {% endfor %}
+                </ul>
+                <div class="answer-list key">Key: <span class="correct">2 Marks</span>, <span class="half-correct">1
+                    Mark</span>, <span class="incorrect">0 Marks</span></div>
+                {% if question_details.current > 1 %}
+                    <button type="submit" name="previous" class="save btn btn-default">Previous</button>
+                {% endif %}
+                <button type="submit" name="save" class="save btn btn-default">Save</button>
+                {% if question_details.current >= question_details.total %}
+                {% else %}
+                    <button type="submit" name="next" class="save btn btn-default">Next</button>
+                    <button type="submit" name="skip" class="save btn btn-default">Skip</button>
+                {% endif %}
+            </div>
+            <span class=hide>
+                {{ form.as_p }}
+            </span>
+        </form>
+    </div>
+{% endblock %}