From 14b0086b78bd959dae91a6ac05d12392acc10395 Mon Sep 17 00:00:00 2001
From: Morten Madsen Lyngstad <morten.lyngstad@bekk.no>
Date: Mon, 28 Jul 2025 09:00:52 +0200
Subject: [PATCH] Add AnalysisMarkerAutocomplete and filter for markers in
 AnalysisOrders page

---
 src/config/autocomplete.py            |  6 ++++++
 src/genlab_bestilling/autocomplete.py |  4 ++++
 src/staff/filters.py                  | 12 ++++++++++++
 3 files changed, 22 insertions(+)

diff --git a/src/config/autocomplete.py b/src/config/autocomplete.py
index 30d2f15e..3850e0bc 100644
--- a/src/config/autocomplete.py
+++ b/src/config/autocomplete.py
@@ -2,6 +2,7 @@
 
 from capps.users.autocomplete import StaffUserAutocomplete, UserAutocomplete
 from genlab_bestilling.autocomplete import (
+    AnalysisMarkerAutocomplete,
     AnalysisOrderAutocomplete,
     AreaAutocomplete,
     EquipmentAutocomplete,
@@ -42,4 +43,9 @@
         IsolationMethodAutocomplete.as_view(),
         name="isolation-method",
     ),
+    path(
+        "analysis-marker/",
+        AnalysisMarkerAutocomplete.as_view(),
+        name="analysis-marker",
+    ),
 ]
diff --git a/src/genlab_bestilling/autocomplete.py b/src/genlab_bestilling/autocomplete.py
index 04514b0f..fbb9be40 100644
--- a/src/genlab_bestilling/autocomplete.py
+++ b/src/genlab_bestilling/autocomplete.py
@@ -72,3 +72,7 @@ class ExtractionOrderAutocomplete(autocomplete.Select2QuerySetView):
 
 class IsolationMethodAutocomplete(autocomplete.Select2QuerySetView):
     model = IsolationMethod
+
+
+class AnalysisMarkerAutocomplete(autocomplete.Select2QuerySetView):
+    model = Marker
diff --git a/src/staff/filters.py b/src/staff/filters.py
index f37b5b46..2ea3ce8c 100644
--- a/src/staff/filters.py
+++ b/src/staff/filters.py
@@ -13,6 +13,7 @@
     Area,
     ExtractionOrder,
     ExtractionPlate,
+    Marker,
     Order,
     Sample,
     SampleMarkerAnalysis,
@@ -74,6 +75,16 @@ class AnalysisOrderFilter(filters.FilterSet):
         ),
     )
 
+    markers = filters.ModelMultipleChoiceFilter(
+        field_name="markers",
+        label="Markers",
+        queryset=Marker.objects.all(),
+        widget=autocomplete.ModelSelect2Multiple(
+            url="autocomplete:analysis-marker",
+            attrs={"class": "w-full"},
+        ),
+    )
+
     class Meta:
         model = AnalysisOrder
         fields = (
@@ -82,6 +93,7 @@ class Meta:
             "genrequest__area",
             "responsible_staff",
             "genrequest__species",
+            "markers",
         )