From b17d19f9d2b24fc1f04f41bff5054d6ba114c5e3 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Sat, 25 Sep 2021 19:37:01 +0100
Subject: [PATCH] .

---
 anatomy/static/css/anatomy.css                |   4 +
 .../templates/anatomy/exam_scores_user.html   |  20 ++-
 longs/templates/longs/exam_scores_user.html   | 128 +++++++++---------
 static/css/anatomy.css                        |   4 +
 4 files changed, 84 insertions(+), 72 deletions(-)

diff --git a/anatomy/static/css/anatomy.css b/anatomy/static/css/anatomy.css
index c8c06fe2..331b18be 100644
--- a/anatomy/static/css/anatomy.css
+++ b/anatomy/static/css/anatomy.css
@@ -741,6 +741,10 @@ input {
   cursor: pointer;
 }
 
+.inner-display-block {
+  display: none;
+}
+
 .hide-show{
     float: right;
     transform: rotate(90deg) translateX(10px);
diff --git a/anatomy/templates/anatomy/exam_scores_user.html b/anatomy/templates/anatomy/exam_scores_user.html
index bf25eda0..adb039be 100644
--- a/anatomy/templates/anatomy/exam_scores_user.html
+++ b/anatomy/templates/anatomy/exam_scores_user.html
@@ -2,12 +2,15 @@
 
 {% block content %}
     <div class="question-display-block">
-        Question <span class="question-number">1</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=''>
+        Question <span class="question-number">No question loaded</span><br/>
+        <div class="hide-show">HIDE/SHOW</div>
+        <div class="inner-display-block">
+            <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="answers">Answers: </div>
     </div>
     <div class="anatomy">
         <h2>Exam: {{ exam.name }}</h2>
@@ -31,6 +34,10 @@
 {% block js %}
     <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;
@@ -58,8 +65,7 @@
                     $("#question-question").empty().append(data.question);
                     n = parseInt(question_number) + 1
                     $(".question-display-block .question-number").empty().append(n);
-                    // show some message according to the response.
-                    // For eg. A message box showing that the status has been changed
+                    $(".inner-display-block").show();
                 })
                     .always(function () {
                     console.log('[Done]');
diff --git a/longs/templates/longs/exam_scores_user.html b/longs/templates/longs/exam_scores_user.html
index b8978b4c..2c1999ab 100644
--- a/longs/templates/longs/exam_scores_user.html
+++ b/longs/templates/longs/exam_scores_user.html
@@ -1,73 +1,72 @@
 {% extends 'longs/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">1</span><br />
-        History: <span id="history"></span><br />
-        Images: <span id="series"></span>
-        <div id="single-dicom-viewer" class="dicom-viewer" data-images="" data-annotations=''>
+    <div class="question-display-block">
+        <div class="hide-show">HIDE/SHOW</div>
+        <div class="inner-display-block">
+            Question <span class="question-number">1</span><br />
+            History: <span id="history"></span><br />
+            Images: <span id="series"></span>
+            <div id="single-dicom-viewer" class="dicom-viewer" data-images="" data-annotations=''>
+            </div>
         </div>
     </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>
+    <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>
         {% 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> <span class="view-question-link-longs"
+        </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> <span class="view-question-link-longs"
                     data-qn={{forloop.counter0}}>View</span></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>
+                <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>
+            </ul>
 
+        </div>
+        <div>
+            <a href="{% url 'cid_scores' cid %}">Other exams</a>
+        </div>
     </div>
-    <div>
-        <a href="{% url 'cid_scores' cid %}">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-longs").on("click", function (e) {
-            console.log("click", e)
-            question_number = e.currentTarget.dataset.qn;
-            $("#single-dicom-viewer").empty();
-            $.ajax({
+            $(".view-question-link-longs").on("click", function (e) {
+                console.log("click", e)
+                question_number = e.currentTarget.dataset.qn;
+                $("#single-dicom-viewer").empty();
+                $.ajax({
                     url: `{% url 'longs:question_review' pk=exam.pk %}`,
                     data: {
                         csrfmiddlewaretoken: "{{ csrf_token }}",
@@ -77,7 +76,7 @@
                     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', {
@@ -109,16 +108,15 @@
                         }));
 
                     })
-                    // show some message according to the response. 
-                    // For eg. A message box showing that the status has been changed
+                    $(".inner-display-block").show();
                 })
-                .always(function () {
+                    .always(function () {
                     console.log('[Done]');
                 })
-        })
+            })
 
-        $(".view-question-link").first().click();
+            $(".view-question-link").first().click();
 
-    });
-</script>
-{% endblock %}
\ No newline at end of file
+        });
+    </script>
+{% endblock %}
diff --git a/static/css/anatomy.css b/static/css/anatomy.css
index c8c06fe2..331b18be 100644
--- a/static/css/anatomy.css
+++ b/static/css/anatomy.css
@@ -741,6 +741,10 @@ input {
   cursor: pointer;
 }
 
+.inner-display-block {
+  display: none;
+}
+
 .hide-show{
     float: right;
     transform: rotate(90deg) translateX(10px);