From e320561060c8884f48722f5c9685af987fde7959 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Sat, 16 Oct 2021 17:12:10 +0100
Subject: [PATCH] .

---
 rapids/templates/rapids/mark.html | 232 +++++++++++++++---------------
 1 file changed, 117 insertions(+), 115 deletions(-)

diff --git a/rapids/templates/rapids/mark.html b/rapids/templates/rapids/mark.html
index 0331df9e..8aa431a1 100644
--- a/rapids/templates/rapids/mark.html
+++ b/rapids/templates/rapids/mark.html
@@ -1,135 +1,137 @@
 {% extends 'rapids/exams.html' %}
 
 {% block content %}
-<div class="col-md-6">
-    <h2>{% if review %}Reviewing{% else %}Marking{% endif %} question {{question_details.current}} of {{question_details.total}}</h2>
-    <a href="{% url 'rapids:question_detail' question.id %}" title="View the Question">View</a> <a
-        href="{% url 'rapids:rapid_update' question.id %}" title="Edit the Question">Edit</a> <a
-            href="{% url 'admin:rapids_rapid_change' question.id %}" title="Edit the Question using the admin interface">Admin
-            Edit</a>
-    {% if unmarked_answers_bool %}
-        <div class="alert alert-warning" role="alert">
-            This questions has unmarked answers. Are you sure you want to review?
-        </div>
-
-    {% endif %}
-    {% if question.normal %}
-        <h3>This question is normal</h3>
-        Answers will be automatically marked.<br />
-
-        {% if incorrect_answers %}
-            <p>The following answers have been submitted for this question</p>
-            <div class="marking-list">
-                <ul id="new-answer-list" class="answer-list rapid">
-                    {% for answer in incorrect_answers %}
-                        <li>
-                            <pre><span class="answer incorrect" title="{{answer}}">{{ answer }}</span></pre>
-                        </li>
-                    {% endfor %}
-                </ul>
+    <div class="col-md-6">
+        <h2>{% if review %}Reviewing{% else %}Marking{% endif %} question {{question_details.current}} of {{question_details.total}}</h2>
+        <a href="{% url 'rapids:question_detail' question.id %}" title="View the Question">View</a> <a
+            href="{% url 'rapids:rapid_update' question.id %}" title="Edit the Question">Edit</a> <a
+                href="{% url 'admin:rapids_rapid_change' question.id %}" title="Edit the Question using the admin interface">Admin
+                Edit</a>
+        {% if unmarked_answers_bool %}
+            <div class="alert alert-warning" role="alert">
+                This questions has unmarked answers. Are you sure you want to review?
             </div>
+
         {% endif %}
-    {% else %}
-        <h3>This question is abnormal</h3>
-        Answers marked as normal will be automatically marked.<br />
-        Region: {{ question.get_regions }}, Abnormalities: {{ question.get_abnormalities }}
-    {% endif %}
-    <div class="marking">
-        <form method="POST" class="post-form">{% csrf_token %}
-            {% if not question.normal %}
-                Click each answer to toggle through marks awarded (as per colour)<br/>
-                {% if not review %}
-                    {% if unmarked_exam_answers_only %}
-                        Showing exam answers only <a href="{% url 'rapids:mark_all' exam.id question_number %}">(view all)</a>
-                    {% else %}
-                        Showing all answers <a href="{% url 'rapids:mark' exam.id question_number %}">(view unmarked exam answers)</a>
-                    {% endif %}
-                {% endif %}
+        {% if question.normal %}
+            <h3>This question is normal</h3>
+            Answers will be automatically marked.<br />
 
+            {% if incorrect_answers %}
+                <p>The following answers have been submitted for this question</p>
                 <div class="marking-list">
