.

anatomy/templates/anatomy/exam_scores_user.html

@@ -1,62 +1,62 @@
 {% extends 'anatomy/base.html' %}
 
 {% block content %}
-    <div class="question-display-block">
-        <div class="hide-show">HIDE/SHOW</div>
-        <div class="inner-display-block">
-            Question <span class="question-number">No question loaded</span><br/>
-            <span id="question-title"></span><br/>
-            <span id="question-question"></span>
-            <div id="single-dicom-viewer" class="dicom-viewer" data-images="" data-annotations=''>
-            </div>
-            <div class="answers">Answers: </div>
+<div class="question-display-block">
+    <div class="hide-show">HIDE/SHOW</div>
+    <div class="inner-display-block">
+        Question <span class="question-number">No question loaded</span><br />
+        <span id="question-title"></span><br />
+        <span id="question-question"></span>
+        <div id="single-dicom-viewer" class="dicom-viewer" data-images="" data-annotations=''>
         </div>
+        <div class="answers">Answers: </div>
     </div>
-    <div class="anatomy">
-        <h2>Exam: {{ exam.name }}</h2>
-        <h3>Candidate: {{ cid }}</h3>
-        Answers:
-        <ul class="score-answer-list">{% for ans, score, correct_answer in answers_and_marks %}
-            <li class="user-answer-li">Question {{forloop.counter}} - Correct answer: <span
-                class="correct-answer">{{ correct_answer }}</span></li>
-            <span class="user-answer-score user-answer-score-{{score}} physics-ans">
-                <pre>{{ans}}</pre> ({{score}})
-            </span>
-            <span class="view-question-link" data-qn={{forloop.counter0}}>View</span>
+</div>
+<div class="anatomy">
+    <h2>Exam: {{ exam.name }}</h2>
+    <h3>Candidate: {{ cid }}</h3>
+    Answers:
+    <ul class="score-answer-list">{% for ans, score, correct_answer in answers_and_marks %}
+        <li class="user-answer-li">Question {{forloop.counter}} - Correct answer: <span class="correct-answer">{{
+                correct_answer }}</span></li>
+        <span class="user-answer-score user-answer-score-{{score}} physics-ans">
+            <pre>{{ans}}</pre> ({{score}})
+        </span>
+        <span class="view-question-link" data-qn={{forloop.counter0}}>View</span>
         {% endfor %}
-        </ul>
-        <br /> Total mark: {{ total_score }} / {{max_score}}
-        <div>
-            <a href="{% url 'cid_scores' cid %}">Other exams</a>
-        </div>
+    </ul>
+    <br /> Total mark: {{ total_score }} / {{max_score}}
+    <div>
+        <a href="{% url 'cid_scores' cid passcode %}">Other exams</a>
     </div>
+</div>
 {% endblock %}
 {% block js %}
