From d19d7b5c0c1062fa6d77a9c1c2114d274cf2a8c6 Mon Sep 17 00:00:00 2001
From: Emil Telstad <22004178+emilte@users.noreply.github.com>
Date: Thu, 26 Jun 2025 10:06:54 +0200
Subject: [PATCH] Improve ExtractionOrderAdmin.

---
 src/genlab_bestilling/admin.py  | 41 +++++++++++++++++++++++++++++++--
 src/genlab_bestilling/models.py |  2 +-
 2 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/src/genlab_bestilling/admin.py b/src/genlab_bestilling/admin.py
index f4650447..d5a44526 100644
--- a/src/genlab_bestilling/admin.py
+++ b/src/genlab_bestilling/admin.py
@@ -59,7 +59,7 @@ class GenrequestAdmin(ModelAdmin):
         # "sample_types",
         "area",
     ]
-    search_fields = ["name"]
+    search_fields = ["name", "project__name"]
     list_filter_submit = True
 
     list_filter = [
@@ -131,7 +131,44 @@ class EquipmentOrderAdmin(ModelAdmin): ...
 
 
 @admin.register(ExtractionOrder)
-class ExtractionOrderAdmin(ModelAdmin): ...
+class ExtractionOrderAdmin(ModelAdmin):
+    EO = ExtractionOrder
+    list_filter_submit = True
+
+    list_display = [
+        EO.name.field.name,
+        EO.genrequest.field.name,
+        EO.status.field.name,
+        EO.internal_status.field.name,
+        EO.needs_guid.field.name,
+        EO.return_samples.field.name,
+        EO.pre_isolated.field.name,
+        EO.confirmed_at.field.name,
+        EO.last_modified_at.field.name,
+        EO.created_at.field.name,
+    ]
+    filter_horizontal = [
+        EO.species.field.name,
+        EO.sample_types.field.name,
+    ]
+
+    search_help_text = "Search for extraction name"
+    search_fields = [
+        EO.name.field.name,
+    ]
+    list_filter = [
+        (EO.species.field.name, unfold_filters.AutocompleteSelectMultipleFilter),
+        (EO.sample_types.field.name, unfold_filters.AutocompleteSelectMultipleFilter),
+        (EO.genrequest.field.name, unfold_filters.AutocompleteSelectMultipleFilter),
+        EO.status.field.name,
+        EO.internal_status.field.name,
+        EO.needs_guid.field.name,
+        EO.return_samples.field.name,
+        EO.pre_isolated.field.name,
+        EO.confirmed_at.field.name,
+        EO.last_modified_at.field.name,
+        EO.created_at.field.name,
+    ]
 
 
 @admin.register(AnalysisOrder)
diff --git a/src/genlab_bestilling/models.py b/src/genlab_bestilling/models.py
index d5744cf1..7ac50f77 100644
--- a/src/genlab_bestilling/models.py
+++ b/src/genlab_bestilling/models.py
@@ -206,7 +206,7 @@ class Genrequest(models.Model):  # type: ignore[django-manager-missing]
     tags = TaggableManager(blank=True)
 
     def __str__(self):
-        return f"#GEN_{self.id}"
+        return f"#GEN_{self.id} ({self.project})"
 
     def get_absolute_url(self) -> str:
         return reverse(