{% block page-title %}{% if order %}{{ order }} - Samp
{% endcomment %}
diff --git a/src/staff/templates/staff/samplemarkeranalysis_filter.html b/src/staff/templates/staff/samplemarkeranalysis_filter.html
index a4478564..749af0e8 100644
--- a/src/staff/templates/staff/samplemarkeranalysis_filter.html
+++ b/src/staff/templates/staff/samplemarkeranalysis_filter.html
@@ -17,6 +17,7 @@
diff --git a/src/staff/views.py b/src/staff/views.py
index 9fd4274d..4e741c7a 100644
--- a/src/staff/views.py
+++ b/src/staff/views.py
@@ -110,6 +110,7 @@ def get_queryset(self) -> models.QuerySet[AnalysisOrder]:
"genrequest__project",
"genrequest__area",
)
+ .annotate(total_samples=Count("samples"))
)
@@ -130,7 +131,12 @@ def get_queryset(self) -> models.QuerySet[ExtractionOrder]:
"genrequest__area",
)
.prefetch_related("species", "sample_types")
- .annotate(sample_count=Count("samples"))
+ .annotate(
+ total_samples=Count("samples"),
+ total_samples_isolated=models.Count(
+ "samples", filter=models.Q(samples__is_isolated=True)
+ ),
+ )
)
@@ -430,6 +436,10 @@ def post(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
self.update_isolation_methods(samples, isolation_method, request)
return HttpResponseRedirect(self.get_success_url())
+ def statuses_with_lower_or_equal_priority(self, status_name: str) -> list[str]:
+ index = self.VALID_STATUSES.index(status_name)
+ return self.VALID_STATUSES[: index + 1]
+
def assign_status_to_samples(
self,
samples: models.QuerySet,
@@ -440,23 +450,24 @@ def assign_status_to_samples(
messages.error(request, f"Status '{status_name}' is not valid.")
return
- update_fields = []
+ statuses_to_turn_on = self.statuses_with_lower_or_equal_priority(status_name)
+ field_name = f"is_{status_name}"
- if status_name == self.MARKED:
- update_fields.append("is_marked")
- samples.update(is_marked=True)
+ samples_to_turn_off_ids = list(
+ samples.filter(**{field_name: True}).values_list("id", flat=True)
+ )
+ samples_to_turn_on_ids = list(
+ samples.filter(**{field_name: False}).values_list("id", flat=True)
+ )
- elif status_name == self.PLUCKED:
- update_fields.extend(["is_marked", "is_plucked"])
- samples.update(is_marked=True, is_plucked=True)
+ Sample.objects.filter(id__in=samples_to_turn_off_ids).update(
+ **{field_name: False}
+ )
- elif status_name == self.ISOLATED:
- update_fields.extend(["is_marked", "is_plucked", "is_isolated"])
- samples.update(is_marked=True, is_plucked=True, is_isolated=True)
+ update_dict = {f"is_{status}": True for status in statuses_to_turn_on}
+ Sample.objects.filter(id__in=samples_to_turn_on_ids).update(**update_dict)
- messages.success(
- request, f"{samples.count()} samples updated with status '{status_name}'."
- )
+ messages.success(request, "Samples updated successfully")
# Checks if all samples in the order are isolated
# If they are, it updates the order status to completed
@@ -467,6 +478,12 @@ def check_all_isolated(self, samples: models.QuerySet) -> None:
self.request,
"All samples are isolated. The order status is updated to completed.",
)
+ elif self.get_order().status == Order.OrderStatus.COMPLETED:
+ self.get_order().to_processing()
+ messages.success(
+ self.request,
+ "Not all samples are isolated. The order status is updated to processing.", # noqa: E501
+ )
def update_isolation_methods(
self, samples: models.QuerySet, isolation_method: str, request: HttpRequest
@@ -787,13 +804,20 @@ def form_invalid(self, form: Form) -> HttpResponse:
class OrderPrioritizedAdminView(StaffMixin, ActionView):
+ def get_success_url(self) -> str:
+ next_url = self.request.POST.get("next")
+ if next_url and url_has_allowed_host_and_scheme(
+ next_url,
+ allowed_hosts={self.request.get_host()},
+ require_https=self.request.is_secure(),
+ ):
+ return next_url
+
+ return reverse("staff:dashboard")
+
def post(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
pk = kwargs.get("pk")
order = Order.objects.get(pk=pk)
order.toggle_prioritized()
- return HttpResponseRedirect(
- reverse(
- "staff:dashboard",
- )
- )
+ return redirect(self.get_success_url())