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: 3 additions & 1 deletion src/staff/templates/staff/analysisorder_detail.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ <h3 class="text-4xl mb-5">Order {{ object }}</h3>
{% if not object.is_seen %}
<form method="post" action="{% url 'staff:mark-as-seen' pk=object.id %}">
{% csrf_token %}
<button class="btn bg-purple-50 text-purple-900 border border-purple-800 hover:bg-purple-300" type="submit">Mark as seen</button>
<button class="btn btn-sm bg-[#DFF7CA] border-[#93AD7D] hover:bg-[#C9EBB0] hover:border-[#7F996C] active:bg-[#B5DA9C] active:border-[#6B855B] text-nowrap" style="height: auto;" type="submit">
<p><i class="fa-solid fa-circle-check"></i> Mark as seen</p>
</button>
</form>
{% endif %}

Expand Down
4 changes: 3 additions & 1 deletion src/staff/templates/staff/components/seen_column.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,7 @@
<form method="post" action="{% url 'staff:mark-as-seen' pk=record.id %}">
{% csrf_token %}
<input type="hidden" name="return_to" value="dashboard" />
<button class="btn custom_order_button" style="background-color: darkgoldenrod; height: auto;" type="submit">Mark as seen</button>
<button class="btn btn-sm bg-[#DFF7CA] border-[#93AD7D] hover:bg-[#C9EBB0] hover:border-[#7F996C] active:bg-[#B5DA9C] active:border-[#6B855B] text-nowrap" style="height: auto;" type="submit">
<p><i class="fa-solid fa-circle-check"></i> Mark as seen</p>
</button>
</form>
15 changes: 1 addition & 14 deletions src/staff/templates/staff/equipmentorder_detail.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<h3 class="text-4xl mb-5">Order {{ object }}</h3>
<div class="flex gap-5 mb-5">
<a class="btn custom_order_button" href="{% url 'staff:order-equipment-list' %}"><i class="fas fa-arrow-left"></i> Back</a>
<a class="btn custom_order_button" href="{% url 'staff:add-staff' pk=object.id model_type="equipment" %}">Assign staff</a>
</div>

{% object-detail-staff object=object %}
Expand All @@ -31,18 +32,4 @@ <h5 class="text-2xl my-5">Requested Equipment</h5>
</tr>
{% endfor %}
{% /table %}

<div class="flex gap-5 my-5">
<a class="btn custom_order_button" href="{% url 'staff:order-equipment-list' %}"><i class="fas fa-arrow-left"></i> Back</a>
<a class="btn custom_order_button" href="{% url 'staff:add-staff' pk=object.id model_type="equipment" %}">Assign staff</a>
{% comment %}
{% if object.status == 'draft' %}
<a class="btn bg-primary" href="{% url 'genrequest-equipment-update' genrequest_id=object.genrequest_id pk=object.id %}">Edit</a>
<a class="btn bg-secondary text-white" href="{% url 'genrequest-equipment-quantity-update' genrequest_id=object.genrequest_id pk=object.id %}">Edit requested equipment</a>
{% url 'genrequest-order-confirm' genrequest_id=object.genrequest_id pk=object.id as confirm_order_url %}
{% action-button action=confirm_order_url class="bg-secondary text-white" submit_text="Deliver order" csrf_token=csrf_token %}
<a class="btn bg-red-500 text-white" href="{% url 'genrequest-equipment-delete' genrequest_id=object.genrequest_id pk=object.id %}">Delete</a>
{% endif %}
{% endcomment %}
</div>
{% endblock %}
4 changes: 3 additions & 1 deletion src/staff/templates/staff/extractionorder_detail.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ <h3 class="text-4xl mb-5">Order {{ object }}</h3>
{% if not object.is_seen %}
<form method="post" action="{% url 'staff:mark-as-seen' pk=object.id %}">
{% csrf_token %}
<button class="btn bg-purple-50 text-purple-900 border border-purple-800 hover:bg-purple-300" type="submit">Mark as seen</button>
<button class="btn btn-sm bg-[#DFF7CA] border-[#93AD7D] hover:bg-[#C9EBB0] hover:border-[#7F996C] active:bg-[#B5DA9C] active:border-[#6B855B] text-nowrap" style="height: auto;" type="submit">
<p><i class="fa-solid fa-circle-check"></i> Mark as seen</p>
</button>
</form>
{% endif %}

Expand Down