Skip to content

Remove delete button when converted to draft #434

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aastabk merged 1 commit into from
Jul 25, 2025
Merged

Remove delete button when converted to draft #434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions src/genlab_bestilling/templates/genlab_bestilling/analysisorder_detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@ <h5 class="text-2xl my-5">Samples to analyze</h5>
{% url 'genrequest-order-clone' genrequest_id=object.genrequest_id pk=object.id as clone_order_url %}
{% action-button action=confirm_order_url class="btn custom_order_button" submit_text="Deliver order" csrf_token=csrf_token %}
{% action-button action=clone_order_url class="btn custom_order_button" submit_text="Clone Order" csrf_token=csrf_token %}
{% if all_samples_have_no_genlab_id %}
<a class="btn custom_order_button_red" href="{% url 'genrequest-analysis-delete' genrequest_id=object.genrequest_id pk=object.id %}">Delete</a>
{% endif %}
{% elif object.status == object.OrderStatus.DELIVERED %}
<a class="btn custom_order_button" href="{% url 'genrequest-analysis-samples' genrequest_id=object.genrequest_id pk=object.id %}">Samples</a>
{% endif %}
Expand Down
3 changes: 2 additions & 1 deletion src/genlab_bestilling/templates/genlab_bestilling/extractionorder_detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,9 @@ <h3 class="text-4xl mb-5">Order {{ object }}</h3>

{% url 'genrequest-order-confirm' genrequest_id=object.genrequest_id pk=object.id as confirm_order_url %}
{% action-button action=confirm_order_url class="btn custom_order_button" submit_text="Deliver order" csrf_token=csrf_token %}

{% if all_samples_have_no_genlab_id %}
<a class="btn custom_order_button_red" href="{% url 'genrequest-analysis-delete' genrequest_id=object.genrequest_id pk=object.id %}">Delete</a>
{% endif %}
{% endif %}

<a class="btn custom_order_button" href="{% url 'genrequest-extraction-samples' genrequest_id=object.genrequest_id pk=object.id %}">Samples</a>
Expand Down
18 changes: 18 additions & 0 deletions src/genlab_bestilling/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,6 +475,15 @@ def get_queryset(self) -> QuerySet:
.prefetch_related("sample_markers", "markers")
)

def get_context_data(self, **kwargs: Any) -> dict[str, Any]:
context = super().get_context_data(**kwargs)
order = self.object
all_samples_have_no_genlab_id = not order.samples.exclude(
genlab_id__isnull=True
).exists()
context["all_samples_have_no_genlab_id"] = all_samples_have_no_genlab_id
return context


class ExtractionOrderDetailView(GenrequestNestedMixin, DetailView):
model = ExtractionOrder
Expand All @@ -499,6 +508,15 @@ def gen_crumbs(self) -> list[tuple]:
(str(self.object), ""),
]

def get_context_data(self, **kwargs: Any) -> dict[str, Any]:
context = super().get_context_data(**kwargs)
order = self.object
all_samples_have_no_genlab_id = not order.samples.exclude(
genlab_id__isnull=True
).exists()
context["all_samples_have_no_genlab_id"] = all_samples_have_no_genlab_id
return context


class GenrequestOrderDeleteView(GenrequestNestedMixin, DeleteView):
model = Order
Expand Down