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
41 changes: 39 additions & 2 deletions src/genlab_bestilling/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class GenrequestAdmin(ModelAdmin):
# "sample_types",
"area",
]
search_fields = ["name"]
search_fields = ["name", "project__name"]
list_filter_submit = True

list_filter = [
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/genlab_bestilling/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down