From 76b4746b139d140d19b991c5597a7644d049e630 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Tue, 9 Jan 2024 23:41:48 +0000
Subject: [PATCH] add option to view cid candidate name in scores page

---
 generic/templates/generic/exam_cids.html      | 90 ++++++++++++++-----
 .../templates/generic/exam_scores_base.html   | 24 ++++-
 generic/urls.py                               |  1 +
 generic/views.py                              | 12 +++
 templates/exam_user_status.html               |  8 +-
 5 files changed, 104 insertions(+), 31 deletions(-)

diff --git a/generic/templates/generic/exam_cids.html b/generic/templates/generic/exam_cids.html
index e17eedb9..d10d84c1 100644
--- a/generic/templates/generic/exam_cids.html
+++ b/generic/templates/generic/exam_cids.html
@@ -1,13 +1,36 @@
+<div id="history-modal"
+     class="modal modal-blur fade"
+     style="display: none"
+     aria-hidden="false"
+     tabindex="-1">
+    <div class="modal-dialog modal-lg modal-dialog-centered" role="document">
+        <h2>Exam user history:
+            <span id="history-user"></span>
+        </h2>
+        <div class="modal-content"></div>
+    </div>
+</div>
 
 <div class="card text-white bg-dark">
     <h3>CID candidates</h3>
     {% if cid_users %}
         <p>{{cid_user_count}} CID candidates.</p>
 
+        <div id="htmx-info"></div>
+
         <ol class="cid-candidate-list">
             {% for cid in cid_users %}
 
-                <li class="cid-user" data-cid={{cid.cid}}><div class="cid-data"><a href="{% url 'generic:update_cid' cid.pk %}">{{cid.cid}}</a> [{{cid.passcode}}]</div><div class="cid-name">{{cid.name}}</div> <div class="cid-email">Email: {{cid.email}}</div>
+                <li class="cid-user" data-cid={{cid.cid}}><div class="cid-data">
+                    <i class="bi bi-clock-history"
+                       title="View user exam history"
+                       hx-get="{% url exam.app_name|add:':exam_user_status_cid' exam.id cid.cid %}"
+                       hx-target=".modal-content"
+                       data-bs-toggle="modal"
+                       data-bs-target="#history-modal"
+                       _="on htmx:afterOnLoad put {{cid.cid}} into #history-user.innerHTML "
+                    ></i>
+                    <a href="{% url 'generic:update_cid' cid.pk %}">{{cid.cid}}</a> [{{cid.passcode}}]</div><div class="cid-name">{{cid.name}}</div> <div class="cid-email">Email: {{cid.email}}</div>
                 </li>
 
             {% endfor %}
@@ -29,7 +52,18 @@
         <ol class="user-candidate-list">
             {% for user in user_users %}
 
-                <li class="user-user" data-user="{{user.username}}"><div>{{user.username}}</div> 
+                <li class="user-user" data-user="{{user.username}}">
+
+                    <div>
+                                           <i class="bi bi-clock-history"
+                       title="View user exam history"
+                       hx-get="{% url exam.app_name|add:':exam_user_status_user' exam.id user.id %}"
+                       hx-target=".modal-content"
+                       data-bs-toggle="modal"
+                       data-bs-target="#history-modal"
+                       _="on htmx:afterOnLoad put {{cid.cid}} into #history-user.innerHTML "
+                    ></i> 
+                        {{user.username}}</div>
                     <div>Email: {{user.email}}</div>
                 </li>
 
@@ -64,37 +98,47 @@
             </ul>
         </details>
     </div>
-
+<br/>
 {% endif %}
+<span
+    title="View all user exam history"
+    hx-get="{% url exam.app_name|add:':exam_user_status' exam.id %}"
+    hx-target=".modal-content"
+    data-bs-toggle="modal"
+    data-bs-target="#history-modal"
+    _="on htmx:afterOnLoad put {{cid.cid}} into #history-user.innerHTML "
+>
+    Exam history <i class="bi bi-clock-history"></i>
+</span>
 
 
 
 {% block js %}
-<script>
-$(document).ready(function() {
+    <script>
+        $(document).ready(function() {
     // Highlight users that have submitted answers
-    $("#submitted-candidates li").each(function(n, el) {
-        console.log(el);
-        if (el.dataset.cid != "None") {
-            $(`.cid-user[data-cid=${el.dataset.cid}]`).addClass("submitted")
-        }
-        if (el.dataset.user != "None") {
-            $(`.user-user[data-user="${el.dataset.user}"]`).addClass("submitted")
-        }
-    });
+            $("#submitted-candidates li").each(function(n, el) {
+                console.log(el);
+                if (el.dataset.cid != "None") {
+                    $(`.cid-user[data-cid=${el.dataset.cid}]`).addClass("submitted")
+                }
+                if (el.dataset.user != "None") {
+                    $(`.user-user[data-user="${el.dataset.user}"]`).addClass("submitted")
+                }
+            });
 
-})    
-</script>
+        })
+    </script>
 {% endblock js %}
 
 
 {% block css %}
