Implement resource search functionality and enhance resource management in case details

2025-12-15 09:53:19 +00:00
parent 1e2300bd70
commit 4bec329aff
7 changed files with 321 additions and 130 deletions
@@ -201,15 +201,45 @@
                </div>
            </div>
        </div>
-        <p class="pre-whitespace"><b>Resource</b><br/>{% for caseresource in case.caseresource_set.all %}
-            <a href='{% url "atlas:resource_detail" caseresource.resource.pk %}'>{{caseresource.resource.name}}</a>
-            {% if caseresource.pre_review %}
-                <span title="This resource will be avalible to review when or taking a case">(pre)</span>
-            {% else %}
-                <span title="This resource will only be available when reviewing a completed case">(post)</span>
-            {% endif %}
+        <div class="mb-3">
+            <h5>Resources</h5>
+
+            <div class="mb-2">
+                <form id="resource-search-form" class="row g-2" hx-get="{% url 'atlas:resource_search_widget' %}" hx-target="#resource-search-results" hx-swap="innerHTML" hx-trigger="keyup changed delay:500ms from:#resource-search-q">
+                    <input type="hidden" name="case_id" value="{{ case.pk }}" />
+                    <div class="col-auto" style="flex: 1 1 300px;">
+                        <input type="search" id="resource-search-q" name="q" class="form-control form-control-sm" placeholder="Search resources by name, description or URL" />
+                    </div>
+                    <div class="col-auto">
+                        <select name="site" class="form-select form-select-sm">
+                            <option value="">All sites</option>
+                            {% for s in site_queryset %}
+                                <option value="{{ s.pk }}">{{ s.name }}</option>
                            {% endfor %}
-        </p>
+                        </select>
+                    </div>
+                    <div class="col-auto">
+                        <select name="subspecialty" class="form-select form-select-sm">
+                            <option value="">All subspecialties</option>
+                            {% for sp in subspecialty_queryset %}
+                                <option value="{{ sp.pk }}">{{ sp.name }}</option>
+                            {% endfor %}
+                        </select>
+                    </div>
+                    <div class="col-auto">
+                        <div class="form-check form-check-inline">
+                            <input class="form-check-input" type="checkbox" id="resource-open-access-{{ case.pk }}" name="open_access" value="1">
+                            <label class="form-check-label small" for="resource-open-access-{{ case.pk }}">Open</label>
+                        </div>
+                    </div>
+                </form>
+                <div id="resource-search-results" class="mt-2"></div>
+            </div>
+
+            <div>
+                {% include 'atlas/partials/case_resources_list.html' with case=case %}
+            </div>
+        </div>

        <div class="pre-whitespace multi-image-block"><b>Series:</b>
            <form>
@@ -0,0 +1,19 @@
+<div id="case-resources-list">
+  {% if case.caseresource_set.exists %}
+    <ul class="list-unstyled mb-0">
+      {% for cr in case.caseresource_set.all %}
+        <li class="py-1 d-flex justify-content-between align-items-center" data-caseresource-id="{{ cr.id }}">
+          <div>
+            <a href="{% url 'atlas:resource_detail' cr.resource.pk %}">{{ cr.resource.name }}</a>
+            {% if cr.pre_review %}<span class="badge bg-info text-dark ms-2 small">pre</span>{% endif %}
+          </div>
+          <div>
+            <button type="button" class="btn btn-sm btn-outline-danger" hx-post="{% url 'atlas:case_detach_resource' pk=case.pk %}" hx-vals='{"resource_id": "{{ cr.resource.pk }}"}' hx-swap="outerHTML" hx-target="#case-resources-list">Remove</button>
+          </div>
+        </li>
+      {% endfor %}
+    </ul>
+  {% else %}
+    <div class="text-muted">No resources attached to this case.</div>
+  {% endif %}
+</div>
@@ -5,7 +5,7 @@
 </div>

 <script>
