Skip to content

Always an option to convert to draft #199

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 2 commits into from
Jul 7, 2025
Merged

Always an option to convert to draft #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e9a029
Always an option to convert to draft
aastabk Jul 7, 2025
71d45cc
Minor linter fix
aastabk Jul 7, 2025
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: 1 addition & 1 deletion src/staff/templates/staff/analysisorder_detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ <h5 class="text-2xl my-5">Samples to analyze</h5>
<a class="btn bg-yellow-200" href="{% url 'staff:order-analysis-list' %}"><i class="fas fa-arrow-left"></i> back</a>
<a class="btn bg-primary" href="{% url 'staff:order-analysis-samples' pk=object.id %}">Samples</a>
<a class="btn bg-primary" href="{% url 'staff:order-add-staff' pk=object.id %}">Assign staff</a>
{% if object.status == object.OrderStatus.DELIVERED %}
{% if object.status != object.OrderStatus.DRAFT%}
<div class="ml-auto"></div>
{% url 'staff:order-to-draft' pk=object.id as to_draft_url %}
{% action-button action=to_draft_url class="bg-secondary text-white" submit_text="Convert to draft" csrf_token=csrf_token %}
Expand Down
9 changes: 5 additions & 4 deletions src/staff/templates/staff/extractionorder_detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,16 @@ <h5 class="text-2xl my-5">Delivered Samples</h5>
<a class="btn bg-primary" href="{% url 'staff:order-extraction-samples' pk=object.id %}">Samples</a>
<a class="btn bg-primary" href="{% url 'staff:order-add-staff' pk=object.id %}">Assign staff</a>

<div class="ml-auto"></div>
{% if object.status == object.OrderStatus.DELIVERED %}
<div class="ml-auto"></div>
{% url 'staff:order-manually-checked' pk=object.id as confirm_check_url %}
{% url 'staff:order-to-draft' pk=object.id as to_draft_url %}

{% action-button action=confirm_check_url class="bg-secondary text-white" submit_text="Confirm - Order checked" csrf_token=csrf_token %}
{% action-button action=to_draft_url class="bg-secondary text-white" submit_text="Convert to draft" csrf_token=csrf_token %}
{% endif %}

{% if object.status != object.OrderStatus.DRAFT %}
{% url 'staff:order-to-draft' pk=object.id as to_draft_url %}
{% action-button action=to_draft_url class="bg-secondary text-white" submit_text="Convert to draft" csrf_token=csrf_token %}
{% endif %}

{% if object.next_status %}
{% url 'staff:order-to-next-status' pk=object.id as to_next_status_url %}
Expand Down
2 changes: 1 addition & 1 deletion src/staff/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ class OrderToDraftActionView(SingleObjectMixin, ActionView):
model = Order

def get_queryset(self) -> models.QuerySet[Order]:
return super().get_queryset().filter(status=Order.OrderStatus.DELIVERED)
return super().get_queryset()

def post(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
self.object: Order = self.get_object()
Expand Down