.

longs/models.py

@@ -178,13 +178,13 @@ 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, exam_pk=None, marker=None):
+    def get_unmarked_user_answer_count(self, exam_pk=None, marker=None):
         if exam_pk is None:
             return self.cid_user_answers.all().count()
 
-        return len(self.get_unmarked_answers(exam_pk=exam_pk, marker=marker))
+        return len(self.get_unmarked_user_answers(exam_pk=exam_pk, marker=marker))
 
-    def get_unmarked_answers(self, exam_pk=None, marker=None):
+    def get_unmarked_user_answers(self, exam_pk=None, marker=None):
         if exam_pk is None:
             answers = self.cid_user_answers.all()
         else:
@@ -195,7 +195,7 @@ class Long(models.Model):
         if marker is None:
             return unmarked_answers
 
-        # If marker is specified we check for what they have marker
+        # If marker is specified we check for what they have marked
         marker_unmarked = []
         for answer in unmarked_answers:
             if answer.mark.filter(marker=marker).count() < 1:

longs/views.py

@@ -678,9 +678,9 @@ def mark_answer(request, exam_id, question_number, cid, override=False):
 
     try:
         if exam.double_mark:
-            unmarked = question.get_unmarked_answers(exam_pk=exam.id, marker=request.user)
+            unmarked = question.get_unmarked_user_answers(exam_pk=exam.id, marker=request.user)
         else:
-            unmarked = question.get_unmarked_answers(exam_pk=exam.id)
+            unmarked = question.get_unmarked_user_answers(exam_pk=exam.id)
         next_unmarked_id = unmarked[0].cid
         if next_unmarked_id == cid:
             next_unmarked_id = unmarked[1].cid
@@ -809,7 +809,7 @@ def mark_question_overview(request, exam_id, sk):
     unmarked_count = user_answers.filter(score=CidUserAnswer.ScoreOptions.UNMARKED).count()
 
     if exam.double_mark:
-        marker_unmarked_count = question.get_unmarked_answer_count(exam.pk, marker=request.user)
+        marker_unmarked_count = question.get_unmarked_user_answer_count(exam.pk, marker=request.user)
         return render(
             request,
             "longs/mark_question_double_overview.html",