From f859373ea0f2e2ab22fad324a73a90f23ac6489d Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 8 Sep 2021 08:52:06 +0100
Subject: [PATCH 01/54] .

---
 longs/templates/longs/mark.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/longs/templates/longs/mark.html b/longs/templates/longs/mark.html
index 041aaff3..aec6511b 100644
--- a/longs/templates/longs/mark.html
+++ b/longs/templates/longs/mark.html
@@ -1,7 +1,7 @@
 {% 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:exam_question_detail' exam.id question_details.current-1 %}" 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>

From d3071557dc65dc933c0574cad0118f464bf0edab Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 8 Sep 2021 08:52:58 +0100
Subject: [PATCH 02/54] .

---
 longs/templates/longs/mark.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/longs/templates/longs/mark.html b/longs/templates/longs/mark.html
index aec6511b..9193fe91 100644
--- a/longs/templates/longs/mark.html
+++ b/longs/templates/longs/mark.html
@@ -1,7 +1,8 @@
 {% extends 'longs/exams.html' %}
 
 {% block content %}
-<a href="{% url 'longs:exam_question_detail' exam.id question_details.current-1 %}" title="View the Question">View</a>
+<a href="{% url 'longs:exam_question_detail' exam.id question_details.current|add:'-1' %}"
+    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>

From 7eeee6068cf8f98fb0b1966064f877d52220661c Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 8 Sep 2021 08:56:46 +0100
Subject: [PATCH 03/54] .

---
 longs/tables.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/longs/tables.py b/longs/tables.py
index 5351ba23..c9743272 100755
--- a/longs/tables.py
+++ b/longs/tables.py
@@ -128,6 +128,7 @@ class UserAnswerTable(tables.Table):
         fields = (
             "cid",
             "question",
+            "score",
             #"normal",
             #"answer",
             #"answer_compare",

From c1ca746fef7e0fb4ed5db71cf36e0472c6eb7fc2 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 8 Sep 2021 10:09:12 +0100
Subject: [PATCH 04/54] .

---
 anatomy/templates/anatomy/mark.html | 6 +++---
 rapids/templates/rapids/mark.html   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/anatomy/templates/anatomy/mark.html b/anatomy/templates/anatomy/mark.html
index 93d41d9a..5a9a415c 100644
--- a/anatomy/templates/anatomy/mark.html
+++ b/anatomy/templates/anatomy/mark.html
@@ -20,13 +20,13 @@
         Marked:
         <ul id="marked-answer-list" class="answer-list">
             {% for answer in correct_answers %}
-            <li><pre><span class="answer correct">{{ answer }}</span></pre></li>
+            <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">{{ answer }}</span></pre></li>
+            <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">{{ answer }}</span></pre></li>
+            <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
diff --git a/rapids/templates/rapids/mark.html b/rapids/templates/rapids/mark.html
index e1d3d011..00676944 100644
--- a/rapids/templates/rapids/mark.html
+++ b/rapids/templates/rapids/mark.html
@@ -33,17 +33,17 @@ Region: {{ question.get_regions }}, Abnormalities: {{ question.get_abnormalities
             <ul id="marked-answer-list" class="answer-list rapid">
                 {% for answer in correct_answers %}
                 <li>
-                    <pre><span class="answer correct">{{ answer }}</span></pre>
+                    <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">{{ answer }}</span></pre>
+                    <pre><span class="answer half-correct" title="{{answer}}">{{ answer }}</span></pre>
                 </li>
                 {% endfor %}
                 {% for answer in incorrect_answers %}
                 <li>
-                    <pre><span class="answer incorrect">{{ answer }}</span></pre>
+                    <pre><span class="answer incorrect" title="{{answer}}">{{ answer }}</span></pre>
                 </li>
                 {% endfor %}
             </ul>

From 38bb9bf9a01a62476c3f674570b6dcd51ed1cfc3 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 8 Sep 2021 10:42:35 +0100
Subject: [PATCH 05/54] .

---
 longs/templates/longs/ciduseranswer_detail.html | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/longs/templates/longs/ciduseranswer_detail.html b/longs/templates/longs/ciduseranswer_detail.html
index 508aedd9..442b6ab9 100644
--- a/longs/templates/longs/ciduseranswer_detail.html
+++ b/longs/templates/longs/ciduseranswer_detail.html
@@ -1,5 +1,4 @@
-
-{% extends 'rapids/base.html' %}
+{% extends 'longs/base.html' %}
 
 {% block content %}
 CID: {{ciduseranswer.cid}}
@@ -8,11 +7,11 @@ CID: {{ciduseranswer.cid}}
 {{ciduseranswer.question}}
 
 <h3>Answers</h3>
-{{ciduseranswer.model_observations}}<br/>
-{{ciduseranswer.model_interpretation}}<br/>
-{{ciduseranswer.model_principle_diagnosis}}<br/>
-{{ciduseranswer.model_differential_diagnosis}}<br/>
-{{ciduseranswer.model_management}}<br/>
+{{ciduseranswer.answer_observations}}<br />
+{{ciduseranswer.answer_interpretation}}<br />
+{{ciduseranswer.answer_principle_diagnosis}}<br />
+{{ciduseranswer.answer_differential_diagnosis}}<br />
+{{ciduseranswer.answer_management}}<br />
 
 
 

From 8ac75f4ce767dd998a25908841f2935d09fcfbde Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 8 Sep 2021 10:52:22 +0100
Subject: [PATCH 06/54] .

---
 longs/templates/longs/ciduseranswer_detail.html | 15 ++++++++++-----
 longs/templates/longs/exam_scores.html          |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/longs/templates/longs/ciduseranswer_detail.html b/longs/templates/longs/ciduseranswer_detail.html
index 442b6ab9..d990f695 100644
--- a/longs/templates/longs/ciduseranswer_detail.html
+++ b/longs/templates/longs/ciduseranswer_detail.html
@@ -7,11 +7,16 @@ CID: {{ciduseranswer.cid}}
 {{ciduseranswer.question}}
 
 <h3>Answers</h3>
-{{ciduseranswer.answer_observations}}<br />
-{{ciduseranswer.answer_interpretation}}<br />
-{{ciduseranswer.answer_principle_diagnosis}}<br />
-{{ciduseranswer.answer_differential_diagnosis}}<br />
-{{ciduseranswer.answer_management}}<br />
+<h4>Observation</h4>
+<pre>{{ciduseranswer.answer_observations}}</pre><br />
+<h4>Interpretation</h4>
+<pre>{{ciduseranswer.answer_interpretation}}</pre><br />
+<h4>Principle Diagnosis</h4>
+<pre>{{ciduseranswer.answer_principle_diagnosis}}</pre><br />
+<h4>Differential Diagnosis</h4>
+<pre>{{ciduseranswer.answer_differential_diagnosis}}</pre><br />
+<h4>Managment</h4>
+<pre>{{ciduseranswer.answer_management}}</pre><br />
 
 
 
diff --git a/longs/templates/longs/exam_scores.html b/longs/templates/longs/exam_scores.html
index 56b275a1..2e96de9d 100644
--- a/longs/templates/longs/exam_scores.html
+++ b/longs/templates/longs/exam_scores.html
@@ -51,7 +51,7 @@
         </thead>
         {% for question in questions %}
         <tr>
-            <td>Question {{forloop.counter}}</td>
+            <td><a href="{% url 'longs:mark' pk=exam.pk sk=forloop.counter0 %}">Question {{forloop.counter}}</a></td>
             {% for ans, score in by_question|get_item:question %}
             <td class="user-answer-score-{{score}}" title="answer score: {{score}}">{{score}}</td>
             {% endfor %}

From 54d61e4f255ffbe703ec5b2002ccf75c8b600246 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 8 Sep 2021 10:59:09 +0100
Subject: [PATCH 07/54] .

---
 longs/templates/longs/exam_scores.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/longs/templates/longs/exam_scores.html b/longs/templates/longs/exam_scores.html
index 2e96de9d..3e7d2470 100644
--- a/longs/templates/longs/exam_scores.html
+++ b/longs/templates/longs/exam_scores.html
@@ -44,7 +44,7 @@
             <tr>
                 <th>Candidate</th>
                 {% for cid in cids %}
-                <th>{{cid}}</th>
+                <th><a href="{% url 'exam_scores_cid_user' exam.pk cid %}">{{cid}}</a></th>
                 {% endfor %}
 
             </tr>

From a3cd5541b05a17b8ea2ce83e9fb340c391247d06 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 8 Sep 2021 10:59:46 +0100
Subject: [PATCH 08/54] .

---
 longs/templates/longs/exam_scores.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/longs/templates/longs/exam_scores.html b/longs/templates/longs/exam_scores.html
index 3e7d2470..6d5d0147 100644
--- a/longs/templates/longs/exam_scores.html
+++ b/longs/templates/longs/exam_scores.html
@@ -44,7 +44,7 @@
             <tr>
                 <th>Candidate</th>
                 {% for cid in cids %}
-                <th><a href="{% url 'exam_scores_cid_user' exam.pk cid %}">{{cid}}</a></th>
+                <th><a href="{% url 'longs:exam_scores_cid_user' exam.pk cid %}">{{cid}}</a></th>
                 {% endfor %}
 
             </tr>

From b760125739fe186ed1117835f077db66fc3f59fe Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 8 Sep 2021 11:37:46 +0100
Subject: [PATCH 09/54] .

---
 anatomy/templates/anatomy/exam_overview.html | 1 +
 longs/templates/longs/exam_overview.html     | 1 +
 rapids/templates/rapids/exam_overview.html   | 1 +
 3 files changed, 3 insertions(+)

diff --git a/anatomy/templates/anatomy/exam_overview.html b/anatomy/templates/anatomy/exam_overview.html
index b1ca3117..b86771bb 100644
--- a/anatomy/templates/anatomy/exam_overview.html
+++ b/anatomy/templates/anatomy/exam_overview.html
@@ -34,6 +34,7 @@
             {{ question.question_type }}: {{ question.get_primary_answer }}
             <br />
             Modality: {{ question.modality }}, <a href="{% url 'anatomy:question_detail' pk=question.pk %}">View</a>, <a href="{% url 'anatomy:mark' pk=exam.pk sk=forloop.counter0 %}">Mark</a>
+                [id: {{question.pk}}]
         </li>
         {% endfor %}
     </ol>
diff --git a/longs/templates/longs/exam_overview.html b/longs/templates/longs/exam_overview.html
index c99b2816..2e65abbe 100644
--- a/longs/templates/longs/exam_overview.html
+++ b/longs/templates/longs/exam_overview.html
@@ -43,6 +43,7 @@
                     <a href="{% url 'longs:exam_question_detail' exam.id forloop.counter0 %}"
                         title="View the question">View</a> / <a href="{% url 'longs:long_update' question.id %}"
                         title="Edit the question">Edit</a>
+                        [id: {{question.pk}}]
                 </div>
             </span>
             <span class="flex-col-3">
diff --git a/rapids/templates/rapids/exam_overview.html b/rapids/templates/rapids/exam_overview.html
index 47607572..ac755ea1 100644
--- a/rapids/templates/rapids/exam_overview.html
+++ b/rapids/templates/rapids/exam_overview.html
@@ -55,6 +55,7 @@
             Examination: {{ question.get_examinations }}, <a
                 href="{% url 'rapids:question_detail' pk=question.pk %}">View</a>, <a
                 href="{% url 'rapids:mark' pk=exam.pk sk=forloop.counter0 %}">Mark</a>
+                [id: {{question.pk}}]
             </span>
         </li>
         {% endfor %}

From 1ed3a2399cc5ee6358bed62282a3d8d9ec30f8dd Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 8 Sep 2021 12:16:57 +0100
Subject: [PATCH 10/54] .

---
 rapids/templates/rapids/mark.html | 35 ++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/rapids/templates/rapids/mark.html b/rapids/templates/rapids/mark.html
index 00676944..14d9d34f 100644
--- a/rapids/templates/rapids/mark.html
+++ b/rapids/templates/rapids/mark.html
@@ -2,15 +2,26 @@
 
 {% block content %}
 <h2>Marking 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
+<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 question.normal %}
 <h3>This question is normal</h3>
 Answers will be automatically marked.
+
+<p>The following answers have been submitted</p>
+
+<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>
 {% else %}
 <h3>This question is abnormal</h3>
-Answers marked as normal will be automatically marked.<br/>
+Answers marked as normal will be automatically marked.<br />
 Region: {{ question.get_regions }}, Abnormalities: {{ question.get_abnormalities }}
 {% endif %}
 <div id="single-dicom-viewer" class="marking-dicom" data-images="{{question.get_image_url_array}}"
@@ -50,16 +61,16 @@ Region: {{ question.get_regions }}, Abnormalities: {{ question.get_abnormalities
             <div class="answer-list key">Key: <span class="correct">1 Marks</span>, <span class="half-correct">0.5
                     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 %}
-            {% 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 %}
+        {% 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 %}
+        {% 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 class=hide>
             {{ form.as_p }}
         </span>

From 4d5cd763fe2a33e261dacb9ba31dfe0484ab07e9 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 8 Sep 2021 12:21:05 +0100
Subject: [PATCH 11/54] .

---
 rapids/models.py | 7 +++++++
 rapids/views.py  | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/rapids/models.py b/rapids/models.py
index ed379bb8..d6e2ea9f 100644
--- a/rapids/models.py
+++ b/rapids/models.py
@@ -257,6 +257,13 @@ class Rapid(models.Model):
     def get_unmarked_answer_count(self):
         return len(self.get_unmarked_answers())
 
+    def get_user_answers(self):
+        user_answers = set(
+            [i.answer_compare for i in self.cid_user_answers.all()]
+        )
+
+        return user_answers
+
     def get_compare_answers(self):
         return set(
             [
diff --git a/rapids/views.py b/rapids/views.py
index f976ead8..d2733906 100755
--- a/rapids/views.py
+++ b/rapids/views.py
@@ -776,6 +776,10 @@ def mark(request, pk, sk):
     half_mark_answers = question.answers.filter(status=Answer.MarkOptions.HALF_MARK)
     incorrect_answers = question.answers.filter(status=Answer.MarkOptions.INCORRECT)
 
+    # this could be improved
+    if question.normal:
+        incorrect_answers = question.get_user_answers
+
     return render(
         request,
         "rapids/mark.html",

From b3b15e889b7213906bee4be41baa44a0098fcdf4 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 8 Sep 2021 12:22:16 +0100
Subject: [PATCH 12/54] .

---
 rapids/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rapids/views.py b/rapids/views.py
index d2733906..0b9c903c 100755
--- a/rapids/views.py
+++ b/rapids/views.py
@@ -778,7 +778,7 @@ def mark(request, pk, sk):
 
     # this could be improved
     if question.normal:
-        incorrect_answers = question.get_user_answers
+        incorrect_answers = question.get_user_answers()
 
     return render(
         request,

From 65b6ef1ad897288b948006575da2ca9f4ae0049b Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 8 Sep 2021 12:23:54 +0100
Subject: [PATCH 13/54] .

---
 rapids/templates/rapids/mark.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rapids/templates/rapids/mark.html b/rapids/templates/rapids/mark.html
index 14d9d34f..13a88e13 100644
--- a/rapids/templates/rapids/mark.html
+++ b/rapids/templates/rapids/mark.html
@@ -12,6 +12,7 @@ Answers will be automatically marked.
 
 <p>The following answers have been submitted</p>
 
+<div class="marking-list">
 <ul id="new-answer-list" class="answer-list rapid">
     {% for answer in incorrect_answers %}
     <li>
@@ -19,6 +20,7 @@ Answers will be automatically marked.
     </li>
     {% endfor %}
 </ul>
+</div>
 {% else %}
 <h3>This question is abnormal</h3>
 Answers marked as normal will be automatically marked.<br />

From d0a914c352612ca390d63ca030191f64848adf3c Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 8 Sep 2021 12:25:04 +0100
Subject: [PATCH 14/54] .

---
 rapids/views.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rapids/views.py b/rapids/views.py
index 0b9c903c..f890a73e 100755
--- a/rapids/views.py
+++ b/rapids/views.py
@@ -779,6 +779,8 @@ def mark(request, pk, sk):
     # this could be improved
     if question.normal:
         incorrect_answers = question.get_user_answers()
+        incorrect_answers.remove("")
+        incorrect_answers.remove("normal")
 
     return render(
         request,

From bb7710c458c58d8ee104ea5a8fac0f791800d6c2 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 8 Sep 2021 12:44:03 +0100
Subject: [PATCH 15/54] .

---
 rapids/templates/rapids/mark.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rapids/templates/rapids/mark.html b/rapids/templates/rapids/mark.html
index 13a88e13..7f6161d2 100644
--- a/rapids/templates/rapids/mark.html
+++ b/rapids/templates/rapids/mark.html
@@ -8,9 +8,9 @@
     Edit</a>
 {% if question.normal %}
 <h3>This question is normal</h3>
-Answers will be automatically marked.
+Answers will be automatically marked.<br/>
 
-<p>The following answers have been submitted</p>
+<p>The following answers have been submitted for this question</p>
 
 <div class="marking-list">
 <ul id="new-answer-list" class="answer-list rapid">

From 45ee6e13be133cce3a89a548897f0cbcb2d2c2d2 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 8 Sep 2021 12:46:50 +0100
Subject: [PATCH 16/54] .

---
 rapids/views.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/rapids/views.py b/rapids/views.py
index f890a73e..289a871d 100755
--- a/rapids/views.py
+++ b/rapids/views.py
@@ -779,8 +779,10 @@ def mark(request, pk, sk):
     # this could be improved
     if question.normal:
         incorrect_answers = question.get_user_answers()
-        incorrect_answers.remove("")
-        incorrect_answers.remove("normal")
+        if "" in incorrect_answers:
+            incorrect_answers.remove("")
+        if "normal" in incorrect_answers:
+            incorrect_answers.remove("normal")
 
     return render(
         request,

From cc5e4c93cbf0da7cd6db2dbef2ee5b1ec714c4c7 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 8 Sep 2021 12:50:24 +0100
Subject: [PATCH 17/54] .

---
 rapids/templates/rapids/mark.html | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/rapids/templates/rapids/mark.html b/rapids/templates/rapids/mark.html
index 7f6161d2..cb42bcb9 100644
--- a/rapids/templates/rapids/mark.html
+++ b/rapids/templates/rapids/mark.html
@@ -8,19 +8,21 @@
     Edit</a>
 {% if question.normal %}
 <h3>This question is normal</h3>
-Answers will be automatically marked.<br/>
+Answers will be automatically marked.<br />
 
 <p>The following answers have been submitted for this question</p>
 
+{% if incorrect_answers %}
 <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>
+    <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 %}
 {% else %}
 <h3>This question is abnormal</h3>
 Answers marked as normal will be automatically marked.<br />

From 114db645ce471b3c975e64cd191dcbe91bd82d54 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 8 Sep 2021 12:50:52 +0100
Subject: [PATCH 18/54] .

---
 rapids/templates/rapids/mark.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/rapids/templates/rapids/mark.html b/rapids/templates/rapids/mark.html
index cb42bcb9..e65ce84f 100644
--- a/rapids/templates/rapids/mark.html
+++ b/rapids/templates/rapids/mark.html
@@ -10,9 +10,8 @@
 <h3>This question is normal</h3>
 Answers will be automatically marked.<br />
 
-<p>The following answers have been submitted for this question</p>
-
 {% 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 %}

From f7fbc95d57200b1c57093ff5079aa2055bbc479d Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 8 Sep 2021 12:54:28 +0100
Subject: [PATCH 19/54] .

---
 rapids/models.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rapids/models.py b/rapids/models.py
index d6e2ea9f..db9bbe00 100644
--- a/rapids/models.py
+++ b/rapids/models.py
@@ -608,7 +608,7 @@ class CidUserAnswer(models.Model):
             return 0
         # If both are normal full marks
         elif q.normal and self.normal:
-            return 1
+            return 2
 
         # Then compare answer strings (as per anatomy questions)
         ans = self.answer_compare
@@ -623,9 +623,9 @@ class CidUserAnswer(models.Model):
         mark = "unmarked"
         if marked_ans is not None:
             if marked_ans.status == Answer.MarkOptions.CORRECT:
-                mark = 1
+                mark = 2
             elif marked_ans.status == Answer.MarkOptions.HALF_MARK:
-                mark = 0.5
+                mark = 1
             elif marked_ans.status == Answer.MarkOptions.INCORRECT:
                 mark = 0
 

From 04baa060eee06792390f2b3227f2972abf17fd8f Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 8 Sep 2021 12:56:06 +0100
Subject: [PATCH 20/54] .

---
 anatomy/static/css/anatomy.css    | 12 ++++++------
 rapids/templates/rapids/mark.html |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/anatomy/static/css/anatomy.css b/anatomy/static/css/anatomy.css
index c3094a8e..16987f3a 100644
--- a/anatomy/static/css/anatomy.css
+++ b/anatomy/static/css/anatomy.css
@@ -40,7 +40,7 @@ a:link {
 }
 
 .answer-list.rapid .correct::after {
-  content: " [Score = 1]";
+  content: " [Score = 2]";
 }
 
 .answer-list .half-correct {
@@ -53,7 +53,7 @@ a:link {
 }
 
 .answer-list.rapid .half-correct::after {
-  content: " [Score = 0.5]";
+  content: " [Score = 1]";
 }
 
 .answer-list .incorrect {
@@ -377,11 +377,11 @@ img.uploading {
   color: lightblue;
 }
 
-.rapid-ans.user-answer-score-1 {
+.rapid-ans.user-answer-score-2 {
   color: lightblue;
 }
 
-.rapid-ans.user-answer-score-0\.5 {
+.rapid-ans.user-answer-score-1 {
   /* color: green; */
   color: yellow;
 }
@@ -402,11 +402,11 @@ td.user-answer-score-2::after {
   content: "✓✓";
 }
 
-td.user-answer-score-0\.5.rapid-ans::after {
+td.user-answer-score-1.rapid-ans::after {
   content: "✓";
 }
 
-td.user-answer-score-1.rapid-ans::after {
+td.user-answer-score-2.rapid-ans::after {
   content: "✓✓";
 }
 
diff --git a/rapids/templates/rapids/mark.html b/rapids/templates/rapids/mark.html
index e65ce84f..ec21e600 100644
--- a/rapids/templates/rapids/mark.html
+++ b/rapids/templates/rapids/mark.html
@@ -61,7 +61,7 @@ Region: {{ question.get_regions }}, Abnormalities: {{ question.get_abnormalities
                 </li>
                 {% endfor %}
             </ul>
-            <div class="answer-list key">Key: <span class="correct">1 Marks</span>, <span class="half-correct">0.5
+            <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 %}

From af99f6814914d2b5ecb0f7e355aa6c5a7dd664ae Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 8 Sep 2021 12:56:25 +0100
Subject: [PATCH 21/54] .

---
 static/css/anatomy.css | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/static/css/anatomy.css b/static/css/anatomy.css
index c3094a8e..16987f3a 100644
--- a/static/css/anatomy.css
+++ b/static/css/anatomy.css
@@ -40,7 +40,7 @@ a:link {
 }
 
 .answer-list.rapid .correct::after {
-  content: " [Score = 1]";
+  content: " [Score = 2]";
 }
 
 .answer-list .half-correct {
@@ -53,7 +53,7 @@ a:link {
 }
 
 .answer-list.rapid .half-correct::after {
-  content: " [Score = 0.5]";
+  content: " [Score = 1]";
 }
 
 .answer-list .incorrect {
@@ -377,11 +377,11 @@ img.uploading {
   color: lightblue;
 }
 
-.rapid-ans.user-answer-score-1 {
+.rapid-ans.user-answer-score-2 {
   color: lightblue;
 }
 
-.rapid-ans.user-answer-score-0\.5 {
+.rapid-ans.user-answer-score-1 {
   /* color: green; */
   color: yellow;
 }
@@ -402,11 +402,11 @@ td.user-answer-score-2::after {
   content: "✓✓";
 }
 
-td.user-answer-score-0\.5.rapid-ans::after {
+td.user-answer-score-1.rapid-ans::after {
   content: "✓";
 }
 
-td.user-answer-score-1.rapid-ans::after {
+td.user-answer-score-2.rapid-ans::after {
   content: "✓✓";
 }
 

From edd28310da10e1bcf5e95fd1c14e93d3faa58da1 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 8 Sep 2021 14:12:16 +0100
Subject: [PATCH 22/54] .

---
 rapids/templates/rapids/exam_scores.html | 2 +-
 rapids/views.py                          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rapids/templates/rapids/exam_scores.html b/rapids/templates/rapids/exam_scores.html
index 53d9df39..267cef6f 100644
--- a/rapids/templates/rapids/exam_scores.html
+++ b/rapids/templates/rapids/exam_scores.html
@@ -43,7 +43,7 @@
         <thead class="thead-dark">
             <tr>
                 <th>Candidate</th>
-                {% for cid in cids %}
+                <th><a href="{% url 'rapids:exam_scores_cid_user' exam.pk cid %}">{{cid}}</a></th>
                 <th>{{cid}}</th>
                 {% endfor %}
 
diff --git a/rapids/views.py b/rapids/views.py
index 289a871d..32c57667 100755
--- a/rapids/views.py
+++ b/rapids/views.py
@@ -881,7 +881,7 @@ def exam_scores_cid(request, pk):
         )
         fig_html = fig.to_html()
 
-    max_score = len(questions)
+    max_score = len(questions) * 2
 
     return render(
         request,

From 88fb982dc9ce46de6db77628e49bdcc08ba73c44 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 8 Sep 2021 14:16:55 +0100
Subject: [PATCH 23/54] .

---
 rapids/templates/rapids/exam_scores.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rapids/templates/rapids/exam_scores.html b/rapids/templates/rapids/exam_scores.html
index 267cef6f..a4de1751 100644
--- a/rapids/templates/rapids/exam_scores.html
+++ b/rapids/templates/rapids/exam_scores.html
@@ -43,8 +43,8 @@
         <thead class="thead-dark">
             <tr>
                 <th>Candidate</th>
-                <th><a href="{% url 'rapids:exam_scores_cid_user' exam.pk cid %}">{{cid}}</a></th>
-                <th>{{cid}}</th>
+                {% for cid in cids %}
+                <th><a href="{% url 'longs:exam_scores_cid_user' exam.pk cid %}">{{cid}}</a></th>
                 {% endfor %}
 
             </tr>

From a5ac0d373473c41470fe7d69e3ff42bf33f20515 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 8 Sep 2021 14:19:14 +0100
Subject: [PATCH 24/54] .

---
 rapids/templates/rapids/exam_scores.html | 2 +-
 rapids/urls.py                           | 2 +-
 rapids/views.py                          | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/rapids/templates/rapids/exam_scores.html b/rapids/templates/rapids/exam_scores.html
index a4de1751..675a814d 100644
--- a/rapids/templates/rapids/exam_scores.html
+++ b/rapids/templates/rapids/exam_scores.html
@@ -44,7 +44,7 @@
             <tr>
                 <th>Candidate</th>
                 {% for cid in cids %}
-                <th><a href="{% url 'longs:exam_scores_cid_user' exam.pk cid %}">{{cid}}</a></th>
+                <th><a href="{% url 'rapids:exam_scores_cid_user' exam.pk cid %}">{{cid}}</a></th>
                 {% endfor %}
 
             </tr>
diff --git a/rapids/urls.py b/rapids/urls.py
index 819ce93d..c8864e4a 100755
--- a/rapids/urls.py
+++ b/rapids/urls.py
@@ -56,7 +56,7 @@ urlpatterns = [
     ),
     path("exam/<int:pk>/scores", cache_page(60 * 1)(views.exam_scores_cid), name="exam_scores_cid"),
     path(
-        "exam/<int:pk>/scores/<int:sk>/",
+        "exam/<int:pk>/scores/<int:cid>/",
         views.exam_scores_cid_user,
         name="exam_scores_cid_user",
     ),
diff --git a/rapids/views.py b/rapids/views.py
index 32c57667..aba94b2e 100755
--- a/rapids/views.py
+++ b/rapids/views.py
@@ -907,11 +907,11 @@ def exam_scores_cid(request, pk):
     )
 
 
-def exam_scores_cid_user(request, pk, sk):
+def exam_scores_cid_user(request, pk, cid):
     exam = get_object_or_404(Exam, pk=pk)
 
     # TODO:Need some kind of test for cid
-    cid = sk
+    #cid = sk
 
     questions = exam.exam_questions.all()
 

From 870cff23616a463e9f9ead5b5163f163afc75c7d Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 8 Sep 2021 14:28:41 +0100
Subject: [PATCH 25/54] .

---
 longs/templates/longs/long_display_block.html       | 3 +++
 rapids/templates/rapids/question_display_block.html | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/longs/templates/longs/long_display_block.html b/longs/templates/longs/long_display_block.html
index 4f75bc26..2bd3a964 100755
--- a/longs/templates/longs/long_display_block.html
+++ b/longs/templates/longs/long_display_block.html
@@ -2,6 +2,9 @@
     <div class="date">
         {{ question.created_date|date:"d/m/Y" }}
     </div>
+    <div class="id">
+        ID: {{ question.id }}
+    </div>
     <p class="pre-whitespace"><b>Description:</b> {{ question.description }}</p>
 
     <p class="pre-whitespace"><b>History:</b> {{ question.history }}</p>
diff --git a/rapids/templates/rapids/question_display_block.html b/rapids/templates/rapids/question_display_block.html
index d9f608c7..532e6012 100755
--- a/rapids/templates/rapids/question_display_block.html
+++ b/rapids/templates/rapids/question_display_block.html
@@ -2,6 +2,9 @@
     <div class="date">
         {{ question.created_date|date:"d/m/Y" }}
     </div>
+    <div class="id">
+        ID: {{ question.id }}
+    </div>
 
     <p class="pre-whitespace"><b>Rapid:</b> {{ question }}</p>
     <p class="pre-whitespace"><b>Normal:</b> {{ question.normal }} <button id="toggle-normal-button"

From d4b30beceac406cf6be9b4b227fcad1a2e46159c Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 8 Sep 2021 14:53:40 +0100
Subject: [PATCH 26/54] .

---
 rapids/templates/rapids/question_display_block.html | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/rapids/templates/rapids/question_display_block.html b/rapids/templates/rapids/question_display_block.html
index 532e6012..784adb7e 100755
--- a/rapids/templates/rapids/question_display_block.html
+++ b/rapids/templates/rapids/question_display_block.html
@@ -1,4 +1,5 @@
 <div class="rapid {% if question.scrapped %}rapid-scrapped{% endif %}">
+    <button id="edit-button">Edit</button>
     <div class="date">
         {{ question.created_date|date:"d/m/Y" }}
     </div>
@@ -109,7 +110,16 @@
     {% endfor %}
 </details>
 <script>
+    toggleEdit() {
+        $("#toggle-button").toggle();
+    }
+
     $(document).ready(function () {
+        $("#edit-button").click(() => {
+            toggleEdit()
+        });
+
+        $(".toggle-button").hide();
 
         // send request to change the is_private state on customSwitches toggle
         $("#save-annotations").click(function () {

From 97d6fe762b95109cf931e00401c57a6869a4d09b Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 8 Sep 2021 14:54:58 +0100
Subject: [PATCH 27/54] .

---
 rapids/templates/rapids/question_display_block.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rapids/templates/rapids/question_display_block.html b/rapids/templates/rapids/question_display_block.html
index 784adb7e..494a06ac 100755
--- a/rapids/templates/rapids/question_display_block.html
+++ b/rapids/templates/rapids/question_display_block.html
@@ -110,7 +110,7 @@
     {% endfor %}
 </details>
 <script>
-    toggleEdit() {
+    function toggleEdit() {
         $("#toggle-button").toggle();
     }
 

From bc96ea0b9cece1aa9f417f7928461403f28269f6 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 8 Sep 2021 14:56:53 +0100
Subject: [PATCH 28/54] .

---
 rapids/templates/rapids/question_display_block.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rapids/templates/rapids/question_display_block.html b/rapids/templates/rapids/question_display_block.html
index 494a06ac..6c9577b3 100755
--- a/rapids/templates/rapids/question_display_block.html
+++ b/rapids/templates/rapids/question_display_block.html
@@ -110,7 +110,7 @@
     {% endfor %}
 </details>
 <script>
-    function toggleEdit() {
+    function toggleEdit {
         $("#toggle-button").toggle();
     }
 

From 4b98c87ab8fb475de6c186364ec086786eb55597 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 8 Sep 2021 14:58:14 +0100
Subject: [PATCH 29/54] .

---
 rapids/templates/rapids/question_display_block.html | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/rapids/templates/rapids/question_display_block.html b/rapids/templates/rapids/question_display_block.html
index 6c9577b3..948f157e 100755
--- a/rapids/templates/rapids/question_display_block.html
+++ b/rapids/templates/rapids/question_display_block.html
@@ -110,13 +110,10 @@
     {% endfor %}
 </details>
 <script>
-    function toggleEdit {
-        $("#toggle-button").toggle();
-    }
 
     $(document).ready(function () {
         $("#edit-button").click(() => {
-            toggleEdit()
+            $("#toggle-button").toggle();
         });
 
         $(".toggle-button").hide();

From c93cb8f368e4f94eb4d941cef5d09fa079f96d61 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 8 Sep 2021 14:59:30 +0100
Subject: [PATCH 30/54] .

---
 rapids/templates/rapids/question_display_block.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/rapids/templates/rapids/question_display_block.html b/rapids/templates/rapids/question_display_block.html
index 948f157e..a723e855 100755
--- a/rapids/templates/rapids/question_display_block.html
+++ b/rapids/templates/rapids/question_display_block.html
@@ -110,10 +110,9 @@
     {% endfor %}
 </details>
 <script>
-
     $(document).ready(function () {
         $("#edit-button").click(() => {
-            $("#toggle-button").toggle();
+            $(".toggle-button").toggle();
         });
 
         $(".toggle-button").hide();

From 2ec18d61125ef61db2820bb6f0e1d61c137fdb50 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 8 Sep 2021 15:11:09 +0100
Subject: [PATCH 31/54] .

---
 longs/views.py                                      | 12 ++++++++++++
 rapids/templates/rapids/exam_overview.html          |  4 ++++
 rapids/templates/rapids/question_display_block.html |  2 +-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/longs/views.py b/longs/views.py
index f9af2591..e0e75e16 100755
--- a/longs/views.py
+++ b/longs/views.py
@@ -468,6 +468,10 @@ class LongUpdate(RevisionMixin, LoginRequiredMixin, AuthorOrCheckerRequiredMixin
         return context
 
     def form_valid(self, form):
+        # save exam orders (there must be a better way to do this)
+        exam_orders = {}
+        for exam in self.object.exams.all():
+            exam_orders[exam] = list(exam.exam_questions.all())
 
         self.object = form.save(commit=False)
         self.object.save()
@@ -486,6 +490,14 @@ class LongUpdate(RevisionMixin, LoginRequiredMixin, AuthorOrCheckerRequiredMixin
             response = super().form_valid(form)
             series_formset.instance = self.object
             series_formset.save()
+
+            # restore exam orders
+            for exam in self.object.exams.all():
+                if exam in exam_orders and self.object in exam_orders[exam]:
+                    print(exam_orders[exam])
+                    exam.exam_questions.set(exam_orders[exam])
+                    exam.save()
+
             return response
         else:
             return super().form_invalid(form)
diff --git a/rapids/templates/rapids/exam_overview.html b/rapids/templates/rapids/exam_overview.html
index ac755ea1..b1aeac41 100644
--- a/rapids/templates/rapids/exam_overview.html
+++ b/rapids/templates/rapids/exam_overview.html
@@ -188,6 +188,10 @@
             $(this).remove();
             sortable('.sortable');
 
+            $("#full-question-list li").each((n, el) => {
+                    el.append($("<span class='exam-question-delete flex-col'>[DELETE]</span>"));
+                })
+
             $("#full-question-list").append($("<button>Save exam order</button>").click(() => {
                 new_order = [];
                 $("#full-question-list li").each((n, el) => {
diff --git a/rapids/templates/rapids/question_display_block.html b/rapids/templates/rapids/question_display_block.html
index a723e855..a6b697a4 100755
--- a/rapids/templates/rapids/question_display_block.html
+++ b/rapids/templates/rapids/question_display_block.html
@@ -1,5 +1,5 @@
 <div class="rapid {% if question.scrapped %}rapid-scrapped{% endif %}">
-    <button id="edit-button">Edit</button>
+    <button id="edit-button">Inline Edit</button>
     <div class="date">
         {{ question.created_date|date:"d/m/Y" }}
     </div>

From 5aefe4db797dde05833fe6b8c3a039d94c8bb586 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 8 Sep 2021 15:23:15 +0100
Subject: [PATCH 32/54] .

---
 rapids/templates/rapids/exam_overview.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rapids/templates/rapids/exam_overview.html b/rapids/templates/rapids/exam_overview.html
index b1aeac41..0f1c3d28 100644
--- a/rapids/templates/rapids/exam_overview.html
+++ b/rapids/templates/rapids/exam_overview.html
@@ -189,7 +189,7 @@
             sortable('.sortable');
 
             $("#full-question-list li").each((n, el) => {
-                    el.append($("<span class='exam-question-delete flex-col'>[DELETE]</span>"));
+                    $(el).append($("<span class='exam-question-delete flex-col'>[DELETE]</span>"));
                 })
 
             $("#full-question-list").append($("<button>Save exam order</button>").click(() => {

From a56898bdfd9f9f1ea3ea9bad6d72f79228c71e89 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 8 Sep 2021 15:26:39 +0100
Subject: [PATCH 33/54] .

---
 rapids/templates/rapids/exam_overview.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rapids/templates/rapids/exam_overview.html b/rapids/templates/rapids/exam_overview.html
index 0f1c3d28..3d8f7213 100644
--- a/rapids/templates/rapids/exam_overview.html
+++ b/rapids/templates/rapids/exam_overview.html
@@ -189,7 +189,7 @@
             sortable('.sortable');
 
             $("#full-question-list li").each((n, el) => {
-                    $(el).append($("<span class='exam-question-delete flex-col'>[DELETE]</span>"));
+                    $(el).append($("<span class='exam-question-delete flex-col'>[DELETE]</span>").click(() => {el.remove();}));
                 })
 
             $("#full-question-list").append($("<button>Save exam order</button>").click(() => {

From aed7bc5564b9730b78a30365bdedf762d08db010 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 8 Sep 2021 15:31:45 +0100
Subject: [PATCH 34/54] .

---
 generic/views.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/generic/views.py b/generic/views.py
index 85819e62..e7c408dc 100644
--- a/generic/views.py
+++ b/generic/views.py
@@ -321,9 +321,10 @@ class ExamViews(View, LoginRequiredMixin):
                 preserved = Case(*[When(pk=pk, then=pos) for pos, pk in enumerate(new_order)])
                 objects = self.Question.objects.filter(pk__in=new_order).order_by(preserved)
 
-                if len(objects) != exam.exam_questions.count():
-                    data = {"status": "error, count does not match"}
-                    return JsonResponse(data, status=400)
+                # We now allow deleting exam questions
+                #if len(objects) != exam.exam_questions.count():
+                #    data = {"status": "error, count does not match"}
+                #    return JsonResponse(data, status=400)
 
                 exam.exam_questions.set(objects)
                 exam.save()

From 7e3dfadf6e2f41c7a79bd5c6ea6ad129a45c3c64 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 8 Sep 2021 15:42:59 +0100
Subject: [PATCH 35/54] .

---
 longs/templates/longs/mark_answer.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/longs/templates/longs/mark_answer.html b/longs/templates/longs/mark_answer.html
index 208bd398..bce63afb 100644
--- a/longs/templates/longs/mark_answer.html
+++ b/longs/templates/longs/mark_answer.html
@@ -50,23 +50,23 @@
     <summary>User answers</summary>
     <div>
         <div class="long-answer">
-            <span class="answer-heading">User observations:</span>
+            <span class="answer-heading">Candidate observations:</span>
             <pre>{{answer.answer_observations}}</pre>
         </div>
         <div class="long-answer">
-            <span class="answer-heading">User interpretation:</span>
+            <span class="answer-heading">Candidate interpretation:</span>
             <pre>{{answer.answer_interpretation}}</pre>
         </div>
         <div class="long-answer">
-            <span class="answer-heading">User principle diagnosis:</span>
+            <span class="answer-heading">Candidate principle diagnosis:</span>
             <pre>{{answer.answer_principle_diagnosis}}</pre>
         </div>
         <div class="long-answer">
-            <span class="answer-heading">User differential diagnosis:</span>
+            <span class="answer-heading">Candidate differential diagnosis:</span>
             <pre>{{answer.answer_differential_diagnosis}}</pre>
         </div>
         <div class="long-answer">
-            <span class="answer-heading">User management:</span>
+            <span class="answer-heading">Candidate management:</span>
             <pre>{{answer.answer_management}}</pre>
         </div>
 

From d4e9899cba394cd2af47befbe47349c319736a3c Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 8 Sep 2021 15:49:25 +0100
Subject: [PATCH 36/54] .

---
 rapids/templates/rapids/exam_overview.html | 52 ++++++++++++----------
 1 file changed, 28 insertions(+), 24 deletions(-)

diff --git a/rapids/templates/rapids/exam_overview.html b/rapids/templates/rapids/exam_overview.html
index 3d8f7213..d97c6561 100644
--- a/rapids/templates/rapids/exam_overview.html
+++ b/rapids/templates/rapids/exam_overview.html
@@ -11,12 +11,12 @@
     <h1>Exam: {{ exam.name }}</h1>
     This exam has {{question_number}} questions. Time limit: {{exam.time_limit}} seconds.<br />
     <div class="parent-help" title="">
-    Normal count: {{ exam.get_normal_abnormal_breakdown }}<span
-            class="help-text">[Number of normal questions within the exam]</span>
+        Normal count: {{ exam.get_normal_abnormal_breakdown }}<span class="help-text">[Number of normal questions within
+            the exam]</span>
     </div>
     <div class="parent-help" title="">
-    Exam mode: {{ exam.exam_mode }}<span
-            class="help-text">[When true the packet will be taken as an exam (it will not self mark and results will be saved here)]</span>
+        Exam mode: {{ exam.exam_mode }}<span class="help-text">[When true the packet will be taken as an exam (it will
+            not self mark and results will be saved here)]</span>
     </div>
 
     <div class="parent-help" title="Click to enable / disable the exam">
@@ -37,24 +37,24 @@
 
         <li data-question_pk={{question.pk}}>
             <span class="flex-col">
-            <a href="{% url 'rapids:exam_question_detail' pk=exam.pk sk=forloop.counter0 %}">
-                {% for image in question.get_images %}
-                <img src="{{ image|thumbnail_url:'exam-list' }}" alt="thumbail" />
-                {% endfor %}
-            </a>
+                <a href="{% url 'rapids:exam_question_detail' pk=exam.pk sk=forloop.counter0 %}">
+                    {% for image in question.get_images %}
+                    <img src="{{ image|thumbnail_url:'exam-list' }}" alt="thumbail" />
+                    {% endfor %}
+                </a>
             </span>
             <span class="flex-col-4">
-            {% if not question.normal %}
-            <b>Abnormality:</b> {{ question.get_abnormalities }} <b>Region:</b> {{ question.get_regions }}
-            <br />
-            {{ question.get_primary_answer }}
-            {% else %}
-            <b>Normal</b>
-            {% endif %}
-            <br />
-            Examination: {{ question.get_examinations }}, <a
-                href="{% url 'rapids:question_detail' pk=question.pk %}">View</a>, <a
-                href="{% url 'rapids:mark' pk=exam.pk sk=forloop.counter0 %}">Mark</a>
+                {% if not question.normal %}
+                <b>Abnormality:</b> {{ question.get_abnormalities }} <b>Region:</b> {{ question.get_regions }}
+                <br />
+                {{ question.get_primary_answer }}
+                {% else %}
+                <b>Normal</b>
+                {% endif %}
+                <br />
+                Examination: {{ question.get_examinations }}, <a
+                    href="{% url 'rapids:question_detail' pk=question.pk %}">View</a>, <a
+                    href="{% url 'rapids:mark' pk=exam.pk sk=forloop.counter0 %}">Mark</a>
                 [id: {{question.pk}}]
             </span>
         </li>
@@ -65,7 +65,7 @@
         {{ author }},
         {% endfor %}
     </div>
-    <p><button id='button-edit-order'>Edit exam order</button></p>
+    <p><button id='button-edit-order' title='click and drag questions to change order'>Edit exam order</button></p>
     <div>
         JSON creation time: {{exam.json_creation_time}} ({{exam.json_creation_time|date:"c"}}),
         JSON creation id: {{exam.exam_json_id}}
@@ -189,10 +189,14 @@
             sortable('.sortable');
 
             $("#full-question-list li").each((n, el) => {
-                    $(el).append($("<span class='exam-question-delete flex-col'>[DELETE]</span>").click(() => {el.remove();}));
-                })
+                $(el).append($(
+                    "<span class='exam-question-delete flex-col'><button>DELETE</button></span>"
+                    ).click(() => {
+                    el.remove();
+                }));
+            })
 
-            $("#full-question-list").append($("<button>Save exam order</button>").click(() => {
+            $("#full-question-list").append($("<button title='click and drag questions to change order'>Save exam order</button>").click(() => {
                 new_order = [];
                 $("#full-question-list li").each((n, el) => {
                     new_order.push(el.dataset.question_pk)

From 50b27d3585ffd855769f008145ea4128c328f519 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 8 Sep 2021 15:58:21 +0100
Subject: [PATCH 37/54] .

---
 rapids/templates/rapids/exam_scores.html | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/rapids/templates/rapids/exam_scores.html b/rapids/templates/rapids/exam_scores.html
index 675a814d..a3367547 100644
--- a/rapids/templates/rapids/exam_scores.html
+++ b/rapids/templates/rapids/exam_scores.html
@@ -51,7 +51,13 @@
         </thead>
         {% for question in questions %}
         <tr>
-            <td><a href="{% url 'rapids:mark' pk=exam.pk sk=forloop.counter0 %}">Question {{forloop.counter}}</a></td>
+            <td><a href="{% url 'rapids:mark' pk=exam.pk sk=forloop.counter0 %}">Question {{forloop.counter}}</a> 
+            {% if question.normal %}
+               [Normal] 
+            {% else %}
+               [Abnormal] 
+            {% endif %}
+                </td>
             {% for ans, score in by_question|get_item:question %}
             <td class="rapid-ans user-answer-score-{{score}}" title="answer score: {{score}}">{{ans}}</td>
             {% endfor %}

From 3b80aff2acac072b4489f9e07bc77ad4b1815d6e Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 8 Sep 2021 16:03:57 +0100
Subject: [PATCH 38/54] .

---
 rapids/templates/rapids/exam_scores.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rapids/templates/rapids/exam_scores.html b/rapids/templates/rapids/exam_scores.html
index a3367547..9c4255bf 100644
--- a/rapids/templates/rapids/exam_scores.html
+++ b/rapids/templates/rapids/exam_scores.html
@@ -53,9 +53,9 @@
         <tr>
             <td><a href="{% url 'rapids:mark' pk=exam.pk sk=forloop.counter0 %}">Question {{forloop.counter}}</a> 
             {% if question.normal %}
-               [Normal] 
+               [N] 
             {% else %}
-               [Abnormal] 
+               [A] 
             {% endif %}
                 </td>
             {% for ans, score in by_question|get_item:question %}

From 51315a6ecf852e7e77122b4c512c8ba6262847ad Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 8 Sep 2021 16:53:52 +0100
Subject: [PATCH 39/54] .

---
 anatomy/static/css/anatomy.css               | 5 +++++
 anatomy/templates/anatomy/exam_overview.html | 4 ++--
 longs/templates/longs/exam_overview.html     | 2 +-
 rapids/templates/rapids/exam_overview.html   | 2 +-
 static/css/anatomy.css                       | 5 +++++
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/anatomy/static/css/anatomy.css b/anatomy/static/css/anatomy.css
index 16987f3a..79d733b1 100644
--- a/anatomy/static/css/anatomy.css
+++ b/anatomy/static/css/anatomy.css
@@ -699,4 +699,9 @@ input {
 .sba-answer-list .correct {
   background-color: green;
   color: white;
+}
+
+.id {
+  opacity: 50%;
+  font-size: small;
 }
\ No newline at end of file
diff --git a/anatomy/templates/anatomy/exam_overview.html b/anatomy/templates/anatomy/exam_overview.html
index b86771bb..4e64e1c0 100644
--- a/anatomy/templates/anatomy/exam_overview.html
+++ b/anatomy/templates/anatomy/exam_overview.html
@@ -33,8 +33,8 @@
             <br />
             {{ question.question_type }}: {{ question.get_primary_answer }}
             <br />
-            Modality: {{ question.modality }}, <a href="{% url 'anatomy:question_detail' pk=question.pk %}">View</a>, <a href="{% url 'anatomy:mark' pk=exam.pk sk=forloop.counter0 %}">Mark</a>
-                [id: {{question.pk}}]
+            Modality: {{ question.modality }}, <a href="{% url 'anatomy:question_detail' pk=question.pk %}">View</a>, <a href="{% url 'anatomy:mark' pk=exam.pk sk=forloop.counter0 %}">Mark</a> 
+                <span class="id">[id: {{question.pk}}]</span>
         </li>
         {% endfor %}
     </ol>
diff --git a/longs/templates/longs/exam_overview.html b/longs/templates/longs/exam_overview.html
index 2e65abbe..f26d3177 100644
--- a/longs/templates/longs/exam_overview.html
+++ b/longs/templates/longs/exam_overview.html
@@ -43,7 +43,7 @@
                     <a href="{% url 'longs:exam_question_detail' exam.id forloop.counter0 %}"
                         title="View the question">View</a> / <a href="{% url 'longs:long_update' question.id %}"
                         title="Edit the question">Edit</a>
-                        [id: {{question.pk}}]
+                        <span class="id">[id: {{question.pk}}]</span>
                 </div>
             </span>
             <span class="flex-col-3">
diff --git a/rapids/templates/rapids/exam_overview.html b/rapids/templates/rapids/exam_overview.html
index d97c6561..ab36fd27 100644
--- a/rapids/templates/rapids/exam_overview.html
+++ b/rapids/templates/rapids/exam_overview.html
@@ -55,7 +55,7 @@
                 Examination: {{ question.get_examinations }}, <a
                     href="{% url 'rapids:question_detail' pk=question.pk %}">View</a>, <a
                     href="{% url 'rapids:mark' pk=exam.pk sk=forloop.counter0 %}">Mark</a>
-                [id: {{question.pk}}]
+                <span class="id">[id: {{question.pk}}]</span>
             </span>
         </li>
         {% endfor %}
diff --git a/static/css/anatomy.css b/static/css/anatomy.css
index 16987f3a..79d733b1 100644
--- a/static/css/anatomy.css
+++ b/static/css/anatomy.css
@@ -699,4 +699,9 @@ input {
 .sba-answer-list .correct {
   background-color: green;
   color: white;
+}
+
+.id {
+  opacity: 50%;
+  font-size: small;
 }
\ No newline at end of file

From 0d3bebed9a553d6696de7b424aa90dac8c354648 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 8 Sep 2021 17:07:02 +0100
Subject: [PATCH 40/54] .

---
 longs/templates/longs/mark_answer.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/longs/templates/longs/mark_answer.html b/longs/templates/longs/mark_answer.html
index bce63afb..0bd1a2cd 100644
--- a/longs/templates/longs/mark_answer.html
+++ b/longs/templates/longs/mark_answer.html
@@ -13,7 +13,8 @@
         title="View question answers">{{question_details.current}}</a> of {{question_details.total}}</h2>
 
         {% if not next_unmarked_id and not unmarked %}
-        <div class="alert alert-info" role="alert">Success! Marking question complete. <a href="{% url 'longs:mark_overview' pk=exam.pk %}">Return to marking
+        <div class="alert alert-info" role="alert">Success! Marking question complete. Return to <a href="{% url 'longs:mark' exam.id question_details.current|add:'-1' %}">question
+            overview</a>, <a href="{% url 'longs:mark_overview' pk=exam.pk %}">marking
             overview</a></div>
 {% endif %}
 

From 48d8e177c4b3479835a8c40a3672f04b52bf20e2 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 8 Sep 2021 17:13:29 +0100
Subject: [PATCH 41/54] .

---
 longs/templates/longs/mark_answer.html |  2 +-
 longs/urls.py                          |  2 +-
 longs/views.py                         | 15 +++++++++------
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/longs/templates/longs/mark_answer.html b/longs/templates/longs/mark_answer.html
index 0bd1a2cd..2a7f0e9f 100644
--- a/longs/templates/longs/mark_answer.html
+++ b/longs/templates/longs/mark_answer.html
@@ -13,7 +13,7 @@
         title="View question answers">{{question_details.current}}</a> of {{question_details.total}}</h2>
 
         {% if not next_unmarked_id and not unmarked %}
-        <div class="alert alert-info" role="alert">Success! Marking question complete. Return to <a href="{% url 'longs:mark' exam.id question_details.current|add:'-1' %}">question
+        <div class="alert alert-info" role="alert">Success! Marking question complete. <br/>Return to <a href="{% url 'longs:mark' exam.id question_details.current|add:'-1' %}">question
             overview</a>, <a href="{% url 'longs:mark_overview' pk=exam.pk %}">marking
             overview</a></div>
 {% endif %}
diff --git a/longs/urls.py b/longs/urls.py
index 52b76b74..0295f549 100755
--- a/longs/urls.py
+++ b/longs/urls.py
@@ -61,7 +61,7 @@ urlpatterns = [
     # path("all_questions/", views.all_questions, name="all_questions"),
     path("question/<int:pk>/scrap", views.long_scrap, name="long_scrap"),
     path("question/<int:pk>/delete", views.LongDelete.as_view(), name="long_delete"),
-    path("exam/<int:pk>/<int:sk>/<int:tk>/mark", views.mark_answer, name="mark_answer"),
+    path("exam/<int:pk>/<int:sk>/<int:cid>/mark", views.mark_answer, name="mark_answer"),
     path("exam/<int:pk>/<int:sk>/mark", views.mark, name="mark"),
     path("exam/<int:pk>/mark", views.LongExamViews.mark_overview, name="mark_overview"),
     #     path("exam/<int:pk>/<int:sk>/", views.exam_take, name="exam_take"),
diff --git a/longs/views.py b/longs/views.py
index e0e75e16..d736e3ba 100755
--- a/longs/views.py
+++ b/longs/views.py
@@ -651,7 +651,7 @@ def loadJsonAnswer(answer):
 @login_required
 @user_is_long_marker
 @reversion.create_revision()
-def mark_answer(request, pk, sk, tk):
+def mark_answer(request, pk, sk, cid):
     exam = get_object_or_404(Exam, pk=pk)
 
     questions = exam.exam_questions.all()
@@ -668,15 +668,18 @@ def mark_answer(request, pk, sk, tk):
     except IndexError:
         raise Http404("Exam question does not exist")
 
+
+    question.cid_user_answers.filter(exam__id=pk).values_list("cid", flat=True)
+
     try:
-        answer = question.cid_user_answers.get(cid=tk, exam__id=pk)
+        answer = question.cid_user_answers.get(cid=cid, exam__id=pk)
     except ObjectDoesNotExist:
         raise Http404("User answer does not exist")
 
     try:
         unmarked = question.get_unmarked_answers()
         next_unmarked_id = unmarked[0].cid
-        if next_unmarked_id == tk:
+        if next_unmarked_id == cid:
             next_unmarked_id = unmarked[1].cid
     except IndexError:
         next_unmarked_id = False
@@ -689,16 +692,16 @@ def mark_answer(request, pk, sk, tk):
             # If skip button is pressed skip the question without marking
             # Skip is problematic if we skip to the next unmarked answer
             #if "skip" in request.POST:
-            #    return redirect("longs:mark_answer", pk=pk, sk=sk, tk=next_unmarked_id)
+            #    return redirect("longs:mark_answer", pk=pk, sk=sk, cid=next_unmarked_id)
 
             # Extract score from form and save it to the object
             answer.score = form.cleaned_data["score"]
             answer.save()
 
             if "next" in request.POST:
-                return redirect("longs:mark_answer", pk=pk, sk=sk, tk=next_unmarked_id)
+                return redirect("longs:mark_answer", pk=pk, sk=sk, cid=next_unmarked_id)
             if "save" in request.POST:
-                return redirect("longs:mark_answer", pk=pk, sk=sk, tk=tk)
+                return redirect("longs:mark_answer", pk=pk, sk=sk, cid=cid)
             #elif "previous" in request.POST:
             #    return redirect("longs:mark", pk=pk, sk=n - 1)
 

From 56f74d6c2e5ed75d5d77bee7a12ce880e9223c37 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 8 Sep 2021 17:22:16 +0100
Subject: [PATCH 42/54] .

---
 longs/templates/longs/mark_answer.html |  9 ++++++++-
 longs/views.py                         | 15 ++++++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/longs/templates/longs/mark_answer.html b/longs/templates/longs/mark_answer.html
index 2a7f0e9f..f751ccbe 100644
--- a/longs/templates/longs/mark_answer.html
+++ b/longs/templates/longs/mark_answer.html
@@ -15,7 +15,14 @@
         {% if not next_unmarked_id and not unmarked %}
         <div class="alert alert-info" role="alert">Success! Marking question complete. <br/>Return to <a href="{% url 'longs:mark' exam.id question_details.current|add:'-1' %}">question
             overview</a>, <a href="{% url 'longs:mark_overview' pk=exam.pk %}">marking
-            overview</a></div>
+            overview</a><br/>
+            {% if previous_cid %}
+            <a href="{% url 'longs:mark_answer' pk=exam.pk sk=question_details.current cid=previous_cid %}">Previous candidate</a>
+            {% endif %}
+            {% if next_cid %}
+            <a href="{% url 'longs:mark_answer' pk=exam.pk sk=question_details.current cid=next_cid %}">Next candidate</a>
+            {% endif %}
+            </div>
 {% endif %}
 
 <span>Marking CID: {{answer.cid}} ({{unmarked|length}} answer(s) left to mark)</span>
diff --git a/longs/views.py b/longs/views.py
index d736e3ba..58d507f7 100755
--- a/longs/views.py
+++ b/longs/views.py
@@ -669,13 +669,24 @@ def mark_answer(request, pk, sk, cid):
         raise Http404("Exam question does not exist")
 
 
-    question.cid_user_answers.filter(exam__id=pk).values_list("cid", flat=True)
+    cid_list = question.cid_user_answers.filter(exam__id=pk).values_list("cid", flat=True)
 
     try:
         answer = question.cid_user_answers.get(cid=cid, exam__id=pk)
     except ObjectDoesNotExist:
         raise Http404("User answer does not exist")
 
+    previous_cid = False
+    next_cid = False
+
+    if cid_list[0] == cid:
+        next_cid = cid_list[1]
+    elif cid_list[-1] == cid:
+        previous_cid = cid_list[-2]
+    else:
+        next_cid = cid_list[cid_list.index(cid)+1]
+        previous_cid = cid_list[cid_list.index(cid)-1]
+
     try:
         unmarked = question.get_unmarked_answers()
         next_unmarked_id = unmarked[0].cid
@@ -720,6 +731,8 @@ def mark_answer(request, pk, sk, cid):
             "question_details": question_details,
             "next_unmarked_id": next_unmarked_id,
             "unmarked": unmarked,
+            "previous_cid": previous_cid,
+            "next_cid": next_cid,
         },
     )
 

From dc382d15f27f77ea0d87a82bf2f932605944e107 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 8 Sep 2021 17:23:16 +0100
Subject: [PATCH 43/54] .

---
 longs/templates/longs/mark_answer.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/longs/templates/longs/mark_answer.html b/longs/templates/longs/mark_answer.html
index f751ccbe..e9b71335 100644
--- a/longs/templates/longs/mark_answer.html
+++ b/longs/templates/longs/mark_answer.html
@@ -17,10 +17,10 @@
             overview</a>, <a href="{% url 'longs:mark_overview' pk=exam.pk %}">marking
             overview</a><br/>
             {% if previous_cid %}
-            <a href="{% url 'longs:mark_answer' pk=exam.pk sk=question_details.current cid=previous_cid %}">Previous candidate</a>
+            <a href="{% url 'longs:mark_answer' pk=exam.pk sk=question_details.current|add:'-1' cid=previous_cid %}">Previous candidate</a>
             {% endif %}
             {% if next_cid %}
-            <a href="{% url 'longs:mark_answer' pk=exam.pk sk=question_details.current cid=next_cid %}">Next candidate</a>
+            <a href="{% url 'longs:mark_answer' pk=exam.pk sk=question_details.current|add:'-1' cid=next_cid %}">Next candidate</a>
             {% endif %}
             </div>
 {% endif %}

From 30c701f6b349e62b77a0bab2592c27cc1bbc4a51 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 8 Sep 2021 17:25:56 +0100
Subject: [PATCH 44/54] .

---
 longs/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/longs/views.py b/longs/views.py
index 58d507f7..6adf724f 100755
--- a/longs/views.py
+++ b/longs/views.py
@@ -669,7 +669,7 @@ def mark_answer(request, pk, sk, cid):
         raise Http404("Exam question does not exist")
 
 
-    cid_list = question.cid_user_answers.filter(exam__id=pk).values_list("cid", flat=True)
+    cid_list = list(question.cid_user_answers.filter(exam__id=pk).values_list("cid", flat=True))
 
     try:
         answer = question.cid_user_answers.get(cid=cid, exam__id=pk)

From d375ab4a09a05542359e62fc03a948a5f471a860 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 8 Sep 2021 18:15:08 +0100
Subject: [PATCH 45/54] .

---
 anatomy/static/css/anatomy.css         |  4 ++++
 longs/templates/longs/mark_answer.html | 32 +++++++++++++++++---------
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/anatomy/static/css/anatomy.css b/anatomy/static/css/anatomy.css
index 79d733b1..a653bf86 100644
--- a/anatomy/static/css/anatomy.css
+++ b/anatomy/static/css/anatomy.css
@@ -704,4 +704,8 @@ input {
 .id {
   opacity: 50%;
   font-size: small;
+}
+
+.sticky-alert {
+  position: sticky;
 }
\ No newline at end of file
diff --git a/longs/templates/longs/mark_answer.html b/longs/templates/longs/mark_answer.html
index e9b71335..2eef7b48 100644
--- a/longs/templates/longs/mark_answer.html
+++ b/longs/templates/longs/mark_answer.html
@@ -12,17 +12,20 @@
 <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>
 
-        {% if not next_unmarked_id and not unmarked %}
-        <div class="alert alert-info" role="alert">Success! Marking question complete. <br/>Return to <a href="{% url 'longs:mark' exam.id question_details.current|add:'-1' %}">question
-            overview</a>, <a href="{% url 'longs:mark_overview' pk=exam.pk %}">marking
-            overview</a><br/>
-            {% if previous_cid %}
-            <a href="{% url 'longs:mark_answer' pk=exam.pk sk=question_details.current|add:'-1' cid=previous_cid %}">Previous candidate</a>
-            {% endif %}
-            {% if next_cid %}
-            <a href="{% url 'longs:mark_answer' pk=exam.pk sk=question_details.current|add:'-1' cid=next_cid %}">Next candidate</a>
-            {% endif %}
-            </div>
+{% if not next_unmarked_id and not unmarked %}
+<div class="alert alert-info stick-alert" role="alert">Success! Marking question complete. <br />Return to <a
+        href="{% url 'longs:mark' exam.id question_details.current|add:'-1' %}">question
+        overview</a>, <a href="{% url 'longs:mark_overview' pk=exam.pk %}">marking
+        overview</a><br />
+    {% if previous_cid %}
+    <a href="{% url 'longs:mark_answer' pk=exam.pk sk=question_details.current|add:'-1' cid=previous_cid %}">Previous
+        candidate</a>
+    {% endif %}
+    {% if next_cid %}
+    <a href="{% url 'longs:mark_answer' pk=exam.pk sk=question_details.current|add:'-1' cid=next_cid %}">Next
+        candidate</a>
+    {% endif %}
+</div>
 {% endif %}
 
 <span>Marking CID: {{answer.cid}} ({{unmarked|length}} answer(s) left to mark)</span>
@@ -96,4 +99,11 @@
         {% endif %}
     </form>
 </div>
+{% if previous_cid %}
+<a href="{% url 'longs:mark_answer' pk=exam.pk sk=question_details.current|add:'-1' cid=previous_cid %}">Previous
+    candidate</a>
+{% endif %}
+{% if next_cid %}
+<a href="{% url 'longs:mark_answer' pk=exam.pk sk=question_details.current|add:'-1' cid=next_cid %}">Next candidate</a>
+{% endif %}
 {% endblock %}
\ No newline at end of file

From eca11e0be1dc4e37d670b307eb8ef2953fe23193 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 8 Sep 2021 18:16:32 +0100
Subject: [PATCH 46/54] .

---
 longs/views.py         | 5 ++---
 static/css/anatomy.css | 4 ++++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/longs/views.py b/longs/views.py
index 6adf724f..412b4733 100755
--- a/longs/views.py
+++ b/longs/views.py
@@ -668,14 +668,13 @@ def mark_answer(request, pk, sk, cid):
     except IndexError:
         raise Http404("Exam question does not exist")
 
-
-    cid_list = list(question.cid_user_answers.filter(exam__id=pk).values_list("cid", flat=True))
-
     try:
         answer = question.cid_user_answers.get(cid=cid, exam__id=pk)
     except ObjectDoesNotExist:
         raise Http404("User answer does not exist")
 
+    cid_list = list(question.cid_user_answers.filter(exam__id=pk).values_list("cid", flat=True))
+
     previous_cid = False
     next_cid = False
 
diff --git a/static/css/anatomy.css b/static/css/anatomy.css
index 79d733b1..a653bf86 100644
--- a/static/css/anatomy.css
+++ b/static/css/anatomy.css
@@ -704,4 +704,8 @@ input {
 .id {
   opacity: 50%;
   font-size: small;
+}
+
+.sticky-alert {
+  position: sticky;
 }
\ No newline at end of file

From afc2746a70189788f7632d727e9f0d469e214950 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 8 Sep 2021 18:18:12 +0100
Subject: [PATCH 47/54] .

---
 longs/templates/longs/mark_answer.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/longs/templates/longs/mark_answer.html b/longs/templates/longs/mark_answer.html
index 2eef7b48..f23fafa0 100644
--- a/longs/templates/longs/mark_answer.html
+++ b/longs/templates/longs/mark_answer.html
@@ -13,7 +13,7 @@
         title="View question answers">{{question_details.current}}</a> of {{question_details.total}}</h2>
 
 {% if not next_unmarked_id and not unmarked %}
-<div class="alert alert-info stick-alert" role="alert">Success! Marking question complete. <br />Return to <a
+<div class="alert alert-info sticky-alert" role="alert">Success! Marking question complete. <br />Return to <a
         href="{% url 'longs:mark' exam.id question_details.current|add:'-1' %}">question
         overview</a>, <a href="{% url 'longs:mark_overview' pk=exam.pk %}">marking
         overview</a><br />

From 54ff4490d9df94865b3668ccd924adde03c1766c Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 8 Sep 2021 18:53:41 +0100
Subject: [PATCH 48/54] .

---
 anatomy/models.py                            | 22 +++++++-----
 anatomy/static/css/anatomy.css               |  1 +
 anatomy/templates/anatomy/mark_overview.html |  6 ++--
 generic/views.py                             |  6 +++-
 longs/models.py                              | 16 ++++++---
 longs/templates/longs/mark_overview.html     |  8 ++---
 rapids/models.py                             | 35 +++++++++++++-------
 rapids/templates/rapids/mark_overview.html   |  6 ++--
 8 files changed, 65 insertions(+), 35 deletions(-)

diff --git a/anatomy/models.py b/anatomy/models.py
index ef528a0b..9a7cdc67 100644
--- a/anatomy/models.py
+++ b/anatomy/models.py
@@ -157,8 +157,8 @@ class AnatomyQuestion(models.Model):
         exams = ", ".join(e)
         return exams
 
-    def get_unmarked_answer_string(self):
-        unmarked_answers = self.get_unmarked_answers()
+    def get_unmarked_answer_string(self, exam_pk=None):
+        unmarked_answers = self.get_unmarked_answers(exam_pk)
 
         if not unmarked_answers:
             return "No answers to mark"
@@ -168,16 +168,22 @@ class AnatomyQuestion(models.Model):
             )
         )
 
-    def get_unmarked_answers(self):
-        user_answers = set(
-            [i.answer_compare for i in self.cid_user_answers.all()]
-        )
+    def get_unmarked_answers(self, exam_pk=None):
+        if exam_pk is None:
+            user_answers = set(
+                [i.answer_compare for i in self.cid_user_answers.all()]
+            )
+        else:
+            user_answers = set(
+                [i.answer_compare for i in self.cid_user_answers.filter(exam__id=exam_pk)]
+            )
+
         unmarked_answers = user_answers - self.get_marked_answers()
 
         return unmarked_answers
 
-    def get_unmarked_answer_count(self):
-        return len(self.get_unmarked_answers())
+    def get_unmarked_answer_count(self, exam_pk=None):
+        return len(self.get_unmarked_answers(exam_pk))
 
     def get_marked_answers(self):
         return set(
diff --git a/anatomy/static/css/anatomy.css b/anatomy/static/css/anatomy.css
index a653bf86..b3b12bc5 100644
--- a/anatomy/static/css/anatomy.css
+++ b/anatomy/static/css/anatomy.css
@@ -708,4 +708,5 @@ input {
 
 .sticky-alert {
   position: sticky;
+  top: 5px;
 }
\ No newline at end of file
diff --git a/anatomy/templates/anatomy/mark_overview.html b/anatomy/templates/anatomy/mark_overview.html
index 95afc5bd..ec2e41ba 100644
--- a/anatomy/templates/anatomy/mark_overview.html
+++ b/anatomy/templates/anatomy/mark_overview.html
@@ -11,9 +11,9 @@
     <div id="stark-marking-button"><a href="{% url 'anatomy:mark' pk=exam.pk sk=0 %}"><button>Click here to start marking</button></a></div>
 
     <ul id="question-mark-list">
-        {% for question in questions.all %}
-        <li data-markcount={{question.get_unmarked_answer_count}}><a href="{% url 'anatomy:mark' pk=exam.pk sk=forloop.counter0 %}">Question {{forloop.counter }}:
-                {{ question }}</a><br /> {{ question.get_unmarked_answer_string }}</li>
+        {% for question, unmarked_count in question_unmarked_map %}
+        <li data-markcount={{unmarked_count}}><a href="{% url 'anatomy:mark' pk=exam.pk sk=forloop.counter0 %}">Question {{forloop.counter }}:
+                {{ question }}</a><br /> {{ unmarked_count }}</li>
         {% endfor %}
     </ul>
 </div>
diff --git a/generic/views.py b/generic/views.py
index e7c408dc..f1814ce1 100644
--- a/generic/views.py
+++ b/generic/views.py
@@ -367,9 +367,13 @@ class ExamViews(View, LoginRequiredMixin):
 
         questions = exam.exam_questions.all()
 
+        question_unmarked_map = []
+        for q in questions:
+            question_unmarked_map.append((q, q.get_unmarked_answer_count()))
+
         # TODO: fix showing unmarked answer count from other exams...
         return render(
-            request, "{}/mark_overview.html".format(self.app_name), {"exam": exam, "questions": questions}
+            request, "{}/mark_overview.html".format(self.app_name), {"exam": exam, "question_unmarked_map": question_unmarked_map}
         )
 
     @method_decorator(login_required)
diff --git a/longs/models.py b/longs/models.py
index db6295f7..7bf977ab 100644
--- a/longs/models.py
+++ b/longs/models.py
@@ -175,12 +175,20 @@ class Long(models.Model):
     def get_image_url_array(self):
         return json.dumps(["https://www.penracourses.org.uk{}".format(i.url) for i in self.get_images()])
 
-    def get_unmarked_answer_count(self):
-        answers = self.cid_user_answers.all()
+    def get_unmarked_answer_count(self, exam_pk=None):
+        if exam_pk is None:
+            answers = self.cid_user_answers.all()
+        else:
+            answers = self.cid_user_answers.filter(exam__id=exam_pk)
+
         return len([ans for ans in answers if not ans.is_marked()])
 
-    def get_unmarked_answers(self):
-        answers = self.cid_user_answers.all()
+    def get_unmarked_answers(self, exam_pk=None):
+        if exam_pk is None:
+            answers = self.cid_user_answers.all()
+        else:
+            answers = self.cid_user_answers.filter(exam__id=exam_pk)
+        
         return [ans for ans in answers if not ans.is_marked()]
 
     def get_question_json(self, based=True):
diff --git a/longs/templates/longs/mark_overview.html b/longs/templates/longs/mark_overview.html
index 609c63c4..cb89d79b 100644
--- a/longs/templates/longs/mark_overview.html
+++ b/longs/templates/longs/mark_overview.html
@@ -11,11 +11,11 @@
     <div id="stark-marking-button"><a href="{% url 'longs:mark' pk=exam.pk sk=0 %}"><button>Click here to start marking</button></a></div>
 
     <ul id="question-mark-list">
-        {% for question in questions.all %}
-        <li data-markcount={{question.get_unmarked_answer_count}} 
-        {% if question.get_unmarked_answer_count %}class="unmarked" {% endif %}
+        {% for question, unmarked_count in question_unmarked_map %}
+        <li data-markcount={{unmarked_count}} 
+        {% if unmarked_count %}class="unmarked" {% endif %}
             ><a href="{% url 'longs:mark' pk=exam.pk sk=forloop.counter0 %}">Question {{forloop.counter }}:
-                {{ question }}</a><br /> Answers to mark: {{question.get_unmarked_answer_count}}</li>
+                {{ question }}</a><br /> Answers to mark: {{unmarked_count}}</li>
         {% endfor %}
     </ul>
 </div>
diff --git a/rapids/models.py b/rapids/models.py
index db9bbe00..cec0dc96 100644
--- a/rapids/models.py
+++ b/rapids/models.py
@@ -231,8 +231,8 @@ class Rapid(models.Model):
         exams = ", ".join(e)
         return exams
 
-    def get_unmarked_answer_string(self):
-        unmarked_answers = self.get_unmarked_answers()
+    def get_unmarked_answer_string(self, exam_pk=None):
+        unmarked_answers = self.get_unmarked_answers(exam_pk)
 
         if not unmarked_answers:
             return "No answers to mark"
@@ -242,25 +242,36 @@ class Rapid(models.Model):
             )
         )
 
-    def get_unmarked_answers(self):
+    def get_unmarked_answers(self, exam_pk=None):
         # If normal no answers to mark
         if self.normal:
             return []
 
-        user_answers = set(
-            [i.answer_compare for i in self.cid_user_answers.all() if i.normal == False]
-        )
+        if exam_pk is None:
+            user_answers = set(
+                [i.answer_compare for i in self.cid_user_answers.all() if i.normal == False]
+            )
+        else:
+            user_answers = set(
+                [i.answer_compare for i in self.cid_user_answers.filter(exam__id=exam_pk) if i.normal == False]
+            )
+
         unmarked_answers = user_answers - self.get_marked_answers()
 
         return unmarked_answers
 
-    def get_unmarked_answer_count(self):
-        return len(self.get_unmarked_answers())
+    def get_unmarked_answer_count(self, exam_pk=None):
+        return len(self.get_unmarked_answers(exam_pk))
 
-    def get_user_answers(self):
-        user_answers = set(
-            [i.answer_compare for i in self.cid_user_answers.all()]
-        )
+    def get_user_answers(self, exam_pk=None):
+        if exam_pk is None:
+            user_answers = set(
+                [i.answer_compare for i in self.cid_user_answers.all()]
+            )
+        else:
+            user_answers = set(
+                [i.answer_compare for i in self.cid_user_answers.filter(exam__id=exam_pk)]
+            )
 
         return user_answers
 
diff --git a/rapids/templates/rapids/mark_overview.html b/rapids/templates/rapids/mark_overview.html
index f6bc4ed1..f1b02917 100644
--- a/rapids/templates/rapids/mark_overview.html
+++ b/rapids/templates/rapids/mark_overview.html
@@ -11,9 +11,9 @@
     <div id="stark-marking-button"><a href="{% url 'rapids:mark' pk=exam.pk sk=0 %}"><button>Click here to start marking</button></a></div>
 
     <ul id="question-mark-list">
-        {% for question in questions.all %}
-        <li data-markcount={{question.get_unmarked_answer_count}}><a href="{% url 'rapids:mark' pk=exam.pk sk=forloop.counter0 %}">Question {{forloop.counter }}:
-                {{ question }}</a><br /> {{ question.get_unmarked_answer_string }}</li>
+        {% for question, unmarked_count in question_unmarked_map %}
+        <li data-markcount={{unmarked_count}}><a href="{% url 'rapids:mark' pk=exam.pk sk=forloop.counter0 %}">Question {{forloop.counter }}:
+                {{ question }}</a><br /> {{unmarked_count}}</li>
         {% endfor %}
     </ul>
 </div>

From 0cdc0e1f88b586a198c3ea74a5db3606569cbc9c Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 8 Sep 2021 19:12:43 +0100
Subject: [PATCH 49/54] .

---
 anatomy/templates/anatomy/mark_overview.html | 2 +-
 generic/views.py                             | 2 +-
 rapids/templates/rapids/mark_overview.html   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/anatomy/templates/anatomy/mark_overview.html b/anatomy/templates/anatomy/mark_overview.html
index ec2e41ba..16f862de 100644
--- a/anatomy/templates/anatomy/mark_overview.html
+++ b/anatomy/templates/anatomy/mark_overview.html
@@ -13,7 +13,7 @@
     <ul id="question-mark-list">
         {% for question, unmarked_count in question_unmarked_map %}
         <li data-markcount={{unmarked_count}}><a href="{% url 'anatomy:mark' pk=exam.pk sk=forloop.counter0 %}">Question {{forloop.counter }}:
-                {{ question }}</a><br /> {{ unmarked_count }}</li>
+                {{ question }}</a><br />Unmarked answers:  {{ unmarked_count }}</li>
         {% endfor %}
     </ul>
 </div>
diff --git a/generic/views.py b/generic/views.py
index f1814ce1..e3e66c87 100644
--- a/generic/views.py
+++ b/generic/views.py
@@ -369,7 +369,7 @@ class ExamViews(View, LoginRequiredMixin):
 
         question_unmarked_map = []
         for q in questions:
-            question_unmarked_map.append((q, q.get_unmarked_answer_count()))
+            question_unmarked_map.append((q, int(q.get_unmarked_answer_count())))
 
         # TODO: fix showing unmarked answer count from other exams...
         return render(
diff --git a/rapids/templates/rapids/mark_overview.html b/rapids/templates/rapids/mark_overview.html
index f1b02917..1340307f 100644
--- a/rapids/templates/rapids/mark_overview.html
+++ b/rapids/templates/rapids/mark_overview.html
@@ -13,7 +13,7 @@
     <ul id="question-mark-list">
         {% for question, unmarked_count in question_unmarked_map %}
         <li data-markcount={{unmarked_count}}><a href="{% url 'rapids:mark' pk=exam.pk sk=forloop.counter0 %}">Question {{forloop.counter }}:
-                {{ question }}</a><br /> {{unmarked_count}}</li>
+                {{ question }}</a><br />Unmarked answers: {{unmarked_count}}</li>
         {% endfor %}
     </ul>
 </div>

From 098f2975b7f9982eb5a2d4a04e850a26fac5dc3d Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 8 Sep 2021 19:15:24 +0100
Subject: [PATCH 50/54] .

---
 generic/views.py                           | 2 +-
 rapids/templates/rapids/mark_overview.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/generic/views.py b/generic/views.py
index e3e66c87..f1814ce1 100644
--- a/generic/views.py
+++ b/generic/views.py
@@ -369,7 +369,7 @@ class ExamViews(View, LoginRequiredMixin):
 
         question_unmarked_map = []
         for q in questions:
-            question_unmarked_map.append((q, int(q.get_unmarked_answer_count())))
+            question_unmarked_map.append((q, q.get_unmarked_answer_count()))
 
         # TODO: fix showing unmarked answer count from other exams...
         return render(
diff --git a/rapids/templates/rapids/mark_overview.html b/rapids/templates/rapids/mark_overview.html
index 1340307f..856d92e3 100644
--- a/rapids/templates/rapids/mark_overview.html
+++ b/rapids/templates/rapids/mark_overview.html
@@ -12,7 +12,7 @@
 
     <ul id="question-mark-list">
         {% for question, unmarked_count in question_unmarked_map %}
-        <li data-markcount={{unmarked_count}}><a href="{% url 'rapids:mark' pk=exam.pk sk=forloop.counter0 %}">Question {{forloop.counter }}:
+        <li data-markcount={{unmarked_count|floatformat:"0"}}><a href="{% url 'rapids:mark' pk=exam.pk sk=forloop.counter0 %}">Question {{forloop.counter }}:
                 {{ question }}</a><br />Unmarked answers: {{unmarked_count}}</li>
         {% endfor %}
     </ul>

From d5820535e98d1fcf62ff8928caf9b2884aa440d2 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 8 Sep 2021 19:16:34 +0100
Subject: [PATCH 51/54] .

---
 generic/views.py                           | 2 +-
 rapids/templates/rapids/mark_overview.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/generic/views.py b/generic/views.py
index f1814ce1..e3e66c87 100644
--- a/generic/views.py
+++ b/generic/views.py
@@ -369,7 +369,7 @@ class ExamViews(View, LoginRequiredMixin):
 
         question_unmarked_map = []
         for q in questions:
-            question_unmarked_map.append((q, q.get_unmarked_answer_count()))
+            question_unmarked_map.append((q, int(q.get_unmarked_answer_count())))
 
         # TODO: fix showing unmarked answer count from other exams...
         return render(
diff --git a/rapids/templates/rapids/mark_overview.html b/rapids/templates/rapids/mark_overview.html
index 856d92e3..1340307f 100644
--- a/rapids/templates/rapids/mark_overview.html
+++ b/rapids/templates/rapids/mark_overview.html
@@ -12,7 +12,7 @@
 
     <ul id="question-mark-list">
         {% for question, unmarked_count in question_unmarked_map %}
-        <li data-markcount={{unmarked_count|floatformat:"0"}}><a href="{% url 'rapids:mark' pk=exam.pk sk=forloop.counter0 %}">Question {{forloop.counter }}:
+        <li data-markcount={{unmarked_count}}><a href="{% url 'rapids:mark' pk=exam.pk sk=forloop.counter0 %}">Question {{forloop.counter }}:
                 {{ question }}</a><br />Unmarked answers: {{unmarked_count}}</li>
         {% endfor %}
     </ul>

From 6a3b0906f1c2fdb9fffb4e27569f7bfbe4edfe71 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 8 Sep 2021 19:20:48 +0100
Subject: [PATCH 52/54] .

---
 rapids/templates/rapids/mark_overview.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rapids/templates/rapids/mark_overview.html b/rapids/templates/rapids/mark_overview.html
index 1340307f..143c1398 100644
--- a/rapids/templates/rapids/mark_overview.html
+++ b/rapids/templates/rapids/mark_overview.html
@@ -12,7 +12,7 @@
 
     <ul id="question-mark-list">
         {% for question, unmarked_count in question_unmarked_map %}
-        <li data-markcount={{unmarked_count}}><a href="{% url 'rapids:mark' pk=exam.pk sk=forloop.counter0 %}">Question {{forloop.counter }}:
+        <li data-markcount={{unmarked_count|add:"0"}}><a href="{% url 'rapids:mark' pk=exam.pk sk=forloop.counter0 %}">Question {{forloop.counter }}:
                 {{ question }}</a><br />Unmarked answers: {{unmarked_count}}</li>
         {% endfor %}
     </ul>

From 160e4914cacc3a958d6733d1c134d28e2bed1c4c Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Thu, 9 Sep 2021 07:43:01 +0100
Subject: [PATCH 53/54] .

---
 anatomy/static/js/anatomy.js               | 5 ++---
 rapids/templates/rapids/mark_overview.html | 2 +-
 static/css/anatomy.css                     | 1 +
 static/js/anatomy.js                       | 5 ++---
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/anatomy/static/js/anatomy.js b/anatomy/static/js/anatomy.js
index 477e3fc0..aa1bd713 100644
--- a/anatomy/static/js/anatomy.js
+++ b/anatomy/static/js/anatomy.js
@@ -59,10 +59,9 @@ $(document).ready(function () {
       $("#question-mark-list li").show();
     });
     $(".show-unmarked-button").click(() => {
-      console.log("TESTIG");
       $("#question-mark-list li").each((n, el) => {
-        console.log(el);
-        if (el.dataset.markcount < 1) { $(el).hide(); }
+        // Can't seem to get django to output this as a int....
+        if (parseInt(el.dataset.markcount) < 1) { $(el).hide(); }
       })
     });
 
diff --git a/rapids/templates/rapids/mark_overview.html b/rapids/templates/rapids/mark_overview.html
index 143c1398..1340307f 100644
--- a/rapids/templates/rapids/mark_overview.html
+++ b/rapids/templates/rapids/mark_overview.html
@@ -12,7 +12,7 @@
 
     <ul id="question-mark-list">
         {% for question, unmarked_count in question_unmarked_map %}
-        <li data-markcount={{unmarked_count|add:"0"}}><a href="{% url 'rapids:mark' pk=exam.pk sk=forloop.counter0 %}">Question {{forloop.counter }}:
+        <li data-markcount={{unmarked_count}}><a href="{% url 'rapids:mark' pk=exam.pk sk=forloop.counter0 %}">Question {{forloop.counter }}:
                 {{ question }}</a><br />Unmarked answers: {{unmarked_count}}</li>
         {% endfor %}
     </ul>
diff --git a/static/css/anatomy.css b/static/css/anatomy.css
index a653bf86..b3b12bc5 100644
--- a/static/css/anatomy.css
+++ b/static/css/anatomy.css
@@ -708,4 +708,5 @@ input {
 
 .sticky-alert {
   position: sticky;
+  top: 5px;
 }
\ No newline at end of file
diff --git a/static/js/anatomy.js b/static/js/anatomy.js
index 477e3fc0..aa1bd713 100644
--- a/static/js/anatomy.js
+++ b/static/js/anatomy.js
@@ -59,10 +59,9 @@ $(document).ready(function () {
       $("#question-mark-list li").show();
     });
     $(".show-unmarked-button").click(() => {
-      console.log("TESTIG");
       $("#question-mark-list li").each((n, el) => {
-        console.log(el);
-        if (el.dataset.markcount < 1) { $(el).hide(); }
+        // Can't seem to get django to output this as a int....
+        if (parseInt(el.dataset.markcount) < 1) { $(el).hide(); }
       })
     });
 

From 2b3904b5e0a2b48f446f2edb7f2a21286cb0ec7c Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Thu, 9 Sep 2021 07:48:03 +0100
Subject: [PATCH 54/54] .

---
 anatomy/templates/anatomy/mark_overview.html |  2 +-
 longs/templates/longs/mark_overview.html     | 10 +++++-----
 rapids/templates/rapids/mark_overview.html   |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/anatomy/templates/anatomy/mark_overview.html b/anatomy/templates/anatomy/mark_overview.html
index 16f862de..28e903d4 100644
--- a/anatomy/templates/anatomy/mark_overview.html
+++ b/anatomy/templates/anatomy/mark_overview.html
@@ -12,7 +12,7 @@
 
     <ul id="question-mark-list">
         {% for question, unmarked_count in question_unmarked_map %}
-        <li data-markcount={{unmarked_count}}><a href="{% url 'anatomy:mark' pk=exam.pk sk=forloop.counter0 %}">Question {{forloop.counter }}:
+        <li data-markcount={{unmarked_count}} {% if unmarked_count %}class="unmarked" {% endif %}><a href="{% url 'anatomy:mark' pk=exam.pk sk=forloop.counter0 %}">Question {{forloop.counter }}:
                 {{ question }}</a><br />Unmarked answers:  {{ unmarked_count }}</li>
         {% endfor %}
     </ul>
diff --git a/longs/templates/longs/mark_overview.html b/longs/templates/longs/mark_overview.html
index cb89d79b..8f821129 100644
--- a/longs/templates/longs/mark_overview.html
+++ b/longs/templates/longs/mark_overview.html
@@ -6,15 +6,15 @@
     You can start marking from a particular question by clicking on it below.
 
     <div>
-    <button class="show-all-button">Show all</button><button class="show-unmarked-button">Show unmarked</button>
+        <button class="show-all-button">Show all</button><button class="show-unmarked-button">Show unmarked</button>
     </div>
-    <div id="stark-marking-button"><a href="{% url 'longs:mark' pk=exam.pk sk=0 %}"><button>Click here to start marking</button></a></div>
+    <div id="stark-marking-button"><a href="{% url 'longs:mark' pk=exam.pk sk=0 %}"><button>Click here to start
+                marking</button></a></div>
 
     <ul id="question-mark-list">
         {% for question, unmarked_count in question_unmarked_map %}
-        <li data-markcount={{unmarked_count}} 
-        {% if unmarked_count %}class="unmarked" {% endif %}
-            ><a href="{% url 'longs:mark' pk=exam.pk sk=forloop.counter0 %}">Question {{forloop.counter }}:
+        <li data-markcount={{unmarked_count}} {% if unmarked_count %}class="unmarked" {% endif %}><a
+                href="{% url 'longs:mark' pk=exam.pk sk=forloop.counter0 %}">Question {{forloop.counter }}:
                 {{ question }}</a><br /> Answers to mark: {{unmarked_count}}</li>
         {% endfor %}
     </ul>
diff --git a/rapids/templates/rapids/mark_overview.html b/rapids/templates/rapids/mark_overview.html
index 1340307f..33b92b00 100644
--- a/rapids/templates/rapids/mark_overview.html
+++ b/rapids/templates/rapids/mark_overview.html
@@ -12,7 +12,7 @@
 
     <ul id="question-mark-list">
         {% for question, unmarked_count in question_unmarked_map %}
-        <li data-markcount={{unmarked_count}}><a href="{% url 'rapids:mark' pk=exam.pk sk=forloop.counter0 %}">Question {{forloop.counter }}:
+        <li data-markcount={{unmarked_count}} {% if unmarked_count %}class="unmarked" {% endif %}><a href="{% url 'rapids:mark' pk=exam.pk sk=forloop.counter0 %}">Question {{forloop.counter }}:
                 {{ question }}</a><br />Unmarked answers: {{unmarked_count}}</li>
         {% endfor %}
     </ul>