.

rapids/views.py

@@ -572,9 +572,12 @@ def loadJsonAnswer(answer):
     return True, None
 
 
+def mark_all(request, pk, sk):
+    return mark(request, pk, sk, exam_answers_only=False)
+
 # @user_passes_test(user_is_admin, login_url="/accounts/login")
 @login_required
-def mark(request, pk, sk):
+def mark(request, pk, sk, exam_answers_only=True):
     exam = get_object_or_404(Exam, pk=pk)
 
     questions = exam.exam_questions.all()
@@ -596,7 +599,7 @@ def mark(request, pk, sk):
     for ans in question.answers.all():
         answers_dict[ans.answer_compare] = ans
 
-    marked_answers_set = set(answers_dict.keys())
+    #marked_answers_set = set(answers_dict.keys())
 
     # correct_answers = [i.answer.lower() for i in question.answers.all()]
     # half_correct_answers = [
@@ -606,7 +609,10 @@ def mark(request, pk, sk):
     #    i.answer.lower() for i in question.incorrect_answers.all()
     # ]
 
-    unmarked_user_answers = question.get_unmarked_user_answers()
+    if exam_answers_only:
+        unmarked_user_answers = question.get_unmarked_user_answers(exam_pk=pk)
+    else:
+        unmarked_user_answers = question.get_unmarked_user_answers()
 
     if request.method == "POST":
 
@@ -722,6 +728,7 @@ def mark(request, pk, sk):
             "correct_answers": correct_answers,
             "half_mark_answers": half_mark_answers,
             "incorrect_answers": incorrect_answers,
+            "exam_answers_only": exam_answers_only,
         },
     )