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
5 changes: 5 additions & 0 deletions src/staff/tables.py
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,11 @@ class Meta:
"isolation_method",
]

def render_checked(self, record: Any) -> str:
return mark_safe( # noqa: S308
f'<input type="checkbox" name="checked-{record.order.id}" value="{record.id}">' # noqa: E501
)


class OrderExtractionSampleTable(SampleBaseTable):
class Meta(SampleBaseTable.Meta):
Expand Down
2 changes: 1 addition & 1 deletion src/staff/templates/staff/sample_lab.html
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ <h3 class="text-4xl mb-5">{% block page-title %}{% if order %}{{ order }} - Samp
const noteInputs = document.querySelectorAll('.internal_note-input');

selectAll?.addEventListener('change', function() {
const checkboxes = document.querySelectorAll('input[type="checkbox"]');
const checkboxes = document.querySelectorAll(`input[name="checked-{{ order.pk }}"]`);
checkboxes.forEach((cb) => {
cb.checked = selectAll.checked;
})
Expand Down
27 changes: 25 additions & 2 deletions src/staff/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from django.contrib import messages
from django.contrib.auth.mixins import LoginRequiredMixin, UserPassesTestMixin
from django.db import models
from django.db.models import Count
from django.db.models import Count, Exists, OuterRef
from django.forms import Form
from django.http import HttpRequest, HttpResponse, HttpResponseRedirect, JsonResponse
from django.shortcuts import get_object_or_404
Expand Down Expand Up @@ -376,7 +376,7 @@ def get_success_url(self) -> str:

def post(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
status_name = request.POST.get("status")
selected_ids = request.POST.getlist("checked")
selected_ids = request.POST.getlist(f"checked-{self.get_order().pk}")
isolation_method = request.POST.get("isolation_method")

if not selected_ids:
Expand All @@ -390,6 +390,10 @@ def post(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:

if status_name:
self.assign_status_to_samples(samples, status_name, order, request)
if status_name == "isolated":
# Cannot use "samples" here
# because we need to check all samples in the order
self.check_all_isolated(Sample.objects.filter(order=order))
if isolation_method:
self.update_isolation_methods(samples, isolation_method, request)
return HttpResponseRedirect(self.get_success_url())
Expand Down Expand Up @@ -436,6 +440,25 @@ def assign_status_to_samples(
request, f"{samples.count()} samples updated with status '{status_name}'."
)

# Checks if all samples in the order are isolated
# If they are, it updates the order status to completed
def check_all_isolated(self, samples: models.QuerySet) -> None:
samples_with_flag = samples.annotate(
has_isolated=Exists(
SampleStatusAssignment.objects.filter(
sample=OuterRef("pk"),
status=SampleStatusAssignment.SampleStatus.ISOLATED,
)
)
)

if not samples_with_flag.filter(has_isolated=False).exists():
self.get_order().to_next_status()
messages.success(
self.request,
"All samples are isolated. The order status is updated to completed.",
)

def update_isolation_methods(
self, samples: models.QuerySet, isolation_method: str, request: HttpRequest
) -> None:
Expand Down