From a6a7d75144049e053e83b4e038aedac843bac355 Mon Sep 17 00:00:00 2001
From: Ross <ross@xkjq.uk>
Date: Mon, 2 Feb 2026 22:29:52 +0000
Subject: [PATCH] Implement modal for case fields and add partial endpoint for
 dynamic content retrieval

---
 atlas/templates/atlas/collection_detail.html  |  6 +++
 .../atlas/partials/case_field_modal.html      | 14 +++++++
 .../atlas/partials/case_list_item.html        | 38 +++++++++++++++----
 .../casedetails_management_links.html         |  1 -
 atlas/urls.py                                 |  7 ++++
 atlas/views.py                                | 29 ++++++++++++++
 6 files changed, 87 insertions(+), 8 deletions(-)
 create mode 100644 atlas/templates/atlas/partials/case_field_modal.html

diff --git a/atlas/templates/atlas/collection_detail.html b/atlas/templates/atlas/collection_detail.html
index d33f9830..84ff763b 100644
--- a/atlas/templates/atlas/collection_detail.html
+++ b/atlas/templates/atlas/collection_detail.html
@@ -150,6 +150,12 @@
         {% endif %}
 
         {% include 'exam_overview_js.html' %}
+        <!-- Modal for case fields (history / discussion / report) -->
+        <div id="case-field-modal" class="modal fade" tabindex="-1" aria-hidden="true">
+            <div class="modal-dialog modal-lg modal-dialog-centered">
+                <div class="modal-content"></div>
+            </div>
+        </div>
     </div>
 
 {% endblock %}
diff --git a/atlas/templates/atlas/partials/case_field_modal.html b/atlas/templates/atlas/partials/case_field_modal.html
new file mode 100644
index 00000000..be384499
--- /dev/null
+++ b/atlas/templates/atlas/partials/case_field_modal.html
@@ -0,0 +1,14 @@
+<div class="modal-header">
+    <h5 class="modal-title">{{ field|capfirst }}</h5>
+    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+</div>
+<div class="modal-body">
+    {% if content %}
+        <div class="pre-whitespace">{{ content|linebreaks }}</div>
+    {% else %}
+        <div class="text-muted">No {{ field }} available for this case.</div>
+    {% endif %}
+</div>
+<div class="modal-footer">
+    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
+</div>
diff --git a/atlas/templates/atlas/partials/case_list_item.html b/atlas/templates/atlas/partials/case_list_item.html
index 20132939..8dec3153 100644
--- a/atlas/templates/atlas/partials/case_list_item.html
+++ b/atlas/templates/atlas/partials/case_list_item.html
@@ -23,20 +23,44 @@
             {% endif %}
         </div>
 
