.

longs/templates/longs/mark_answer.html

@@ -12,6 +12,18 @@
 <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 %}
+<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>
+
+{% 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
         href="{% url 'longs:mark_question_overview' exam.id question_details.current|add:'-1' %}">question
@@ -85,6 +97,7 @@
 </div>
 <div class="marking">
     <form method="POST" class="post-form">{% csrf_token %}
+        <input type="hidden" name="form_id" value="mark_form">
         {{ form.as_p }}
         <button type="submit" name="save" class="save btn btn-default" title="Save answer">Save</button>
         {% if next_unmarked_id %}

longs/templates/longs/mark_question_double_overview.html

@@ -22,10 +22,8 @@
             <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.is_marked %}
-            Score {{answer.get_answer_score}}
-            {% else %}
-            {{answer.get_mark_status}}
+            {% if answer.discrepant_answers %}
+            This answer has discrepant scores.
             {% endif %}
 
         </li>