From f4a163f63c0600e046c7d131c9ea60aca6b601b1 Mon Sep 17 00:00:00 2001
From: Arona Jones <aj@aronajones.com>
Date: Mon, 15 Feb 2021 16:45:45 +0000
Subject: [PATCH] Minor futzing with status display

---
 RIGS/templates/partials/event_status.html | 22 ++++++++++------------
 RIGS/templates/partials/event_table.html  |  2 +-
 RIGS/templates/rigboard.html              |  6 +++---
 RIGS/tests/test_interaction.py            |  2 +-
 4 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/RIGS/templates/partials/event_status.html b/RIGS/templates/partials/event_status.html
index e45d8901..60f8efa1 100644
--- a/RIGS/templates/partials/event_status.html
+++ b/RIGS/templates/partials/event_status.html
@@ -1,12 +1,14 @@
-<h5>
+<div>
 <span class="badge badge-{% if event.confirmed %}success{% elif event.cancelled %}dark{% else %}warning{% endif %}">Status: {{ event.get_status_display }}</span>
 {% if event.is_rig %}
-    {% if event.purchase_order %}
-        <span class="badge badge-success">PO: {{ event.purchase_order }}</span>
-    {% elif event.authorised %}
-        <span class="badge badge-success">Authorisation: Complete <span class="fas fa-check"></span></span>
-    {% else %}
-        <span class="badge badge-danger">Authorisation: <span class="fas fa-times"></span></span>
+    {% if event.sum_total > 0 %}
+        {% if event.purchase_order %}
+            <span class="badge badge-success">PO: {{ event.purchase_order }}</span>
+        {% elif event.authorised %}
+            <span class="badge badge-success">Authorisation: Complete <span class="fas fa-check"></span></span>
+        {% else %}
+            <span class="badge badge-danger">Authorisation: <span class="fas fa-times"></span></span>
+        {% endif %}
     {% endif %}
     {% if not event.dry_hire %}
         {% if event.riskassessment %}
@@ -14,8 +16,6 @@
         {% else %}
             <span class="badge badge-danger">RA: <span class="fas fa-times"></span></span>
         {% endif %}
-    {% else %}
-        <span class="badge badge-secondary">RA: N/A</span>
     {% endif %}
     {% if not event.dry_hire %}
         {% if event.hs_done %}
@@ -24,8 +24,6 @@
         {% else %}
             <span class="badge badge-danger">Checklist: <span class="fas fa-times"></span></span>
         {% endif %}
-    {% else %}
-        <span class="badge badge-secondary">Checklist: N/A</span>
     {% endif %}
     {% if perms.RIGS.view_invoice %}
         {% if event.invoice %}
@@ -41,4 +39,4 @@
         {% endif %}
     {% endif %}
 {% endif %}
-</h5>
+</div>
diff --git a/RIGS/templates/partials/event_table.html b/RIGS/templates/partials/event_table.html
index 807c46e8..f360d90c 100644
--- a/RIGS/templates/partials/event_table.html
+++ b/RIGS/templates/partials/event_table.html
@@ -25,7 +25,7 @@
                         {% endif %}
                     {% else %}
                     table-warning
-                    {% endif %}" id="event_row">
+                    {% endif %}" {% if event.cancelled %}style="opacity: 50% !important;"{% endif %} id="event_row">
             <!---Number-->
             <th scope="row" id="event_number">{{ event.display_id }}</th>
             <!--Dates & Times-->
diff --git a/RIGS/templates/rigboard.html b/RIGS/templates/rigboard.html
index 5e85a185..0a894389 100644
--- a/RIGS/templates/rigboard.html
+++ b/RIGS/templates/rigboard.html
@@ -2,9 +2,9 @@
 {% load button from filters %}
 
 {% block content %}
-<div class="row align-items-center justify-content-between py-2">
-    <div class="col-sm-12 col-md">
-        Key: <span class="table-success mr-1 px-2">Ready</span><span class="table-warning mr-1 px-2">Action Required</span><span class="table-danger mr-1 px-2">Needs MIC</span><span class="table-secondary mr-1 px-2">Cancelled</span><span class="table-info px-2">Non-Rig</span>
+<div class="row align-items-center justify-content-between py-2 align-middle">
+    <div class="col-sm-12 col-md align-middle">
+        Key: <span class="table-success mr-1 px-2 rounded">Ready</span><span class="table-warning mr-1 px-2 rounded">Action Required</span><span class="table-danger mr-1 px-2 rounded">Needs MIC</span><span class="table-secondary mr-1 px-2 rounded">Cancelled</span><span class="table-info px-2 rounded">Non-Rig</span>
     </div>
     {% if perms.RIGS.add_event %}
     <div class="col text-right">
diff --git a/RIGS/tests/test_interaction.py b/RIGS/tests/test_interaction.py
index 27820730..dc5a2332 100644
--- a/RIGS/tests/test_interaction.py
+++ b/RIGS/tests/test_interaction.py
@@ -757,10 +757,10 @@ def test_ec_create_crew(logged_in_browser, live_server, admin_user, checklist):
     start_time = timezone.make_aware(datetime.datetime(2015, 1, 1, 9, 0))
     end_time = timezone.make_aware(datetime.datetime(2015, 1, 1, 10, 30))
     crew = page.crew[0]
-    crew.crewmember.search(admin_user.first_name)
     crew.role.set_value(role)
     crew.start_time.set_value(start_time)
     crew.end_time.set_value(end_time)
+    crew.crewmember.search(admin_user.first_name)
     page.submit()
     assert page.success
     # Check data is correct