.

longs/templates/longs/mark_question_double_overview.html

@@ -1,44 +1,45 @@
 {% extends 'longs/exams.html' %}
 
 {% block content %}
-<a href="{% url 'longs:exam_question_detail' exam.id question_details.current|add:'-1' %}"
+    <a href="{% url 'longs:exam_question_detail' exam.id question_details.current|add:'-1' %}"
-    title="View the Question">View</a>
+        title="View the Question">View</a>
-<a href="{% url 'longs:long_update' question.id %}" title="Edit the Question">Edit</a> <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
+        href="{% url 'admin:longs_long_change' question.id %}" title="Edit the Question using the admin interface">Admin
-    Edit</a>
+        Edit</a>
-<h2>Marking question {{question_details.current}} of {{question_details.total}}</h2>
+    <h2>Marking question {{question_details.current}} of {{question_details.total}}</h2>
-<div>
-
-    {% if not unmarked_count %}
-    <div class="alert alert-info" role="alert">No answers to mark.</div>
-    {% else %}
-    <div class="alert alert-warning" role="alert">{{unmarked_count}} answer(s) to mark.</div>
-
-    {% endif %}
-    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>:
-            Score {{answer.get_answer_score}} [Markers: {{answer.get_markers}}] [Scores: {{answer.get_mark_scores}}]
-            {% if answer.discrepant_answers %}
-            This answer has discrepant scores.
-            {% endif %}
-
-        </li>
-        {% endfor %}
-    </ul>
     <div>
-        {% if question_details.current > 1 %}
+
-        <a href="{% url 'longs:mark_question_overview' exam.id question_details.current|add:'-2' %}"
+        {% if not unmarked_count %}
-            title="Previous question">Previous</a>
+            <div class="alert alert-info" role="alert">All answers completely marked.</div>
-        {% endif %}
-        {% if question_details.current >= question_details.total %}
         {% else %}
-        <a href="{% url 'longs:mark_question_overview' exam.id question_details.current %}" title="Next question">Next</a>
+            <div class="alert alert-warning" role="alert">{{unmarked_count}} answer(s) incompletely marked.<br/>
+            You have marked {{marker_unmarked_count}} / {{user_answer.count}}.
+            </div>
         {% endif %}
+        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>:
+                    Score {{answer.get_answer_score}} [Markers: {{answer.get_markers}}] [Scores: {{answer.get_mark_scores}}]
+                    {% if answer.discrepant_answers %}
+                        This answer has discrepant scores.
+                    {% endif %}
+
+                </li>
+            {% endfor %}
+        </ul>
+        <div>
+            {% if question_details.current > 1 %}
+                <a href="{% url 'longs:mark_question_overview' 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_question_overview' exam.id question_details.current %}" title="Next question">Next</a>
+            {% endif %}
+        </div>
     </div>
-</div>
 
 {% endblock %}

longs/views.py

@@ -802,6 +802,7 @@ def mark_question_overview(request, exam_id, sk):
     unmarked_count = user_answers.filter(score=CidUserAnswer.ScoreOptions.UNMARKED).count()
 
     if exam.double_mark:
+        marker_unmarked_count = question.get
         return render(
             request,
             "longs/mark_question_double_overview.html",