.

longs/templates/longs/long_display_block.html

@@ -32,6 +32,8 @@
     <p class="pre-whitespace"><b>Principle Diagnosis:</b> {{ question.model_principle_diagnosis }}</p>
     <p class="pre-whitespace"><b>Differential Diagnosis:</b> {{ question.model_differential_diagnosis }}</p>
     <p class="pre-whitespace"><b>Managment:</b> {{ question.model_management }}</p>
+
+    <p class="pre-whitespace"><b>Mark Scheme:</b> {{ question.mark_scheme }}</p>
     </p>
     <p><b>Exam(s):</b> {{question.GetExams}}</p>
 </div>

longs/templates/longs/mark.html

@@ -1,67 +1,43 @@
 {% extends 'longs/exams.html' %}
 
 {% block content %}
-<h2>Marking question {{question_details.current}} of {{question_details.total}}</h2>
+<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> <a
     href="{% url 'admin:longs_long_change' question.id %}" title="Edit the Question using the admin interface">Admin
     Edit</a>
-{% if question.normal %}
-<h3>This question is normal</h3>
-Answers will be automatically marked.
-{% else %}
-<h3>This question is abnormal</h3>
-Answers marked as normal will be automatically marked.
-{% endif %}
-<div id="single-dicom-viewer" class="marking-dicom" data-images="{{question.GetImageUrls}}"
-    data-annotations='{{question.image_annotations}}'>
-</div>
-<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)
-        <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">{{ answer }}</span></pre>
-                </li>
-                {% endfor %}
-                {% for answer in half_mark_answers %}
-                <li>
-                    <pre><span class="answer half-correct">{{ answer }}</span></pre>
-                </li>
-                {% endfor %}
-                {% for answer in incorrect_answers %}
-                <li>
-                    <pre><span class="answer incorrect">{{ 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>
-        </div>
-            {% endif %}
-            {% 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 %}
+<h2>Marking question {{question_details.current}} of {{question_details.total}}</h2>
+<div>
+
+    {% if not user_answers %}
+    No answers to mark.
+
+    {% else %}
+    Answers:
+    <ul>
+        {% for answer in user_answers %}
+        <li>
+            <a href="{% url 'longs:mark_answer' exam.id question_details.current|add:'-1' answer.cid %}"
+                title="Click to mark"> {{answer.cid}}</a>:
+            {% if answer.is_marked %}
+            Score {{answer.get_answer_score}}
             {% 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>
+            Unmarked
             {% endif %}
-        <span class=hide>
-            {{ form.as_p }}
-        </span>
-    </form>
+
+        </li>
+        {% endfor %}
+    </ul>
+    {% endif %}
+    <div>
+        {% if question_details.current > 1 %}
+        <a href="{% url 'longs:mark' exam.id question_details.current|add:'-2' %}"
+            title="Previous question">Previous</a>
+        {% endif %}
+        {% if question_details.current >= question_details.total %}
+        {% else %}
+        <a href="{% url 'longs:mark' exam.id question_details.current %}" title="Next question">Next</a>
+        {% endif %}
+    </div>
 </div>
+
 {% endblock %}

longs/templates/longs/mark_answer.html

@@ -0,0 +1,45 @@
+{% 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> <a
+    href="{% url 'admin:longs_long_change' question.id %}" title="Edit the Question using the admin interface">Admin
+    Edit</a>
+<h2>Marking question <a href="{% url 'longs:mark' exam.id question_details.current|add:'-1' %}"
+        title="View question answers">{{question_details.current}}</a> of {{question_details.total}}</h2>
+<div>
+    <div class="long-answer">
+        <span class="answer-heading">User observations:</span>
+        <pre>{{answer.answer_observations}}</pre>
+    </div>
+    <div class="long-answer">
+        <span class="answer-heading">User interpretation:</span>
+        <pre>{{answer.answer_interpretation}}</pre>
+    </div>
+    <div class="long-answer">
+        <span class="answer-heading">User principle diagnosis:</span>
+        <pre>{{answer.answer_principle_diagnosis}}</pre>
+    </div>
+    <div class="long-answer">
+        <span class="answer-heading">User differential diagnosis:</span>
+        <pre>{{answer.answer_differential_diagnosis}}</pre>
+    </div>
+    <div class="long-answer">
+        <span class="answer-heading">User management:</span>
+        <pre>{{answer.answer_management}}</pre>
+    </div>
+
+</div>
+<div class="marking">
+    <form method="POST" class="post-form">{% csrf_token %}
+        {{ form.as_p }}
+        <button type="submit" name="save" class="save btn btn-default">Save</button>
+        {% if next_unmarked_id %}
+        <button type="submit" name="next" class="save btn btn-default">Next</button>
+        <!-- <button type="submit" name="skip" class="save btn btn-default">Skip</button> -->
+        {% else %}
+        (no more answers for this question to mark)
+        {% endif %}
+    </form>
+</div>
+{% endblock %}