From d47462be9898b3895d166f85c4bade7ad6b115e2 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Sat, 26 Dec 2020 20:45:26 +0000
Subject: [PATCH] numerous improvements and fixes

---
 anatomy/static/css/anatomy.css                | 15 +++++++++++
 anatomy/static/js/anatomy.js                  |  2 +-
 anatomy/templates/anatomy/exam_scores.html    | 15 +++--------
 anatomy/views.py                              |  2 +-
 physics/templates/physics/exam_scores.html    | 10 +------
 .../templates/physics/exam_scores_user.html   |  2 +-
 physics/templates/physics/exam_take.html      | 27 ++++++++-----------
 physics/views.py                              |  2 +-
 8 files changed, 34 insertions(+), 41 deletions(-)

diff --git a/anatomy/static/css/anatomy.css b/anatomy/static/css/anatomy.css
index 72d3a53d..13e1f274 100644
--- a/anatomy/static/css/anatomy.css
+++ b/anatomy/static/css/anatomy.css
@@ -23,14 +23,29 @@ a, a:link {
   color: green;
 }
 
+.answer-list .correct::after{
+  content: " [Score = 2]";
+  font-size: small;
+}
+
 .answer-list .half-correct {
   color: yellow;
 }
 
+.answer-list .half-correct::after{
+  content: " [Score = 1]";
+  font-size: small;
+}
+
 .answer-list .incorrect {
   color: red;
 }
 
+.answer-list .incorrect::after{
+  content: " [Score = 0]";
+  font-size: small;
+}
+
 .answer-list .not-marked {
   color: lightblue;
 }
