From ad4be1e9a677182a6d5131b344589eae9ad90869 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Mon, 21 Jul 2025 12:52:45 +0100
Subject: [PATCH] improve collection overview page

---
 atlas/templates/atlas/collection_detail.html  |  8 +--
 atlas/urls.py                                 | 10 ++++
 generic/templates/generic/cid_view.html       | 10 ++++
 .../generic/partials/exams/exam_status.html   | 30 +++++++++++
 generic/views.py                              | 52 +++++++++++++++++++
 rad/static/css/anatomy.css                    |  8 +++
 6 files changed, 115 insertions(+), 3 deletions(-)
 create mode 100644 generic/templates/generic/partials/exams/exam_status.html

diff --git a/atlas/templates/atlas/collection_detail.html b/atlas/templates/atlas/collection_detail.html
index 7045dd81..861c7e8a 100644
--- a/atlas/templates/atlas/collection_detail.html
+++ b/atlas/templates/atlas/collection_detail.html
@@ -1,14 +1,16 @@
 {% extends 'atlas/exams.html' %}
 
+{% load partials %}
+
 {% block content %}
     <h2>{{collection.name}}</h2>
 
     {% include 'exam_notes.html' %}
 
     <div>
-        Exam mode: {{collection.exam_mode}} (Exam open acess: {{collection.exam_open_access}})<br />
-        Publish results: {{collection.publish_results}}<br />
-        Active: {{collection.active}}<br />
+        Exam mode: {{collection.exam_mode}} (open access: {{collection.exam_open_access}})<br />
+        {% include "generic/partials/exams/exam_status.html#publish-results" %}
+        {% include "generic/partials/exams/exam_status.html#exam-active" %}
         Collection Type: {{collection.get_collection_type_display}}<br />
         Self review: {{collection.self_review}}<br />
     </div>
diff --git a/atlas/urls.py b/atlas/urls.py
index ae7cfd70..c4a54d5e 100755
--- a/atlas/urls.py
+++ b/atlas/urls.py
@@ -81,6 +81,16 @@ urlpatterns = [
         name="collection_take_start",
     ),
     path("collection/<int:pk>/authors", views.CaseCollectionAuthorUpdate.as_view(), name="collection_authors"),
