From dcbec0c2dc42137d6a6c304ee006c5bbd2dc7aaf Mon Sep 17 00:00:00 2001
From: aastabk <aastabk@stud.ntnu.no>
Date: Fri, 25 Jul 2025 09:53:23 +0200
Subject: [PATCH 1/2] Equipment buttons moved up. Mark as seen button has
 consistent styling.

---
 .../templates/staff/components/seen_column.html   |  2 +-
 .../templates/staff/equipmentorder_detail.html    | 15 +--------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/src/staff/templates/staff/components/seen_column.html b/src/staff/templates/staff/components/seen_column.html
index 8b8dd9c3..a30dd5e8 100644
--- a/src/staff/templates/staff/components/seen_column.html
+++ b/src/staff/templates/staff/components/seen_column.html
@@ -3,5 +3,5 @@
 <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 bg-purple-50 text-purple-900 border border-purple-800 hover:bg-purple-300" style="height: auto;" type="submit">Mark as seen</button>
 </form>
diff --git a/src/staff/templates/staff/equipmentorder_detail.html b/src/staff/templates/staff/equipmentorder_detail.html
index fc6a68ac..8bd24687 100644
--- a/src/staff/templates/staff/equipmentorder_detail.html
+++ b/src/staff/templates/staff/equipmentorder_detail.html
@@ -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 %}
@@ -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 %}

From 92e6e594a05f15cee88067ad4d6eda11a7174eae Mon Sep 17 00:00:00 2001
From: aastabk <aastabk@stud.ntnu.no>
Date: Fri, 25 Jul 2025 13:05:06 +0200
Subject: [PATCH 2/2] Mark as seen button follows correct styling

---
 src/staff/templates/staff/analysisorder_detail.html   | 4 +++-
 src/staff/templates/staff/components/seen_column.html | 4 +++-
 src/staff/templates/staff/extractionorder_detail.html | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/staff/templates/staff/analysisorder_detail.html b/src/staff/templates/staff/analysisorder_detail.html
index 91f4c877..cfded782 100644
--- a/src/staff/templates/staff/analysisorder_detail.html
+++ b/src/staff/templates/staff/analysisorder_detail.html
@@ -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 %}
 
diff --git a/src/staff/templates/staff/components/seen_column.html b/src/staff/templates/staff/components/seen_column.html
index a30dd5e8..7424cb32 100644
--- a/src/staff/templates/staff/components/seen_column.html
+++ b/src/staff/templates/staff/components/seen_column.html
@@ -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 bg-purple-50 text-purple-900 border border-purple-800 hover:bg-purple-300" style="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>
diff --git a/src/staff/templates/staff/extractionorder_detail.html b/src/staff/templates/staff/extractionorder_detail.html
index f132f1fa..006de46d 100644
--- a/src/staff/templates/staff/extractionorder_detail.html
+++ b/src/staff/templates/staff/extractionorder_detail.html
@@ -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 %}