-(function(){
+  (function(){
    var wrapperId = 'resource_media_wrapper_{{ resource.pk }}';
    if (document.getElementById(wrapperId).dataset._inited) return;
    var wrap = document.getElementById(wrapperId);
@@ -135,12 +135,12 @@
        }
      });
    }
-})();
+  })();
 </script>

 <style>
-.resource-media-wrapper .resource-media-element { display: inline-block; }
-.resource-media-wrapper img.resource-media-element { max-width: 100%; height: auto; }
-.resource-media-wrapper video.resource-media-element { max-width: 100%; height: auto; }
-.resource-media-modal .modal-content { background: rgba(0,0,0,0.95); }
+  .resource-media-wrapper .resource-media-element { display: inline-block; }
+  .resource-media-wrapper img.resource-media-element { max-width: 100%; height: auto; }
+  .resource-media-wrapper video.resource-media-element { max-width: 100%; height: auto; }
+  .resource-media-modal .modal-content { background: rgba(0,0,0,0.95); }
 </style>
@@ -0,0 +1,37 @@
+{% if results %}
+  <ul class="list-unstyled mb-0" id="resource_search_results_list_{{ field }}">
+    {% for item in results %}
+      <li class="py-1 d-flex justify-content-between align-items-center" data-resource-id="{{ item.id }}">
+        <div class="flex-grow-1">
+          <a href="{% url 'atlas:resource_detail' item.pk %}" target="_blank">{{ item.name|escape }}</a>
+          <div class="small text-muted">{{ item.get_display|safe }}</div>
+        </div>
+        <div class="d-flex gap-2">
+          <button
+            type="button"
+            class="btn btn-sm btn-success resource-attach-btn"
+            hx-post="{% url 'atlas:case_attach_resource' pk=case_id %}"
+            hx-vals='{"resource_id": "{{ item.id }}", "pre_review": "0"}'
+            hx-swap="outerHTML"
+            hx-target="#case-resources-list">
+            Attach
+          </button>
+          <button
+            type="button"
+            class="btn btn-sm btn-outline-success resource-attach-pre-btn"
+            hx-post="{% url 'atlas:case_attach_resource' pk=case_id %}"
+            hx-vals='{"resource_id": "{{ item.id }}", "pre_review": "1"}'
+            hx-swap="outerHTML"
+            hx-target="#case-resources-list">
+            Attach (pre)
+          </button>
+        </div>
+      </li>
+    {% endfor %}
+  </ul>
+  <div class="mt-2 text-end">
+    <small class="text-muted">{{ results|length }} results</small>
+  </div>
+{% else %}
+  <div><em>No resources found</em></div>
+{% endif %}
@@ -49,6 +49,8 @@ urlpatterns = [
    path("resource/<int:pk>/view", views.resource_view, name="resource_view"),
    path("resource/<int:pk>/update", views.ResourceUpdate.as_view(), name="resource_update"),
    path("resource/<int:pk>/delete", views.ResourceDelete.as_view(), name="resource_delete"),
+    path("resource-search-widget/", views.resource_search_widget, name="resource_search_widget"),
+
    path(
        "resource/create",
        views.ResourceCreate.as_view(),
@@ -177,6 +179,10 @@ urlpatterns = [
        views.collection_case_details,
        name="collection_case_details",
    ),
+
+    # HTMX endpoints for attaching/detaching resources to a case
+    path("case/<int:pk>/attach-resource/", views.case_attach_resource, name="case_attach_resource"),
+    path("case/<int:pk>/detach-resource/", views.case_detach_resource, name="case_detach_resource"),
    # Backwards-compatible redirect from legacy case_id-style URLs
    path(
        "collection/<int:exam_id>/case/id/<int:case_id>/details",
@@ -46,7 +46,7 @@ from django.http import Http404, JsonResponse
 from django.http import HttpResponseRedirect, HttpResponse
 from django.contrib.contenttypes.models import ContentType

-from generic.models import CidUser, CidUserExam, CimarCase
+from generic.models import CidUser, CidUserExam, CimarCase, Site
 from atlas.helpers import get_cases_available_to_user
 from rad.settings import REMOTE_URL, CIMAR_USERNAME, CIMAR_PASSWORD

@@ -478,6 +478,9 @@ def case_detail(request, pk):
            "is_atlas_editor": is_atlas_editor,
            "is_case_author": is_case_author,
            "can_mark_normal": can_mark_normal,
+            # Provide helper lists for resource search filters
+            "site_queryset": Site.objects.all(),
+            "subspecialty_queryset": Subspecialty.objects.all(),
        },
    )

@@ -4007,6 +4010,102 @@ def case_dicom_json(request, pk):
    return JsonResponse(case.get_case_dicom_json())


+@login_required
+def resource_search_widget(request):
+    """HTMX endpoint: search existing `Resource` objects with simple filters.
+
+    GET params:
+    - q: query string (name/description)
+    - site: site id (optional)
+    - subspecialty: subspecialty id (optional)
+    - open_access: '1' or '0' (optional)
+
+    Returns rendered partial `atlas/partials/resource_search_widget_results.html`.
+    """
+    from .models import Resource
+
+    q = request.GET.get("q", "").strip()
+    site = request.GET.get("site")
+    subspecialty = request.GET.get("subspecialty")
+    open_access = request.GET.get("open_access")
+
+    qs = Resource.objects.all()
+    if q:
+        qs = qs.filter(Q(name__icontains=q) | Q(description__icontains=q) | Q(url__icontains=q))
+    if site:
+        try:
+            qs = qs.filter(sites__id=int(site))
+        except Exception:
+            pass
+    if subspecialty:
+        try:
+            qs = qs.filter(subspecialty__id=int(subspecialty))
+        except Exception:
+            pass
+    if open_access in ["0", "1"]:
+        qs = qs.filter(open_access=(open_access == "1"))
+
+    # Restrict to what the user may see: open_access or authored (unless editor)
+    if not (request.user.is_superuser or request.user.groups.filter(name="atlas_editor").exists()):
+        qs = qs.filter(Q(open_access=True) | Q(author__id=request.user.id)).distinct()
+
+    results = qs.order_by("name")[:50]
+
+    field = request.GET.get("field", "resource_search")
+    case_id = request.GET.get("case_id")
+    return render(request, "atlas/partials/resource_search_widget_results.html", {"results": results, "field": field, "case_id": case_id})
+
+
+@login_required
+@require_POST
+def case_attach_resource(request, pk):
+    """Attach an existing resource to the case (HTMX POST).
+
+    POST params:
+    - resource_id: integer
+    - pre_review: '1' or '0' (optional)
+
+    Returns the updated `atlas/partials/case_resources_list.html` fragment.
+    """
+    case = get_case_for_case_detail(pk)
+    if not case.check_user_can_edit(request.user):
+        return HttpResponse(status=403)
+
+    resource_id = request.POST.get("resource_id")
+    pre_review = request.POST.get("pre_review", "0") == "1"
+    from .models import Resource, CaseResource
+    try:
+        resource = Resource.objects.get(pk=int(resource_id))
+    except Exception:
+        return HttpResponse(status=400)
+
+    # create if not exists
+    cr, created = CaseResource.objects.get_or_create(case=case, resource=resource, defaults={"pre_review": pre_review})
+    if not created:
+        # update flag
+        cr.pre_review = pre_review
+        cr.save()
+
+    # Render updated list
+    return render(request, "atlas/partials/case_resources_list.html", {"case": case})
+
+
+@login_required
+@require_POST
+def case_detach_resource(request, pk):
+    case = get_case_for_case_detail(pk)
+    if not case.check_user_can_edit(request.user):
+        return HttpResponse(status=403)
+    resource_id = request.POST.get("resource_id")
+    from .models import CaseResource
+    try:
+        cr = CaseResource.objects.filter(case=case, resource__id=int(resource_id))
+        cr.delete()
+    except Exception:
+        pass
+    return render(request, "atlas/partials/case_resources_list.html", {"case": case})
+
+
 def series_dicom_json(request, pk):
    series = get_object_or_404(Series, pk=pk)