Add new endpoints and templates for displaying marked answers in the improved marking UI

anatomy/views.py

@@ -836,6 +836,70 @@ def mark2_toggle_answer(request):
     return JsonResponse({"status": "ok"})
 
 
+@login_required
+def mark2_exam_marked(request, exam_pk, sk):
+    """Return a partial listing of answers submitted for this question within the given exam.
+
+    Shows distinct submitted answers with counts and any existing mark/status.
+    """
+    exam = get_object_or_404(Exam, pk=exam_pk)
+    questions = exam.get_questions()
+    try:
+        question = questions[sk]
+    except Exception:
+        raise Http404("Question not found in exam")
+
+    ua_qs = question.cid_user_answers.filter(exam=exam)
+
+    # Allow client to request ordering by 'count' (default) or by 'mark' (badge)
+    order = request.GET.get('order', 'count')
+
+    # Group distinct submitted answers and count occurrences
+    grouped = ua_qs.values('answer_compare').annotate(count=Count('id'))
+
+    items = []
+    for row in grouped:
+        ans = row['answer_compare']
+        cnt = row['count']
+        a = question.answers.filter(answer_compare__iexact=ans).first()
+        mark = None
+        if a is not None:
+            if a.status == Answer.MarkOptions.CORRECT:
+                mark = 'correct'
+            elif a.status == Answer.MarkOptions.HALF_MARK:
+                mark = 'half-correct'
+            elif a.status == Answer.MarkOptions.INCORRECT:
+                mark = 'incorrect'
+        items.append({'answer': ans, 'count': cnt, 'mark': mark})
+
+    # Sort items according to requested ordering
+    if order == 'mark':
+        weight = {'correct': 3, 'half-correct': 2, 'incorrect': 1, None: 0}
+        items.sort(key=lambda x: (weight.get(x.get('mark')), x.get('count', 0)), reverse=True)
+    else:
+        items.sort(key=lambda x: x.get('count', 0), reverse=True)
+
+    context = {'exam': exam, 'question': question, 'items': items}
+    return render(request, 'anatomy/partials/mark2_exam_marked_fragment.html', context)
+
+
+@login_required
+def mark2_question_marked(request, pk):
+    """Return a partial listing of all stored Answer choices for this question (grouped by status)."""
+    question = get_object_or_404(AnatomyQuestion, pk=pk)
+    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)
+
+    context = {
+        'question': question,
+        'correct_answers': correct_answers,
+        'half_mark_answers': half_mark_answers,
+        'incorrect_answers': incorrect_answers,
+    }
+    return render(request, 'anatomy/partials/mark2_question_marked_fragment.html', context)
+
+
 
 #@login_required
 #def exam_scores_refresh(request, pk):