-        {# Quick-view icons: open case page (contains history, discussion, report) #}
-        <a class="btn btn-outline-secondary" href="{% url 'atlas:case_detail' casedetail.case.pk %}" title="View history">
-            <i class="bi bi-clock-history"></i>
+
+    <div class="btn-group btn-group-sm ms-2" role="group" aria-label="case-field-links">
+        {# History button: opens modal with history content #}
+        <a class="btn btn-outline-secondary" 
+           hx-get="{% url 'atlas:collection_case_field_partial' casedetail.collection.pk casedetail.case.pk 'history' %}"
+           hx-target=".modal-content" data-bs-toggle="modal" data-bs-target="#case-field-modal" title="View history">
+            {% if casedetail.case.history %}
+                <i class="bi bi-clock-history text-primary"></i>
+            {% else %}
+                <i class="bi bi-clock-history text-muted"></i>
+            {% endif %}
         </a>
 
-        <a class="btn btn-outline-secondary" href="{% url 'atlas:case_detail' casedetail.case.pk %}" title="View discussion">
-            <i class="bi bi-chat-left-text"></i>
+        {# Discussion button #}
+        <a class="btn btn-outline-secondary"
+           hx-get="{% url 'atlas:collection_case_field_partial' casedetail.collection.pk casedetail.case.pk 'discussion' %}"
+           hx-target=".modal-content" data-bs-toggle="modal" data-bs-target="#case-field-modal" title="View discussion">
+            {% if casedetail.case.discussion %}
+                <i class="bi bi-chat-left-text text-primary"></i>
+            {% else %}
+                <i class="bi bi-chat-left-text text-muted"></i>
+            {% endif %}
         </a>
 
-        <a class="btn btn-outline-secondary" href="{% url 'atlas:case_detail' casedetail.case.pk %}" title="View report">
-            <i class="bi bi-file-earmark-text"></i>
+        {# Report button #}
+        <a class="btn btn-outline-secondary"
+           hx-get="{% url 'atlas:collection_case_field_partial' casedetail.collection.pk casedetail.case.pk 'report' %}"
+           hx-target=".modal-content" data-bs-toggle="modal" data-bs-target="#case-field-modal" title="View report">
+            {% if casedetail.case.report %}
+                <i class="bi bi-file-earmark-text text-primary"></i>
+            {% else %}
+                <i class="bi bi-file-earmark-text text-muted"></i>
+            {% endif %}
         </a>
     </div>
 
+    </div>
+
     <div class="d-flex align-items-center ms-3">
         {% include 'atlas/partials/casedetails_management_links.html' %}
     </div>
diff --git a/atlas/templates/atlas/partials/casedetails_management_links.html b/atlas/templates/atlas/partials/casedetails_management_links.html
index 2c710e2a..8cce6586 100644
--- a/atlas/templates/atlas/partials/casedetails_management_links.html
+++ b/atlas/templates/atlas/partials/casedetails_management_links.html
@@ -23,7 +23,6 @@
             </a>
         {% endif %}
     </div>
-
     <div class="btn-group btn-group-sm" role="group" aria-label="status-indicator">
         {% if casedetail.default_viewerstate %}
             <button type="button" class="btn btn-sm btn-outline-success" aria-disabled="true" title="This case has a default viewerstate defined">
diff --git a/atlas/urls.py b/atlas/urls.py
index 0ed24f9e..8d670e67 100755
--- a/atlas/urls.py
+++ b/atlas/urls.py
@@ -227,6 +227,13 @@ urlpatterns = [
         views.collection_case_dicom_json_review,
         name="collection_case_dicom_json_review",
     ),
+    # Partial endpoint to return a single case field (history/discussion/report) for modal display
+    path(
+        "collection/<int:exam_id>/case/<int:case_number>/field/<str:field>",
+        views.collection_case_field_partial,
+        name="collection_case_field_partial",
+    ),
+
     path(
         "collection/<int:exam_id>/case/id/<int:case_id>/dicom_json/review",
         views.redirect_collection_case_dicom_json_review_by_id,
diff --git a/atlas/views.py b/atlas/views.py
index 02129413..abd7b549 100755
--- a/atlas/views.py
+++ b/atlas/views.py
@@ -4339,6 +4339,35 @@ def collection_case_dicom_json(request, exam_id, case_id, review=False):
     return JsonResponse(casedetail.case.get_case_dicom_json(priors=priors))
 
 
+def collection_case_field_partial(request, exam_id, case_number, field):
+    """Return a small HTML partial containing a single field (history/discussion/report)
+    for the given case in a collection. Supports case_number (index) or case_id (pk).
+    """
+    # Support either case_number (index) or case_id (case PK)
+    try:
+        casedetail = CaseDetail.objects.get(case=case_number, collection=exam_id)
+    except Exception:
+        collection = get_object_or_404(CaseCollection, pk=exam_id)
+        try:
+            case_obj = collection.get_case_by_index(int(case_number))
+            casedetail = CaseDetail.objects.get(case=case_obj, collection=collection)
+        except Exception:
+            raise Http404("Case not found in collection")
+
+    field = field.lower()
+    if field == "history":
+        # Use casedetail helper to respect redact/override/collection settings when appropriate
+        content = casedetail.get_history_pre() if hasattr(casedetail, "get_history_pre") else (casedetail.case.history or "")
+    elif field == "discussion":
+        content = casedetail.case.discussion or ""
+    elif field == "report":
+        content = casedetail.case.report or ""
+    else:
+        raise Http404("Unknown field")
+
+    return render(request, "atlas/partials/case_field_modal.html", {"casedetail": casedetail, "field": field, "content": content})
+
+
 def case_dicom_json(request, pk):
     case = get_object_or_404(Case, pk=pk)