+    path(
+        "collection/<int:pk>/toggle_results_published",
+        views.GenericExamViews.exam_toggle_results_published_htmx,
+        name="exam_toggle_results_published",
+    ),
+    path(
+        "collection/<int:pk>/toggle_active",
+        views.GenericExamViews.exam_toggle_active_htmx,
+        name="exam_toggle_active",
+    ),
     path(
         "collection/<int:exam_id>/cids",
         views.GenericExamViews.exam_cids,
diff --git a/generic/templates/generic/cid_view.html b/generic/templates/generic/cid_view.html
index cf9419d1..de0ca2de 100644
--- a/generic/templates/generic/cid_view.html
+++ b/generic/templates/generic/cid_view.html
@@ -104,6 +104,15 @@
 
                 </select>
             </span>
+            <span>
+                Shorts Exams<br />
+                <select id="shorts-exams" multiple="multiple">
+                    {% for name, id in shorts_exams %}
+                        <option value="{{id}}">{{name}}</option>
+                    {% endfor %}
+
+                </select>
+            </span>
             <span>
                 CaseCollection Exams<br />
                 <select id="casecollection-exams" multiple="multiple">
@@ -213,6 +222,7 @@
                 sba_exams: JSON.stringify($("#sbas-exams").val()),
                 longs_exams: JSON.stringify($("#longs-exams").val()),
                 anatomy_exams: JSON.stringify($("#anatomy-exams").val()),
+                shorts_exams: JSON.stringify($("#shorts-exams").val()),
                 casecollection_exams: JSON.stringify($("#casecollection-exams").val()),
                 cid_groups: JSON.stringify($("#cid-groups").val()),
                 delete: false,
diff --git a/generic/templates/generic/partials/exams/exam_status.html b/generic/templates/generic/partials/exams/exam_status.html
new file mode 100644
index 00000000..f2d4831b
--- /dev/null
+++ b/generic/templates/generic/partials/exams/exam_status.html
@@ -0,0 +1,30 @@
+{% load partials %}
+
+{% partialdef publish-results %}
+<div id="publish-results-status">
+        Publish results: <span>{{collection.publish_results}}</span>
+        <button 
+            hx-post="{% url 'atlas:exam_toggle_results_published' collection.pk %}"
+            hx-swap="outerHTML"
+            hx-target="#publish-results-status"
+            class="btn btn-sm btn-outline-primary reduce-opacity"
+        >
+            {% if collection.publish_results %}Unpublish Results{% else %}Publish Results{% endif %}
+        </button>
+</div>
+{% endpartialdef publish-results %}
+
+
+{% partialdef exam-active %}
+<div id="exam-active-status">
+        Exam active: <span>{{collection.active}}</span>
+        <button 
+            hx-post="{% url 'atlas:exam_toggle_active' collection.pk %}"
+            hx-swap="outerHTML"
+            hx-target="#exam-active-status"
+            class="btn btn-sm btn-outline-primary reduce-opacity"
+        >
+            {% if collection.active %}Deactivate Exam{% else %}Activate Exam{% endif %}
+        </button>
+</div>
+{% endpartialdef exam-active %}
\ No newline at end of file
diff --git a/generic/views.py b/generic/views.py
index f07a8d5a..070e8433 100644
--- a/generic/views.py
+++ b/generic/views.py
@@ -692,6 +692,58 @@ class ExamViews(View, LoginRequiredMixin):
             data = {"status": "error"}
             return JsonResponse(data, status=400)
 
+    @method_decorator(login_required)
+    def exam_toggle_results_published_htmx(self, request, pk):  
+        if request.method == "POST":
+            if not self.check_user_edit_access(request.user, exam_id=pk):
+                return HttpResponse(
+                    format_html(
+                        '<div class="alert alert-danger" role="alert">Error toggling results published.</div>'
+                    )
+                )
+
+            exam = get_object_or_404(self.Exam, pk=pk)
+
+            exam.publish_results = not exam.publish_results
+            exam.save()
+            return render(
+                request, "generic/partials/exams/exam_status.html#publish-results", context={
+                    "exam": exam,
+                    "collection": exam
+                })
+        else:
+            HttpResponse(
+                format_html(
+                    '<div class="alert alert-danger" role="alert">Error toggling results published.</div>'
+                ) 
+            )
+
+    @method_decorator(login_required)
+    def exam_toggle_active_htmx(self, request, pk):  
+        if request.method == "POST":
+            if not self.check_user_edit_access(request.user, exam_id=pk):
+                return HttpResponse(
+                    format_html(
+                        '<div class="alert alert-danger" role="alert">Error toggling exam active.</div>'
+                    )
+                )
+
+            exam = get_object_or_404(self.Exam, pk=pk)
+
+            exam.active = not exam.active
+            exam.save()
+            return render(
+                request, "generic/partials/exams/exam_status.html#exam-active", context={
+                    "exam": exam,
+                    "collection": exam
+                })
+        else:
+            HttpResponse(
+                format_html(
+                    '<div class="alert alert-danger" role="alert">Error toggling exam active.</div>'
+                ) 
+            )
+
     @method_decorator(login_required)
     def exam_toggle_results_published(self, request, pk):
         if request.method == "POST":
diff --git a/rad/static/css/anatomy.css b/rad/static/css/anatomy.css
index af0336c4..24909617 100644
--- a/rad/static/css/anatomy.css
+++ b/rad/static/css/anatomy.css
@@ -1387,4 +1387,12 @@ span#user-id {
     width: auto;
     margin-left: auto;
     margin-right: auto;
+}
+
+.btn.reduce-opacity {
+    opacity: 0.3;
+    transition: opacity 0.2s;
+}
+.btn.reduce-opacity:hover, .btn.reduce-opacity:focus {
+    opacity: 1;
 }
\ No newline at end of file