This commit is contained in:
Ross
2021-09-09 12:56:43 +01:00
parent 226058651c
commit 343cc9cb9a
3 changed files with 50 additions and 12 deletions
+28 -11
View File
@@ -1,30 +1,47 @@
{% extends 'longs/base.html' %} {% extends 'longs/base.html' %}
{% block content %} {% 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"> <div class="longs">
<h2>Exam: {{ exam.name }}</h2> <h2>Exam: {{ exam.name }}</h2>
<h3>Candidate: {{ cid }}</h3> <h3>Candidate: {{ cid }}</h3>
Scores: Scores:
<ul>{% for score in answers_marks %} <ul>{% for score in answers_marks %}
<li class="user-answer-li">Question {{forloop.counter}}</li> <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 %} {% endfor %}
</ul> </ul>
<br /> Total mark: {{ total_score }} / {{max_score}} <br /> Total mark: {{ total_score }} / {{max_score}}
<br /> Normalised score: {{normalised_score}} <br /> Normalised score: {{normalised_score}}
<div> <div>
<h4>Answers</h4> <h4>Answers</h4>
<ul class="long-answer">{% for a,b,c,d,e in answer_text %} <ul class="long-answer">{% for a,b,c,d,e in answer_text %}
<li class="user-answer-li"><b>Question {{forloop.counter}}</b></li> <li class="user-answer-li"><b>Question {{forloop.counter}}</b></li>
<ul> <ul>
<li class="user-answer-li">Observation</br><pre>{{a}}</pre></li> <li class="user-answer-li">Observation</br>
<li class="user-answer-li">Interpretation</br><pre>{{b}}</pre></li> <pre>{{a}}</pre>
<li class="user-answer-li">Principle Diagnosis</br><pre>{{c}}</pre></li> </li>
<li class="user-answer-li">Differential Diagnosis</br><pre>{{d}}</pre></li> <li class="user-answer-li">Interpretation</br>
<li class="user-answer-li">Management</br><pre>{{e}}</pre></li> <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> </ul>
{% endfor %}
</ul>
</div> </div>
<div> <div>
+5
View File
@@ -61,6 +61,11 @@ urlpatterns = [
# path("all_questions/", views.all_questions, name="all_questions"), # path("all_questions/", views.all_questions, name="all_questions"),
path("question/<int:pk>/scrap", views.long_scrap, name="long_scrap"), path("question/<int:pk>/scrap", views.long_scrap, name="long_scrap"),
path("question/<int:pk>/delete", views.LongDelete.as_view(), name="long_delete"), 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>/<int:cid>/mark", views.mark_answer, name="mark_answer"),
path("exam/<int:pk>/<int:sk>/mark", views.mark, name="mark"), path("exam/<int:pk>/<int:sk>/mark", views.mark, name="mark"),
path("exam/<int:pk>/mark", views.LongExamViews.mark_overview, name="mark_overview"), path("exam/<int:pk>/mark", views.LongExamViews.mark_overview, name="mark_overview"),
+17 -1
View File
@@ -1142,4 +1142,20 @@ class SeriesImagesZipView(SuperuserRequiredMixin, BaseZipView):
def get_files(self): def get_files(self):
series = LongSeries.objects.get(pk=self.kwargs['pk']) series = LongSeries.objects.get(pk=self.kwargs['pk'])
return [i.image.file for i in series.images.all()] 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"})