-<style>
-    .submitted {
-        color: green;
-    }
-</style>
+    <style>
+        .submitted {
+            color: green;
+        }
+    </style>
 {% endblock css %}
-    
-    
+
+
 
diff --git a/generic/templates/generic/exam_scores_base.html b/generic/templates/generic/exam_scores_base.html
index d4fae0fe..753c003f 100644
--- a/generic/templates/generic/exam_scores_base.html
+++ b/generic/templates/generic/exam_scores_base.html
@@ -51,8 +51,8 @@
     <div>
         <table class="table table-dark table-striped table-hover table-sm cid-score-table sortable">
             <tr>
-                <th>Candidate ID</th>
-                <th>Score</th>
+                <th title="click to sort by candidate / user id">Candidate ID</th>
+                <th title="click to sort by score">Score</th>
                 {% if exam.app_name == "longs" or exam.app_name == "rapids" %}
                     <th>Normalised Score</th>
                 {% endif %}
@@ -60,9 +60,16 @@
             {% for cid in cids %}
                 <tr class="candidate-row" data-answer-count={{user_answer_count|get_item:cid}}>
                     {% if cid|slice:":1" == "u" %}
-                        <td>{{cids_user_id_map|get_item:cid}}</td>
+                        <td class="cid" >{{cids_user_id_map|get_item:cid}}</td>
                     {% else %}
-                        <td><a href="{% url 'cid_scores_admin' cid|slice:'2:' %}">{{cid}}</a></td>
+                        <td class="cid" data-cid="{{cid|slice:'2:'}}"><a href="{% url 'cid_scores_admin' cid|slice:'2:' %}">{{cid}}</a>
+                            <span title="Click to show candidate details"
+                                  hx-get="{% url 'generic:cid_details' cid|slice:'2:' %}"
+                                  hx-target="this"
+                            >
+                                <i class="bi bi-binoculars search-cid"                             ></i>
+                            </span>
+                        </td>
                     {% endif %}
                     <td>{{user_scores|get_item:cid}}</td>
 
@@ -172,6 +179,15 @@
             content: "*";
             color: red;
         }
+
+        .search-cid {
+            display: none;
+        }
+
+        .cid:hover .search-cid {
+            display: inline-block;
+            color: darkblue;
+        }
     </style>
 
 {% endblock %}
\ No newline at end of file
diff --git a/generic/urls.py b/generic/urls.py
index 24136abd..427990be 100755
--- a/generic/urls.py
+++ b/generic/urls.py
@@ -123,6 +123,7 @@ urlpatterns = [
         name="user_group_create",
     ),
     path("cids/create", views.manage_cid_users, name="manage_cid_users"),
+    path("cids/<int:cid>/details", views.cid_details, name="cid_details"),
     path("cids/create/email", views.create_cid_email, name="create_cid_email"),
     path("supervisor", views.SupervisorList.as_view(), name="supervisor"),
     path(
diff --git a/generic/views.py b/generic/views.py
index c81fa746..0373338f 100644
--- a/generic/views.py
+++ b/generic/views.py
@@ -2047,6 +2047,7 @@ class ExamViews(View, LoginRequiredMixin):
         user_ids = set()
 
         cids_user_id_map = {}
+        cids_name_map = {}
 
         # Loop through all candidates
         for cid_user_answer in cid_user_answers:
@@ -2791,6 +2792,17 @@ def candidate_email_results_resend(request, cid, resend=True):
 def create_cid_email(request):
     pass
 
+@user_is_cid_user_manager
+def cid_details(request, cid: int):
+    print(cid)
+    if request.htmx:
+        cid_user = get_object_or_404(CidUser, cid=cid)
+
+        print(cid_user.name)
+
+        return HttpResponse(f"{cid_user.name} ({cid_user.email})")
+
+    raise PermissionDenied()  # or Http404
 
 @user_is_cid_user_manager
 def manage_cid_users(request):
diff --git a/templates/exam_user_status.html b/templates/exam_user_status.html
index 4b3d396c..7073ab5a 100644
--- a/templates/exam_user_status.html
+++ b/templates/exam_user_status.html
@@ -1,5 +1,4 @@
 {% if statuses %}
-    <div class="alert alert-warning" role="alert">
         <ul>
             {% for status in statuses %}
                 <li>
@@ -13,11 +12,12 @@
                     {% endif %}
                      {{status.status}}
                      {{status.extra}} {% endcomment %}
-                        
-                     {{status}}
+
+                    {{status}}
 
                 </li>
             {% endfor %}
         </ul>
-    </div>
+{% else %}
+    Nil recorded.
 {% endif %}