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
31 changes: 30 additions & 1 deletion src/genlab_bestilling/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -376,4 +376,33 @@ class ExtractionPlateAdmin(ModelAdmin): ...


@admin.register(AnalysisResult)
class AnalysisResultAdmin(ModelAdmin): ...
class AnalysisResultAdmin(ModelAdmin):
M = AnalysisResult
list_display = [
M.name.field.name,
M.marker.field.name,
M.order.field.name,
M.analysis_date.field.name,
M.last_modified_at.field.name,
M.created_at.field.name,
]

search_help_text = "Search for analysis result name"
search_fields = [M.name.field.name]
list_filter = [
(M.name.field.name, unfold_filters.FieldTextFilter),
(M.marker.field.name, unfold_filters.AutocompleteSelectMultipleFilter),
(M.order.field.name, unfold_filters.AutocompleteSelectMultipleFilter),
M.analysis_date.field.name,
M.last_modified_at.field.name,
M.created_at.field.name,
]
autocomplete_fields = [M.marker.field.name, M.order.field.name]
list_filter_submit = True
list_filter_sheet = False
filter_horizontal = [M.samples.field.name]
readonly_fields = [
M.analysis_date.field.name,
M.last_modified_at.field.name,
M.created_at.field.name,
]
13 changes: 8 additions & 5 deletions src/genlab_bestilling/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -707,16 +707,19 @@ def __str__(self):

class AnalysisResult(models.Model):
name = models.CharField()
created_at = models.DateTimeField(auto_now_add=True)
last_modified_at = models.DateTimeField(auto_now=True)
analysis_date = models.DateTimeField(null=True, blank=True)
marker = models.ForeignKey(f"{an}.Marker", on_delete=models.DO_NOTHING)
result_file = models.FileField(null=True, blank=True)
samples = models.ManyToManyField(f"{an}.Sample", blank=True)
extra = models.JSONField(null=True, blank=True)
order = models.ForeignKey(
f"{an}.AnalysisOrder",
null=True,
blank=True,
on_delete=models.SET_NULL,
)
result_file = models.FileField(null=True, blank=True)
samples = models.ManyToManyField(f"{an}.Sample", blank=True)
extra = models.JSONField(null=True, blank=True)
created_at = models.DateTimeField(auto_now_add=True)
last_modified_at = models.DateTimeField(auto_now=True)

def __str__(self) -> str:
return f"{self.name}"