From 5761117e68c35b551a566af2c76ba0aba38a9026 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Mon, 9 Feb 2026 10:33:06 +0000
Subject: [PATCH] Enhance case display with modal functionality for findings
 and display sets

---
 atlas/templates/atlas/case_display_block.html | 204 +++++++++---------
 .../atlas/case_displayset_modal.html          |  18 +-
 2 files changed, 116 insertions(+), 106 deletions(-)

diff --git a/atlas/templates/atlas/case_display_block.html b/atlas/templates/atlas/case_display_block.html
index 1facf43a..83f11cb0 100755
--- a/atlas/templates/atlas/case_display_block.html
+++ b/atlas/templates/atlas/case_display_block.html
@@ -316,120 +316,116 @@
 
     <!-- Series Findings -->
                         <h5>Series Findings</h5>
-                        {% if case.ordered_series %}
-                            {% for series in case.ordered_series %}
-                                {% for finding in series.findings.all %}
-                                    <div class="finding-box" id="finding-box-{{ finding.pk }}" data-series="{{ series.pk }}">
+                        {% for series in case.ordered_series %}
+                            {% for finding in series.findings.all %}
+                                <div class="finding-box" id="finding-box-{{ finding.pk }}" data-series="{{ series.pk }}">
+                                    <span>
+                                        <a href="{{series.get_absolute_url}}?show_finding={{finding.pk}}">
+                                            <button class="btn btn-primary btn-sm">View</button>
+                                        </a>
+                                        <button class="btn btn-secondary btn-sm view-finding-modal" data-finding-id="{{ finding.pk }}" data-series-id="{{ series.pk }}">
+                                            View in Modal
+                                        </button>
+                                    </span>
+                                    {% if finding.findings %}
                                         <span>
-                                            <a href="{{series.get_absolute_url}}?show_finding={{finding.pk}}">
-                                                <button class="btn btn-primary btn-sm">View</button>
-                                            </a>
-                                            <button class="btn btn-secondary btn-sm view-finding-modal" data-finding-id="{{ finding.pk }}" data-series-id="{{ series.pk }}">
-                                                View in Modal
-                                            </button>
+                                            Findings: {% for f in finding.findings.all %}
+                                                {{f.get_link}},&nbsp;
+                                            {% endfor %}
                                         </span>
-                                        {% if finding.findings %}
-                                            <span>
-                                                Findings: {% for f in finding.findings.all %}
-                                                    {{f.get_link}},&nbsp;
-                                                {% endfor %}
-                                            </span>
-                                        {% endif %}
-                                        {% if finding.conditions %}
-                                            <span>
-                                                Conditions: {% for c in finding.conditions.all %}
-                                                    {{c.get_link}},&nbsp;
-                                                {% endfor %}
-                                            </span>
-                                        {% endif %}
-                                        {% if finding.structures %}
-                                            <span>
-                                                Structure: {% for s in finding.structures.all %}
-                                                    {{s.get_link}},&nbsp;
-                                                {% endfor %}
-                                            </span>
-                                        {% endif %}
-                                        {% if finding.description %}
-                                            <span>
-                                                Description: {{finding.description}}
-                                            </span>
-                                        {% endif %}
-                                    </div>
-                                {% endfor %}
+                                    {% endif %}
+                                    {% if finding.conditions %}
+                                        <span>
+                                            Conditions: {% for c in finding.conditions.all %}
+                                                {{c.get_link}},&nbsp;
+                                            {% endfor %}
+                                        </span>
+                                    {% endif %}
+                                    {% if finding.structures %}
+                                        <span>
+                                            Structure: {% for s in finding.structures.all %}
+                                                {{s.get_link}},&nbsp;
+                                            {% endfor %}
+                                        </span>
+                                    {% endif %}
+                                    {% if finding.description %}
+                                        <span>
+                                            Description: {{finding.description}}
+                                        </span>
+                                    {% endif %}
+                                </div>
                             {% endfor %}
-                        {% else %}
+                        {% empty%}
                             No series associated with case.
-                        {% endif %}
+                        {% endfor %}
 
     <!-- Case Display Sets -->
                         <h5 class="mt-3">Case Display Sets</h5>
-                        {% if case.display_sets %}
-                            <ul class="list-group">
-                                {% for ds in case.display_sets.all %}
-                                    <li class="list-group-item">
-                                        <b>Name: {{ ds.name }}</b>
-                                        {% if ds.description %}
-                                            <span class="text-muted">({{ ds.description }})</span>
+                        <ul class="list-group">
+                            {% for ds in case.display_sets.all %}
+                                <li class="list-group-item">
+                                    <b>Name: {{ ds.name }}</b>
+                                    {% if ds.description %}
+                                        <span class="text-muted">({{ ds.description }})</span>
+                                    {% endif %}
+                                    <span>
+                                        <a href="{% url 'atlas:case_displaysets_detail' ds.pk %}">View Display Set</a>
+                                        <button type="button" class="btn btn-secondary btn-sm view-displayset-modal ms-2" data-ds-id="{{ ds.pk }}" data-url="{% url 'atlas:case_displaysets_modal' ds.pk %}">View in Modal</button>
+                                    </span>
+                                    <div>
+                                        <strong>Findings:</strong>
+                                        {% if ds.findings.all %}
+                                            <ul>
+                                                {% for finding in ds.findings.all %}
+                                                    <li>{{ finding }}</li>
+                                                {% endfor %}
+                                            </ul>
+                                        {% else %}
+                                            <span class="text-muted">None</span>
                                         {% endif %}
