.

anatomy/views.py

@@ -303,12 +303,18 @@ def mark_review(request, exam_pk, sk):
 
 # @user_passes_test(user_is_admin, login_url="/accounts/login")
 @login_required
-def mark(request, pk, sk):
-    exam = get_object_or_404(Exam, pk=pk)
+def mark(request, exam_pk, sk, unmarked_exam_answers_only=True, review=False):
+    exam = get_object_or_404(Exam, pk=exam_pk)
 
     if not exam.exam_mode:
         raise Http404("Packet not in exam mode")
 
+    mark_url = "rapids:mark"
+    if review:
+        mark_url = "rapids:mark_review"
+    elif not unmarked_exam_answers_only:
+        mark_url = "rapids:mark_all"
+
     questions = exam.exam_questions.all()
 
     n = sk
@@ -323,22 +329,8 @@ def mark(request, pk, sk):
     except IndexError:
         raise Http404("Exam question does not exist")
 
-    answers_dict = {}
 
-    for ans in question.answers.all():
-        answers_dict[ans.answer_compare] = ans
-
-    marked_answers_set = set(answers_dict.keys())
-
-    # correct_answers = [i.answer.lower() for i in question.answers.all()]
-    # half_correct_answers = [
-    #    i.answer.lower() for i in question.half_mark_answers.all()
-    # ]
-    # incorrect_answers = [
-    #    i.answer.lower() for i in question.incorrect_answers.all()
-    # ]
-
-    unmarked_user_answers = question.get_unmarked_user_answers()
+    #unmarked_user_answers = question.get_unmarked_user_answers()
 
     if request.method == "POST":
 
@@ -349,7 +341,7 @@ def mark(request, pk, sk):
         if form.is_valid():
             # If skip button is pressed skip the question without marking
             if "skip" in request.POST:
-                return redirect("anatomy:mark", pk=pk, sk=n + 1)
+                return redirect("anatomy:mark", pk=exam_pk, sk=n + 1)
 
             cd = form.cleaned_data
 
@@ -382,18 +374,54 @@ def mark(request, pk, sk):
                     a.save()
 
             if "next" in request.POST:
-                return redirect("anatomy:mark", pk=pk, sk=n + 1)
+                return redirect(mark_url, pk=exam_pk, sk=n + 1)
             elif "previous" in request.POST:
-                return redirect("anatomy:mark", pk=pk, sk=n - 1)
+                return redirect(mark_url, pk=exam_pk, sk=n - 1)
 
             # Reset user answers (relies on the functional javascript)
             unmarked_user_answers = set()
     else:
         form = MarkAnatomyQuestionForm()
 
-    correct_answers = question.answers.filter(status=Answer.MarkOptions.CORRECT)
-    half_mark_answers = question.answers.filter(status=Answer.MarkOptions.HALF_MARK)
-    incorrect_answers = question.answers.filter(status=Answer.MarkOptions.INCORRECT)
+    #correct_answers = question.answers.filter(status=Answer.MarkOptions.CORRECT)
+    #half_mark_answers = question.answers.filter(status=Answer.MarkOptions.HALF_MARK)
+    #incorrect_answers = question.answers.filter(status=Answer.MarkOptions.INCORRECT)
+
+    correct_answers = []
+    half_mark_answers = []
+    incorrect_answers = []
+    review_user_answers = []
+    unmarked_answers_bool = False
+    unmarked_user_answers = []
+
+    if review:
+        unmarked_user_answers = question.get_user_answers(exam_pk=exam_pk, include_normal=False)
+    elif unmarked_exam_answers_only:
+        unmarked_user_answers = question.get_unmarked_user_answers(exam_pk=exam_pk)
+    else:
+        unmarked_user_answers = question.get_unmarked_user_answers()
+
+
+    if not unmarked_exam_answers_only:
+        correct_answers = question.answers.filter(status=Answer.MarkOptions.CORRECT)
+        half_mark_answers = question.answers.filter(status=Answer.MarkOptions.HALF_MARK)
+        incorrect_answers = question.answers.filter(status=Answer.MarkOptions.INCORRECT)
+
+    if review:
+        for ans in unmarked_user_answers:
+            # duplicated from user answer model....
+            marked_ans = question.answers.filter(answer_compare__iexact=ans).first()
+            mark = "unmarked"
+            if marked_ans is not None:
+                if marked_ans.status == Answer.MarkOptions.CORRECT:
+                    mark = "correct"
+                elif marked_ans.status == Answer.MarkOptions.HALF_MARK:
+                    mark = "half-correct"
+                elif marked_ans.status == Answer.MarkOptions.INCORRECT:
+                    mark = "incorrect"
+            if mark == "unmarked":
+                unmarked_answers_bool = True
+            review_user_answers.append((ans, mark))
 
     return render(
         request,
@@ -401,12 +429,17 @@ def mark(request, pk, sk):
         {
             "exam": exam,
             "form": form,
+            "review": review,
             "question": question,
+            "question_number": n,
             "question_details": question_details,
+            "unmarked_answers_bool": unmarked_answers_bool,
             "user_answers": unmarked_user_answers,
+            "review_user_answers": review_user_answers,
             "correct_answers": correct_answers,
             "half_mark_answers": half_mark_answers,
             "incorrect_answers": incorrect_answers,
+            "unmarked_exam_answers_only": unmarked_exam_answers_only,
         },
     )