Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/config/autocomplete.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

from capps.users.autocomplete import StaffUserAutocomplete, UserAutocomplete
from genlab_bestilling.autocomplete import (
AnalysisMarkerAutocomplete,
AnalysisOrderAutocomplete,
AreaAutocomplete,
EquipmentAutocomplete,
Expand Down Expand Up @@ -42,4 +43,9 @@
IsolationMethodAutocomplete.as_view(),
name="isolation-method",
),
path(
"analysis-marker/",
AnalysisMarkerAutocomplete.as_view(),
name="analysis-marker",
),
]
4 changes: 4 additions & 0 deletions src/genlab_bestilling/autocomplete.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,7 @@ class ExtractionOrderAutocomplete(autocomplete.Select2QuerySetView):

class IsolationMethodAutocomplete(autocomplete.Select2QuerySetView):
model = IsolationMethod


class AnalysisMarkerAutocomplete(autocomplete.Select2QuerySetView):
model = Marker
12 changes: 12 additions & 0 deletions src/staff/filters.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
Area,
ExtractionOrder,
ExtractionPlate,
Marker,
Order,
Sample,
SampleMarkerAnalysis,
Expand Down Expand Up @@ -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 = (
Expand All @@ -82,6 +93,7 @@ class Meta:
"genrequest__area",
"responsible_staff",
"genrequest__species",
"markers",
)


Expand Down