From da56e93ed135718682cc7e796e3214872f38c068 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Sat, 18 Dec 2021 19:17:24 +0000
Subject: [PATCH] .

---
 rapids/templates/rapids/exam_scores_new.html | 80 ++++++++++++++++++++
 rapids/views.py                              |  2 +-
 2 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 rapids/templates/rapids/exam_scores_new.html

diff --git a/rapids/templates/rapids/exam_scores_new.html b/rapids/templates/rapids/exam_scores_new.html
new file mode 100644
index 00000000..bd9fd93b
--- /dev/null
+++ b/rapids/templates/rapids/exam_scores_new.html
@@ -0,0 +1,80 @@
+{% extends 'rapids/exams.html' %}
+
+{% block content %}
+    <div id="stats-plot">{{plot|safe}}</div>
+    <div class="rapids">
+        <h2>{{ exam.name }}</h2>
+        User answer scores are cached, if you update or change an answer you will need to <a href="{% url 'rapids:exam_scores_refresh' exam.pk %}">refresh the scores</a>.
+
+        {% if unmarked %}
+            <div class="alert alert-warning" role="alert">
+                The following questions need marking
+                {% for exam_index in unmarked %}
+                    <a href="{% url 'rapids:mark' exam.pk exam_index %}">{{ exam_index|add:1 }}</a>
+                {% endfor %}
+            </div>
+
+        {% endif %}
+
+    </div>
+    <div id="stats-block">
+        <h3>Stats</h3>
+        Candidates: {{cids|length}}<br />
+        Max score: {{max_score}}<br />
+        Mean: {{mean}}, Median {{median}}, Mode {{mode}}
+
+    </div>
+    <div>
+        <table class="table table-dark table-striped table-hover table-sm cid-score-table">
+            <tr>
+                <th>Candidate ID</th>
+                <th>Score</th>
+                <th>Normalised Score</th>
+            </tr>
+            {% for user, value in user_answers_marks.items %}
+                <tr>
+                    <td><a href="{% url 'cid_scores_admin' user %}">{{user}}</a></td>
+                    <td>{{user_scores|get_item:user}}</td>
+                    <td>{{user_scores_normalised|get_item:user}}</td>
+                </tr>
+            {% endfor %}
+        </table>
+    </div>
+    <div>
+        <h3>Answers as a table TEST</h3>
+        <table class="table table-dark table-striped table-hover table-sm col-sm">
+            <thead class="thead-dark">
+                <tr>
+                    <th>Candidate</th>
+                    {% for cid in cids %}
+                        {% comment %} <th><a href="{% url 'rapids:exam_scores_cid_user' exam.pk cid %}">{{cid}}</a></th> {% endcomment %}
+                        <th><a href="">{{cid}}</a></th>
+                    {% endfor %}
+
+                </tr>
+            </thead>
+            {% for question in questions %}
+                <tr>
+                    <td><a href="{% url 'rapids:mark' exam_pk=exam.pk sk=forloop.counter0 %}">Question {{forloop.counter}}</a>
+                        {% if question.normal %}
+                            [N]
+                        {% else %}
+                            [A]
+                        {% endif %}
+                    </td>
+                    {% for cid in cids %}
+                        <td class="rapid-ans user-answer-score-{{score_by_question|get_item:question|get_item:cid}}" title="answer score: {{score_by_question|get_item:question|get_item:cid}}">{{ans_by_question|get_item:question|get_item:cid}}</td>
+                    {% endfor %}
+                </tr>
+            {% endfor %}
+            <tr>
+                <td>Score:</td>
+                {% for cid in cids %}
+                    <td>{{user_scores|get_item:cid}}</td>
+                {% endfor %}
+            </tr>
+        </table>
+
+    </div>
+{% endblock %}
+
diff --git a/rapids/views.py b/rapids/views.py
index ac070213..55e38481 100755
--- a/rapids/views.py
+++ b/rapids/views.py
@@ -676,7 +676,7 @@ def exam_scores_cid2(request, pk):
 
     return render(
         request,
-        "rapids/exam_scores.html",
+        "rapids/exam_scores_new.html",
         {
             "cids": sorted(cids),
             "exam": exam,