diff --git a/anatomy/static/js/anatomy.js b/anatomy/static/js/anatomy.js
index 52cb161c..24d974b5 100644
--- a/anatomy/static/js/anatomy.js
+++ b/anatomy/static/js/anatomy.js
@@ -8,7 +8,7 @@ var marked_answers = {
 
 $(document).ready(function () {
     $(".answer-list li").each(function (index, element) {
-        $(element).append($("<span class='google-link' title='search in google'><a href='https://www.google.com/search?q="+$(element).text()+"' target='_blank'>G</a></span>"));
+        $(element).append($("<span class='google-link' title='search for answer with google'><a href='https://www.google.com/search?q="+$(element).text()+"' target='_blank'>G</a></span>"));
     });
 
     $(".answer-list span.answer").each(function (index, element) {
diff --git a/anatomy/templates/anatomy/exam_scores.html b/anatomy/templates/anatomy/exam_scores.html
index 83466eef..5bc70ed6 100644
--- a/anatomy/templates/anatomy/exam_scores.html
+++ b/anatomy/templates/anatomy/exam_scores.html
@@ -12,21 +12,12 @@
 
     {% endif %}
 
-    {% for user, value in user_answers_marks.items %}
-        <h3>Candidate: <a href="{% url 'cid_scores' user %}">{{ user_names|get_item:user }}</a></h3>
-        <!-- Answers: {{ user_answers_and_marks|get_item:user }}-->
-        Answers: {% for ans, score in user_answers_and_marks|get_item:user %}
-        {{ans}} ({{score}}),
-        {% endfor %}
-        <br /> Total mark: {{ user_scores|get_item:user }}
-    {% endfor %}
-
 </div>
 <div id="stats-block">
     <h2>Stats</h2>
     Mean: {{mean}}, Median {{median}}, Mode {{mode}}
-    <h3>Distribution of results</h3>
-    <div id="stats-plot">{{plot|safe}}</div>
+    
+    <div id="stats-plot"><h3>Distribution of results</h3>{{plot|safe}}</div>
 </div>
 <div>
     <table>
@@ -36,7 +27,7 @@
         </tr>
         {% for user, value in user_answers_marks.items %}
         <tr>
-            <td>{{user}}</td>
+            <td><a href="{% url 'cid_scores' user %}">{{user}}</a></td>
             <td>{{user_scores|get_item:user}}</td>
         </tr>
         {% endfor %}
diff --git a/anatomy/views.py b/anatomy/views.py
index ac32272b..36fc8f54 100644
--- a/anatomy/views.py
+++ b/anatomy/views.py
@@ -625,7 +625,7 @@ def exam_scores_cid(request, pk):
             mode = "No unique mode"
 
         df = user_scores_list
-        fig = px.histogram(df, x=0)
+        fig = px.histogram(df, x=0, title="Distribution of scores", labels={"0": "Score"}, height=400, width=600)
         fig_html = fig.to_html()
 
     total = len(questions)
diff --git a/physics/templates/physics/exam_scores.html b/physics/templates/physics/exam_scores.html
index 42f394f3..9551563f 100644
--- a/physics/templates/physics/exam_scores.html
+++ b/physics/templates/physics/exam_scores.html
@@ -4,14 +4,6 @@
 <div class="physics">
     <h2>{{ exam.name }}</h2>
 
-    {% for user, value in user_answers_marks.items %}
-    <h3>Candidate: <a href="{% url 'cid_scores' user %}">{{ user_names|get_item:user }}</a></h3>
-    <!-- Answers: {{ user_answers_and_marks|get_item:user }}-->
-    Answers: {% for ans, score in user_answers_and_marks|get_item:user %}
-    {{ans}} ({{score}}),
-    {% endfor %}
-    <br /> Total mark: {{ user_scores|get_item:user }}
-    {% endfor %}
 </div>
 <div id="stats-block">
     <h2>Stats</h2>
@@ -27,7 +19,7 @@
         </tr>
         {% for user, value in user_answers_marks.items %}
         <tr>
-            <td>{{user}}</td>
+            <td><a href="{% url 'cid_scores' user %}">{{user}}</a></td>
             <td>{{user_scores|get_item:user}}</td>
         </tr>
         {% endfor %}
diff --git a/physics/templates/physics/exam_scores_user.html b/physics/templates/physics/exam_scores_user.html
index ba9074e1..fb74ec54 100644
--- a/physics/templates/physics/exam_scores_user.html
+++ b/physics/templates/physics/exam_scores_user.html
@@ -10,7 +10,7 @@
         <li class="user-answer-li">Question {{forloop.counter}} - {{ question.stem }}</li>
         <ol type="a">
             {% for q, a, score, correct_answer in ans %}
-            <li>{{q}}: {{a}} <br />Correct answer: {{correct_answer}} <span class="answer-{{score}}">(Score: {{score}})</span></li>
+            <li>{{q}}: Correct answer: {{correct_answer}} <br />{{a}} <span class="answer-{{score}}">(Score: {{score}})</span></li>
             {% endfor %}
         </ol>
         {% endfor %}
diff --git a/physics/templates/physics/exam_take.html b/physics/templates/physics/exam_take.html
index 74a47840..45d9ff08 100644
--- a/physics/templates/physics/exam_take.html
+++ b/physics/templates/physics/exam_take.html
@@ -13,6 +13,7 @@
         saved)
     </p>
 
+    {% autoescape off %}
     <ol id="full-question-list-physics">
         {% for question in questions.all %}
 
@@ -53,6 +54,8 @@
         </li>
         {% endfor %}
     </ol>
+    {% endautoescape %}
+
 
     <button id="submit">Submit answers</button>
 
@@ -61,7 +64,7 @@
 
 <script type="text/javascript">
 
-    window.answers_submitted = true;
+    window.answers_submitted = false;
     $(document).ready(function () {
         console.log($(".question-text"));
         $(".question-text").click(function (evt) {
@@ -113,21 +116,13 @@ function postAnswers(ans) {
         );
 
         if (ret) {
-          window.saveSession();
-        window.answers_submitted = true;
-          if (config.exam_results_url != "") {
-            let url = config.exam_results_url;
+          //window.saveSession();
 
-            if (window.cid != "") {
-              url = url + window.cid;
-            }
-            $("#options-link")
-              .empty()
-              .append(
-                `<a href="${url}" target="_blank"><div class="packet-button">Results and answers</div></a>`
-              );
-          }
-          $("#options-panel").show();
+            $("#submit").after('<button id="exams-button-link">Return to exam list</button>');
+            $("#exams-button-link").click(() => {
+                window.location.href = "{% url 'physics:active_exams' %}";
+            })
+            window.answers_submitted = true;
         } else {
         }
     } else {
@@ -144,7 +139,7 @@ function postAnswers(ans) {
     .truefalse-switch {
         position: relative;
         display: inline-block;
-        width: 90px;
+        width: 100px;
         height: 20px;
         margin: 0px;
         margin-bottom: -5px;
diff --git a/physics/views.py b/physics/views.py
index 83d6cb6e..3a1a7038 100644
--- a/physics/views.py
+++ b/physics/views.py
@@ -176,7 +176,7 @@ def exam_scores_cid(request, pk):
             mode = "No unique mode"
 
         df = user_scores_list
-        fig = px.histogram(df, x=0)
+        fig = px.histogram(df, x=0, title="Distribution of scores", labels={0: "Score"})
         fig_html = fig.to_html()
 
     total = len(questions)