.

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
 

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>