.

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):

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>