From 22299b9298e51ef8c01652186d9c056dc1b97fd5 Mon Sep 17 00:00:00 2001
From: Ross <ross@xkjq.uk>
Date: Wed, 5 Nov 2025 21:58:43 +0000
Subject: [PATCH] Refactor case search functionality to include additional
 fields for improved search accuracy

---
 atlas/templates/atlas/index.html | 30 +++++++++++++++---------------
 atlas/views.py                   |  4 +++-
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/atlas/templates/atlas/index.html b/atlas/templates/atlas/index.html
index d2256463..96f74567 100644
--- a/atlas/templates/atlas/index.html
+++ b/atlas/templates/atlas/index.html
@@ -10,21 +10,6 @@
 
     <div class="row">
         <div class="col-12 col-md-8">
-            <div class="card mb-3">
-                <div class="card-body">
-                    <h5 class="card-title">Search cases</h5>
-                    <div class="mb-2">
-                        <input class="form-control" id="case-search-input" name="q" type="search"
-                            placeholder="Search cases by title or description"
-                            hx-get="{% url 'atlas:case_search_partial' %}"
-                            hx-trigger="input changed delay:500ms, keyup[key=='Enter']"
-                            hx-target="#case-search-results" >
-                    </div>
-                    <div id="case-search-results">
-                        {% include 'atlas/partials/_case_search_results.html' with cases=None %}
-                    </div>
-                </div>
-            </div>
             <div class="card mb-3">
                 <div class="card-body">
                     <h5 class="card-title">Collections</h5>
@@ -57,6 +42,21 @@
                     </ul>
                 </div>
             </div>
+            <div class="card mb-3">
+                <div class="card-body">
+                    <h5 class="card-title">Search cases</h5>
+                    <div class="mb-2">
+                        <input class="form-control" id="case-search-input" name="q" type="search"
+                            placeholder="Search cases by title or description"
+                            hx-get="{% url 'atlas:case_search_partial' %}"
+                            hx-trigger="input changed delay:500ms, keyup[key=='Enter']"
+                            hx-target="#case-search-results" >
+                    </div>
+                    <div id="case-search-results">
+                        {% include 'atlas/partials/_case_search_results.html' with cases=None %}
+                    </div>
+                </div>
+            </div>
         </div>
     </div>
 </div>
diff --git a/atlas/views.py b/atlas/views.py
index 02577057..6c5cd75f 100755
--- a/atlas/views.py
+++ b/atlas/views.py
@@ -212,7 +212,9 @@ def case_search_partial(request):
             | Q(presentation__name__icontains=q)
             | Q(subspecialty__name__icontains=q)
             | Q(series__description__icontains=q)
-            | Q(series__modality__icontains=q)
+            # Series.modality is a FK to generic.Modality; search its text field
+            | Q(series__modality__modality__icontains=q)
+            | Q(series__examination__examination__icontains=q)
             | Q(author__first_name__icontains=q)
             | Q(author__last_name__icontains=q)
             | Q(author__username__icontains=q)