-                    {% if not review %}
-                        Unmarked:
-                        <ul id="new-answer-list" class="answer-list rapid">
-                            {% 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 rapid">
-                            {% 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>
-                    {% else %}
-                        To review:
-                        <ul id="new-answer-list" class="answer-list rapid">
-                            {% for answer, mark in review_user_answers %}
-                                <li>
-                                    <pre><span class="answer not-marked" data-mark="{{mark}}">{{ answer }}</span></pre>
-                                </li>
-                            {% endfor %}
-                        </ul>
-                    {% endif %}
-                    <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>
+                    <ul id="new-answer-list" class="answer-list rapid">
+                        {% for answer in incorrect_answers %}
+                            <li>
+                                <pre><span class="answer incorrect" title="{{answer}}">{{ answer }}</span></pre>
+                            </li>
+                        {% endfor %}
+                    </ul>
                 </div>
             {% endif %}
-            {% if review and not question.normal %}
-                <button type="button" name="check-review" class="check-review">Check review answers</button><br/>
-            {% endif %}
-            <span class="save-buttons">
-                {% if question_details.current > 1 %}
-                    <button type="submit" name="previous" class="save btn btn-default">Previous</button>
+        {% else %}
+            <h3>This question is abnormal</h3>
+            Answers given as normal will be automatically marked.<br />
+            Region: {{ question.get_regions }}, Abnormalities: {{ question.get_abnormalities }}
+        {% endif %}
+        <div class="marking">
+            <form method="POST" class="post-form">{% csrf_token %}
+                {% if not question.normal %}
+                    Click each answer to toggle through marks awarded (as per colour)<br/>
+                    {% 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">
+                        {% if not review %}
+                            Unmarked:
+                            <ul id="new-answer-list" class="answer-list rapid">
+                                {% for answer in user_answers %}
+                                    <li>
+                                        <pre><span class="answer not-marked">{{ answer }}</span></pre>
+                                    </li>
+                                {% endfor %}
+                            </ul>
+
+                            {% if not unmarked_exam_answers_only %}
+                                Marked:
+                                <ul id="marked-answer-list" class="answer-list rapid">
+                                    {% 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>
+                            {% endif %}
+                        {% else %}
+                            To review:
+                            <ul id="new-answer-list" class="answer-list rapid">
+                                {% for answer, mark in review_user_answers %}
+                                    <li>
+                                        <pre><span class="answer not-marked" data-mark="{{mark}}">{{ answer }}</span></pre>
+                                    </li>
+                                {% endfor %}
+                            </ul>
+                        {% endif %}
+                        <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>
+                    </div>
                 {% 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>
+                {% if review and not question.normal %}
+                    <button type="button" name="check-review" class="check-review">Check review answers</button><br/>
                 {% endif %}
-            </span>
-            <span class=hide>
-                {{ form.as_p }}
-            </span>
-        </form>
+                <span class="save-buttons">
+                    {% 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 %}
+                </span>
+                <span class=hide>
+                    {{ form.as_p }}
+                </span>
+            </form>
+        </div>
     </div>
-</div>
-<div class="col-md-6">
-    <div id="single-dicom-viewer" class="marking-dicom" data-images="{{question.get_image_url_array}}"
-        data-annotations='{{question.get_image_annotations}}'>
+    <div class="col-md-6">
+        <div id="single-dicom-viewer" class="marking-dicom" data-images="{{question.get_image_url_array}}"
+            data-annotations='{{question.get_image_annotations}}'>
+        </div>
     </div>
-</div>
     {% if review and not question.normal %}
         <script>
-        $(document).ready(() => {
-            $("button.check-review").click(() =>{
-                $(".marking-list .answer").each((n, el) => {
-                    console.log(n, el, el.dataset);
-                    if (el.dataset.mark != el.dataset.newmark) {
-                        $(el).after(`<span class="current-mark"> saved mark [${el.dataset.mark}]</span>`)
-                    }
+            $(document).ready(() => {
+                $("button.check-review").click(() =>{
+                    $(".marking-list .answer").each((n, el) => {
+                        console.log(n, el, el.dataset);
+                        if (el.dataset.mark != el.dataset.newmark) {
+                            $(el).after(`<span class="current-mark"> saved [${el.dataset.mark}]</span>`)
+                        }
+                    })
+                    $("button.check-review").after("Discreptant answers are show above. Click next / save to update you your answers").hide()
+                    $(".save-buttons").show();
                 })
-                $("button.check-review").after("Discreptant answers are show above. Click next / save to update you your answers").hide()
-                $(".save-buttons").show();
-            })
 
-            $(".save-buttons").hide();
-        });
+                $(".save-buttons").hide();
+            });
         </script>
 
     {% endif %}