From 4643f7b25116570291b4ade125f8f9d955ee99f8 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Mon, 3 Jan 2022 17:45:20 +0000
Subject: [PATCH] .

---
 generic/views.py                |  4 ++--
 templates/exam_list.html        | 18 ++++++++++++++----
 templates/exam_overview_js.html |  4 ++--
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/generic/views.py b/generic/views.py
index 8dfe7098..1d57e2db 100644
--- a/generic/views.py
+++ b/generic/views.py
@@ -362,7 +362,7 @@ class ExamViews(View, LoginRequiredMixin):
                 True if request.POST.get("publish_results") == "true" else False
             )
             exam.save()
-            data = {"status": "success", "publish_results": exam.publish_results, "name": exam.name}
+            data = {"status": "success", "publish_results": exam.publish_results, "name": exam.name, "id": exam.id}
             return JsonResponse(data, status=200)
         else:
             data = {"status": "error"}
@@ -376,7 +376,7 @@ class ExamViews(View, LoginRequiredMixin):
 
             exam.active = True if request.POST.get("active") == "true" else False
             exam.save()
-            data = {"status": "success", "active": exam.active}
+            data = {"status": "success", "active": exam.active, "name": exam.name, "id": exam.id}
             return JsonResponse(data, status=200)
         else:
             data = {"status": "error"}
diff --git a/templates/exam_list.html b/templates/exam_list.html
index d32a2965..d27e7851 100644
--- a/templates/exam_list.html
+++ b/templates/exam_list.html
@@ -12,9 +12,12 @@
                         {% if marking %}<a href="{% url app_name|add:':mark_overview' pk=exam.pk %}" class="flex-col">Mark</a>{% endif %}
                         <a href="{% url app_name|add:':exam_cids' exam_id=exam.pk %}" class="flex-col">Candidates</a> 
                         <a href="{% url app_name|add:':exam_scores_cid' pk=exam.pk %}" class="flex-col">Scores</a> 
-                        <input type="checkbox" id="{{exam.pk}}-pub" class="exam-publish-results-switch" data-posturl="{% url app_name|add:':exam_toggle_results_published' pk=exam.pk %}"
+                        <input type="checkbox" id="active-{{exam.pk}}" class="exam-active-switch" data-posturl="{% url app_name|add:':exam_toggle_active' pk=exam.pk %}"
+            {% if exam.active %}checked{% endif %}>
+                        <label for="active-{{exam.pk}}" class="flex-col icon-container active-icon" title="Click to toggle active state">Exam Active</label>
+                        <input type="checkbox" id="published-{{exam.pk}}" class="exam-publish-results-switch" data-posturl="{% url app_name|add:':exam_toggle_results_published' pk=exam.pk %}"
             {% if exam.publish_results %}checked{% endif %}>
-                        <label for="{{exam.pk}}-pub" class="flex-col icon-container published-icon">Results Published</label>
+                        <label for="published-{{exam.pk}}" class="flex-col icon-container published-icon" title="Click to toggle published state">Results Published</label>
                     </li>
                 {% endif %}
             {% endfor %}
@@ -48,7 +51,7 @@
 
     <style>
 
-.published-icon {
+.published-icon, .active-icon {
   border: 1px dotted gray;
   opacity: 20%;
   border-radius: 4px;
@@ -58,10 +61,17 @@
   -moz-user-select: none;
 }
 
-.published-icon:hover {
+.published-icon:hover, .active-icon:hover {
   opacity: 100%;
 }
 
+.exam-publish-results-switch:checked + .published-icon {
+  border: 1px solid green;
+  color: purple;
+  opacity: 100%;
+  display: inline-block;
+}
+
 .exam-publish-results-switch:checked + .published-icon {
   border: 1px solid purple;
   color: purple;
diff --git a/templates/exam_overview_js.html b/templates/exam_overview_js.html
index 5edbf493..a422714a 100644
--- a/templates/exam_overview_js.html
+++ b/templates/exam_overview_js.html
@@ -1,7 +1,7 @@
 <script type="text/javascript">
     $(document).ready(function () {
         // send request to change the is_private state on customSwitches toggle
-        $("#exam-active-switch").on("change", function (evt) {
+        $("#exam-active-switch, .exam-active-switch").on("change", function (evt) {
             $.ajax({
                 url: evt.currentTarget.dataset.posturl,
                 data: {
@@ -40,7 +40,7 @@
                     console.log(data);
 
                     if (data.status == "success") {
-                        toastr.info(`Exam: ${data.name}
+                        toastr.info(`Exam: ${data.name} [${data.id}]
                         Published state changed to: ${data.publish_results}.`)
                     }
                     // show some message according to the response.