-                                        <span>
-                                            <a href="{% url 'atlas:case_displaysets_detail' ds.pk %}">View Display Set</a>
-                                            <button type="button" class="btn btn-secondary btn-sm view-displayset-modal ms-2" data-ds-id="{{ ds.pk }}" data-url="{% url 'atlas:case_displaysets_modal' ds.pk %}">View in Modal</button>
-                                        </span>
-                                        <div>
-                                            <strong>Findings:</strong>
-                                            {% if ds.findings.all %}
-                                                <ul>
-                                                    {% for finding in ds.findings.all %}
-                                                        <li>{{ finding }}</li>
-                                                    {% endfor %}
-                                                </ul>
-                                            {% else %}
-                                                <span class="text-muted">None</span>
-                                            {% endif %}
-                                        </div>
-                                        <div>
-                                            <strong>Structures:</strong>
-                                            {% if ds.structures.all %}
-                                                <ul>
-                                                    {% for structure in ds.structures.all %}
-                                                        <li>{{ structure }}</li>
-                                                    {% endfor %}
-                                                </ul>
-                                            {% else %}
-                                                <span class="text-muted">None</span>
-                                            {% endif %}
-                                        </div>
-                                        <div>
-                                            <strong>Conditions:</strong>
-                                            {% if ds.conditions.all %}
-                                                <ul>
-                                                    {% for condition in ds.conditions.all %}
-                                                        <li>{{ condition }}</li>
-                                                    {% endfor %}
-                                                </ul>
-                                            {% else %}
-                                                <span class="text-muted">None</span>
-                                            {% endif %}
-                                        </div>
-                                        <div>
-                                            <details>
-                                                <summary class="small text-muted" style="cursor:pointer;">Show advanced (viewer state & annotations)</summary>
-                                                <div>
-                                                    <strong>Viewer State:</strong>
+                                    </div>
+                                    <div>
+                                        <strong>Structures:</strong>
+                                        {% if ds.structures.all %}
+                                            <ul>
+                                                {% for structure in ds.structures.all %}
+                                                    <li>{{ structure }}</li>
+                                                {% endfor %}
+                                            </ul>
+                                        {% else %}
+                                            <span class="text-muted">None</span>
+                                        {% endif %}
+                                    </div>
+                                    <div>
+                                        <strong>Conditions:</strong>
+                                        {% if ds.conditions.all %}
+                                            <ul>
+                                                {% for condition in ds.conditions.all %}
+                                                    <li>{{ condition }}</li>
+                                                {% endfor %}
+                                            </ul>
+                                        {% else %}
+                                            <span class="text-muted">None</span>
+                                        {% endif %}
+                                    </div>
+                                    <div>
+                                        <details>
+                                            <summary class="small text-muted" style="cursor:pointer;">Show advanced (viewer state & annotations)</summary>
+                                            <div>
+                                                <strong>Viewer State:</strong>
                                 <pre class="small">{{ ds.viewerstate|default:"{}" }}</pre>
-                                                </div>
-                                                <div>
-                                                    <strong>Annotations:</strong>
+                                            </div>
+                                            <div>
+                                                <strong>Annotations:</strong>
                                 <pre class="small">{{ ds.annotations|default:"{}" }}</pre>
-                                                </div>
-                                            </details>
-                                        </div>
-                                    </li>
-                                {% endfor %}
-                            </ul>
-                        {% else %}
-                            <span class="text-muted">No display sets for this case.</span>
-                        {% endif %}
+                                            </div>
+                                        </details>
+                                    </div>
+                                </li>
+                            {% empty %}
+                                <span class="text-muted">No display sets for this case.</span>
+                            {% endfor %}
+                        </ul>
                     </details>
                 </div>
                 <div>
diff --git a/atlas/templates/atlas/case_displayset_modal.html b/atlas/templates/atlas/case_displayset_modal.html
index 664ac9eb..90304d6c 100644
--- a/atlas/templates/atlas/case_displayset_modal.html
+++ b/atlas/templates/atlas/case_displayset_modal.html
@@ -6,14 +6,28 @@
         {% endif %}
     </div>
 
+    {# Viewer area for the modal - mounted by rad/static/dv3d bundle #}
+    <div class="mb-3">
+        <div id="modal_viewer_{{ ds.pk }}" class="dicom-viewer-root" style="height:420px;" data-auto-cache-stack="false" data-annotationjson="{{ ds.annotations|escapejs }}" data-viewerstate="{{ ds.viewerstate|escapejs }}"></div>
+    </div>
+
     {% if ds.viewerstate and ds.annotations %}
         <div class="mb-3">
             <button
                 type="button"
                 class="btn btn-primary"
-                onclick='importAnnotations_main_viewer({{ ds.annotations|safe }}); importViewerState_main_viewer({{ ds.viewerstate|safe }});'
-            >Load into viewer</button>
+                onclick='(window.importAnnotations_modal_viewer_{{ ds.pk }}||window.importAnnotations_modal_viewer||window.importAnnotations)({{ ds.annotations|safe }}); (window.importViewerState_modal_viewer_{{ ds.pk }}||window.importViewerState_modal_viewer||window.importViewerState)({{ ds.viewerstate|safe }});'
+            >Reload display set</button>
         </div>
+        <script>
+            (function(){
+                try{
+                    if(typeof window.mountDicomViewers === 'function'){
+                        window.mountDicomViewers();
+                    }
+                }catch(e){console.warn('Failed to schedule modal viewer auto-load:', e)}
+            })();
+        </script>
     {% endif %}
 
     <div class="mt-2">