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
4 changes: 4 additions & 0 deletions src/genlab_bestilling/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,10 @@ def to_draft(self) -> None:
self.confirmed_at = None
self.save()

def to_processing(self) -> None:
self.status = Order.OrderStatus.PROCESSING
self.save()

def toggle_seen(self) -> None:
self.is_seen = not self.is_seen
self.save()
Expand Down
2 changes: 1 addition & 1 deletion src/staff/tables.py
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ class Meta:
"internal_note",
"isolation_method",
]
order_by = ()
order_by = ("genlab_id",)

def render_checked(self, record: Any) -> str:
return mark_safe( # noqa: S308
Expand Down
37 changes: 24 additions & 13 deletions src/staff/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,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,
Expand All @@ -426,23 +430,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
Expand All @@ -453,6 +458,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
Expand Down