-    <script>
-        $(document).ready(function () {
-            $(".hide-show").click((evt, el) => {
-                $(".inner-display-block").toggle();
-            })
+<script>
+    $(document).ready(function () {
+        $(".hide-show").click((evt, el) => {
+            $(".inner-display-block").toggle();
+        })
 
-            $(".view-question-link").on("click", function (e) {
-                console.log("click", e)
-                question_number = e.currentTarget.dataset.qn;
-                $("#single-dicom-viewer").empty();
-                $.ajax({
-                    url: `{% url 'anatomy:question_review' pk=exam.pk %}`,
-                    data: {
-                        csrfmiddlewaretoken: "{{ csrf_token }}",
-                        question_number: question_number
-                    },
-                    type: "POST",
-                    dataType: "json",
-                })
+        $(".view-question-link").on("click", function (e) {
+            console.log("click", e)
+            question_number = e.currentTarget.dataset.qn;
+            $("#single-dicom-viewer").empty();
+            $.ajax({
+                url: `{% url 'anatomy:question_review' pk=exam.pk %}`,
+                data: {
+                    csrfmiddlewaretoken: "{{ csrf_token }}",
+                    question_number: question_number
+                },
+                type: "POST",
+                dataType: "json",
+            })
                 // $.ajax().done(), $.ajax().fail(), $ajax().always() are upto you. Add/change accordingly
-                    .done(function (data) {
+                .done(function (data) {
                     console.log(data);
 
                     let event = new CustomEvent('loadDicomViewerUrls', {
-                        "detail": {"images" : data.images, "annotations" : data.annotations}
+                        "detail": { "images": data.images, "annotations": data.annotations }
                     });
 
                     window.dispatchEvent(event);
@@ -67,13 +67,13 @@
                     $(".question-display-block .question-number").empty().append(n);
                     $(".inner-display-block").show();
                 })
-                    .always(function () {
+                .always(function () {
                     console.log('[Done]');
                 })
-            })
+        })
 
-            $(".view-question-link").first().click();
+        $(".view-question-link").first().click();
 
-        });
-    </script>
-{% endblock %}
+    });
+</script>
+{% endblock %}

anatomy/urls.py

@@ -76,7 +76,7 @@ urlpatterns = [
         name="exam_scores_cid",
     ),
     path(
-        "exam/<int:pk>/scores/<int:sk>/",
+        "exam/<int:pk>/scores/<int:sk>/<str:passcode>/",
         views.exam_scores_cid_user,
         name="exam_scores_cid_user",
     ),

anatomy/views.py

@@ -134,89 +134,89 @@ def answer_question(request, pk):
     )
 
 
-@login_required
-def exam_take(request, pk, sk):
-    """
-    Allows taking of the exam on the django server (when logged in)
-
-    No longer used (deprecated in favour of using RTS)
-    """
-    exam = get_object_or_404(Exam, pk=pk)
-
-    questions = exam.exam_questions.all()
-
-    try:
-        question = questions[sk]
-    except IndexError:
-        raise Http404("Exam question does not exist")
-
-    n = sk
-
-    question_details = {
-        "total": len(questions),
-        "current": n + 1,
-    }
-
-    # Get data for flagged
-    # answered_questions = UserAnswer.objects.filter(user=request.user).values_list("question__pk", flat=True)
-    user_answer_data = UserAnswer.objects.filter(user=request.user).values_list(
-        "question__pk", "answer", "flagged"
-    )
-    # flagged_questions = UserAnswer.objects.filter(user=request.user, flagged=True).values_list("question__pk", flat=True)
-    # flagged_questions I= UserAnswer.filter(user=request.user, ).values_list("question__pk", flat=True)
-
-    answered_questions = set()
-    flagged_questions = set()
-    for ans_pk, answer, flagged in user_answer_data:
-        if len(answer.strip()) > 0:
-            answered_questions.add(ans_pk)
-        if flagged:
-            flagged_questions.add(ans_pk)
-
-    #    u = question.user_answers
-    answer = question.user_answers.filter(
-        user=request.user
-    ).first()  # .filter(user=User)
-    if request.method == "POST":
-        if answer:
-            form = AnatomyAnswerForm(request.POST, instance=answer)
-        else:
-            form = AnatomyAnswerForm(request.POST)
-        if form.is_valid():
-            answer = form.save(commit=False)
-            answer.user = request.user
-            answer.question = question
-            # answer.published_date = timezone.now()
-            answer.save()
-            if "next" in request.POST:
-                return redirect("anatomy:exam_take", pk=pk, sk=n + 1)
-            elif "previous" in request.POST:
-                return redirect("anatomy:exam_take", pk=pk, sk=n - 1)
-    else:
-        form = AnatomyAnswerForm(instance=answer)
-    return render(
-        request,
-        "anatomy/exam.html",
-        {
-            "exam": exam,
-            "form": form,
-            "question": question,
-            "question_details": question_details,
-            "questions": questions,
-            "flagged_questions": flagged_questions,
-            "answered_questions": answered_questions,
-            "answer": answer,
-        },
-    )
+#@login_required
+#def exam_take(request, pk, sk):
+#    """
+#    Allows taking of the exam on the django server (when logged in)
+#
+#    No longer used (deprecated in favour of using RTS)
+#    """
+#    exam = get_object_or_404(Exam, pk=pk)
+#
+#    questions = exam.exam_questions.all()
+#
+#    try:
+#        question = questions[sk]
+#    except IndexError:
+#        raise Http404("Exam question does not exist")
+#
+#    n = sk
+#
+#    question_details = {
+#        "total": len(questions),
+#        "current": n + 1,
+#    }
+#
+#    # Get data for flagged
+#    # answered_questions = UserAnswer.objects.filter(user=request.user).values_list("question__pk", flat=True)
+#    user_answer_data = UserAnswer.objects.filter(user=request.user).values_list(
+#        "question__pk", "answer", "flagged"
+#    )
+#    # flagged_questions = UserAnswer.objects.filter(user=request.user, flagged=True).values_list("question__pk", flat=True)
+#    # flagged_questions I= UserAnswer.filter(user=request.user, ).values_list("question__pk", flat=True)
+#
+#    answered_questions = set()
+#    flagged_questions = set()
+#    for ans_pk, answer, flagged in user_answer_data:
+#        if len(answer.strip()) > 0:
+#            answered_questions.add(ans_pk)
+#        if flagged:
+#            flagged_questions.add(ans_pk)
+#
+#    #    u = question.user_answers
+#    answer = question.user_answers.filter(
+#        user=request.user
+#    ).first()  # .filter(user=User)
+#    if request.method == "POST":
+#        if answer:
+#            form = AnatomyAnswerForm(request.POST, instance=answer)
+#        else:
+#            form = AnatomyAnswerForm(request.POST)
+#        if form.is_valid():
+#            answer = form.save(commit=False)
+#            answer.user = request.user
+#            answer.question = question
+#            # answer.published_date = timezone.now()
+#            answer.save()
+#            if "next" in request.POST:
+#                return redirect("anatomy:exam_take", pk=pk, sk=n + 1)
+#            elif "previous" in request.POST:
+#                return redirect("anatomy:exam_take", pk=pk, sk=n - 1)
+#    else:
+#        form = AnatomyAnswerForm(instance=answer)
+#    return render(
+#        request,
+#        "anatomy/exam.html",
+#        {
+#            "exam": exam,
+#            "form": form,
+#            "question": question,
+#            "question_details": question_details,
+#            "questions": questions,
+#            "flagged_questions": flagged_questions,
+#            "answered_questions": answered_questions,
+#            "answer": answer,
+#        },
+#    )
 
 
-def flag_question(request):
-    pk = request.GET.get("pk", None)
-    ans = UserAnswer.objects.filter(user=request.user, question__pk=pk).first()
-    ans.flagged = not ans.flagged
-    ans.save()
-    data = {"flagged": ans.flagged}
-    return JsonResponse(data)
+#def flag_question(request):
+#    pk = request.GET.get("pk", None)
+#    ans = UserAnswer.objects.filter(user=request.user, question__pk=pk).first()
+#    ans.flagged = not ans.flagged
+#    ans.save()
+#    data = {"flagged": ans.flagged}
+#    return JsonResponse(data)
 
 
 def loadJsonAnswer(answer):
@@ -329,8 +329,7 @@ def mark(request, exam_pk, sk, unmarked_exam_answers_only=True, review=False):
     except IndexError:
         raise Http404("Exam question does not exist")
 
-
-    #unmarked_user_answers = question.get_unmarked_user_answers()
+    # unmarked_user_answers = question.get_unmarked_user_answers()
 
     if request.method == "POST":
 
@@ -383,9 +382,9 @@ def mark(request, exam_pk, sk, unmarked_exam_answers_only=True, review=False):
     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 = []
@@ -395,13 +394,14 @@ def mark(request, exam_pk, sk, unmarked_exam_answers_only=True, review=False):
     unmarked_user_answers = []
 
     if review:
-        unmarked_user_answers = question.get_user_answers(exam_pk=exam_pk, include_normal=False)
+        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)
@@ -532,6 +532,7 @@ def exam_scores_cid(request, pk):
         "anatomy/exam_scores.html",
         {
             "cids": cids,
+            "passcode": passcode,
             "exam": exam,
             "unmarked": unmarked,
             "questions": questions,
@@ -551,14 +552,15 @@ def exam_scores_cid(request, pk):
     )
 
 
-def exam_scores_cid_user(request, pk, sk):
+def exam_scores_cid_user(request, pk, sk, passcode):
     exam = get_object_or_404(Exam, pk=pk)
 
     if not exam.exam_mode:
         raise Http404("Packet not in exam mode")
 
-    # TODO:Need some kind of test for cid
     cid = sk
+    if not exam.check_cid_user(cid, passcode):
+        raise Http404("Error accessing exam")
 
     questions = exam.exam_questions.all()
 
@@ -609,6 +611,7 @@ def exam_scores_cid_user(request, pk, sk):
         {
             "exam": exam,
             "cid": cid,
+            "passcode": passcode,
             "questions": questions,
             "answers": answers,
             "answers_marks": answers_marks,
@@ -1051,5 +1054,4 @@ class StructureAutocomplete(autocomplete.Select2QuerySetView):
             except FieldError:
                 return Structure.objects.none()
 
-
         return qs