From 8a9eefb7225ca911481fab1fad55cb223fda56a7 Mon Sep 17 00:00:00 2001
From: FreneticScribbler <aj@aronajones.com>
Date: Wed, 24 Jun 2020 12:11:11 +0100
Subject: [PATCH] Fix table colors for dry hires

---
 RIGS/templates/partials/event_status.html       | 10 ++++++----
 RIGS/templates/partials/event_table_colour.html | 14 ++++++++------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/RIGS/templates/partials/event_status.html b/RIGS/templates/partials/event_status.html
index 78abdd4e..670305a6 100644
--- a/RIGS/templates/partials/event_status.html
+++ b/RIGS/templates/partials/event_status.html
@@ -9,9 +9,11 @@
     {% endif %}
     <!-- TODO show invoice stuff here -->
 
-    {% if event.riskassessment %}
-        <span class="badge badge-success">RA: <i class="fas fa-check"></i></span>
-    {% else %}
-        <span class="badge badge-danger">RA: <i class="fas fa-times"></i></span>
+    {% if not event.dry_hire %}
+        {% if event.riskassessment %}
+            <span class="badge badge-success">RA: <i class="fas fa-check"></i></span>
+        {% else %}
+            <span class="badge badge-danger">RA: <i class="fas fa-times"></i></span>
+        {% endif %}
     {% endif %}
 {% endif %}
diff --git a/RIGS/templates/partials/event_table_colour.html b/RIGS/templates/partials/event_table_colour.html
index c0c92050..be9faae7 100644
--- a/RIGS/templates/partials/event_table_colour.html
+++ b/RIGS/templates/partials/event_table_colour.html
@@ -1,9 +1,11 @@
 class="{% if event.cancelled %}
             text-muted table-secondary
-        {% elif event.authorised and event.risk_assessment_edit_url and event.mic %}
+       {% elif event.dry_hire and event.authorised and event.mic %}
             table-success
-        {% elif not event.is_rig %}
-            table-info
-        {% else %}
-            table-warning
-        {% endif %}"
+       {% elif event.authorised and event.risk_assessment_edit_url and event.mic %}
+           table-success
+       {% elif not event.is_rig %}
+           table-info
+       {% else %}
+           table-warning
+       {% endif %}"