From 343cc9cb9ab4b76a34777987b29d4055c82120ad Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Thu, 9 Sep 2021 12:56:43 +0100
Subject: [PATCH] .

---
 longs/templates/longs/exam_scores_user.html | 39 +++++++++++++++------
 longs/urls.py                               |  5 +++
 longs/views.py                              | 18 +++++++++-
 3 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/longs/templates/longs/exam_scores_user.html b/longs/templates/longs/exam_scores_user.html
index 4a86cac3..59495b76 100644
--- a/longs/templates/longs/exam_scores_user.html
+++ b/longs/templates/longs/exam_scores_user.html
@@ -1,30 +1,47 @@
 {% extends 'longs/base.html' %}
 
 {% block content %}
+<div class="question-display-block">
+    Question <span class="question-number">1</span>
+    <div id="single-dicom-viewer" class="dicom-viewer" data-images="" data-annotations=''>
+    </div>
+    <div class="answers">Answers: </div>
+</div>
 <div class="longs">
     <h2>Exam: {{ exam.name }}</h2>
     <h3>Candidate: {{ cid }}</h3>
     Scores:
     <ul>{% for score in answers_marks %}
         <li class="user-answer-li">Question {{forloop.counter}}</li>
-        <span class="user-answer-score user-answer-score-{{score}}"><pre>{{ans}}</pre> ({{score}})</span>
+        <span class="user-answer-score user-answer-score-{{score}}">
+            <pre>{{ans}}</pre> ({{score}})</span>
         {% endfor %}
     </ul>
     <br /> Total mark: {{ total_score }} / {{max_score}}
     <br /> Normalised score: {{normalised_score}}
     <div>
         <h4>Answers</h4>
-    <ul class="long-answer">{% for a,b,c,d,e in answer_text %}
-        <li class="user-answer-li"><b>Question {{forloop.counter}}</b></li>
-        <ul>
-        <li class="user-answer-li">Observation</br><pre>{{a}}</pre></li>
-        <li class="user-answer-li">Interpretation</br><pre>{{b}}</pre></li>
-        <li class="user-answer-li">Principle Diagnosis</br><pre>{{c}}</pre></li>
-        <li class="user-answer-li">Differential Diagnosis</br><pre>{{d}}</pre></li>
-        <li class="user-answer-li">Management</br><pre>{{e}}</pre></li>
+        <ul class="long-answer">{% for a,b,c,d,e in answer_text %}
+            <li class="user-answer-li"><b>Question {{forloop.counter}}</b></li>
+            <ul>
+                <li class="user-answer-li">Observation</br>
+                    <pre>{{a}}</pre>
+                </li>
+                <li class="user-answer-li">Interpretation</br>
+                    <pre>{{b}}</pre>
+                </li>
+                <li class="user-answer-li">Principle Diagnosis</br>
+                    <pre>{{c}}</pre>
+                </li>
+                <li class="user-answer-li">Differential Diagnosis</br>
+                    <pre>{{d}}</pre>
+                </li>
+                <li class="user-answer-li">Management</br>
+                    <pre>{{e}}</pre>
+                </li>
+            </ul>
+            {% endfor %}
         </ul>
-        {% endfor %}
-    </ul>
 
     </div>
     <div>
diff --git a/longs/urls.py b/longs/urls.py
index 0295f549..3b4c83d6 100755
--- a/longs/urls.py
+++ b/longs/urls.py
@@ -61,6 +61,11 @@ urlpatterns = [
     # path("all_questions/", views.all_questions, name="all_questions"),
     path("question/<int:pk>/scrap", views.long_scrap, name="long_scrap"),
     path("question/<int:pk>/delete", views.LongDelete.as_view(), name="long_delete"),
+    path(
+        "exam/<int:pk>/review",
+        views.question_review,
+        name="question_review",
+    ),
     path("exam/<int:pk>/<int:sk>/<int:cid>/mark", views.mark_answer, name="mark_answer"),
     path("exam/<int:pk>/<int:sk>/mark", views.mark, name="mark"),
     path("exam/<int:pk>/mark", views.LongExamViews.mark_overview, name="mark_overview"),
diff --git a/longs/views.py b/longs/views.py
index d322c464..ceb06523 100755
--- a/longs/views.py
+++ b/longs/views.py
@@ -1142,4 +1142,20 @@ class SeriesImagesZipView(SuperuserRequiredMixin, BaseZipView):
     def get_files(self):
         series = LongSeries.objects.get(pk=self.kwargs['pk'])
 
-        return [i.image.file for i in series.images.all()]
\ No newline at end of file
+        return [i.image.file for i in series.images.all()]
+
+def question_review(request, pk):
+    """
+    Return a json representation of the question when the exam is active
+    """
+    if request.is_ajax():
+        exam = get_object_or_404(Exam, pk=pk)
+
+        if not exam.publish_results:
+            raise Http404
+
+        question = exam.exam_questions.all()[int(request.POST["question_number"])]
+
+        question_json = question.get_question_json(based=False)
+        return JsonResponse(question_json)
+    return JsonResponse({"status": "error"})