From 476f5b4bc85ea6253257a7bfd64bf0f78933697b Mon Sep 17 00:00:00 2001 From: James Cook Date: Thu, 16 Apr 2026 14:07:05 +0100 Subject: [PATCH 1/3] check if org is union --- RIGS/templates/partials/event_status.html | 24 ++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/RIGS/templates/partials/event_status.html b/RIGS/templates/partials/event_status.html index 364015ae..13d8418f 100644 --- a/RIGS/templates/partials/event_status.html +++ b/RIGS/templates/partials/event_status.html @@ -2,17 +2,19 @@ Status: {{ event.get_status_display }} {% if event.is_rig %} {% if event.sum_total > 0 %} - {% if event.purchase_order %} - PO: Received - {% elif event.authorised %} - Authorisation: Complete - {% elif event.authorisation and event.authorisation.amount != event.total and event.authorisation.last_edited_at > event.auth_request_at %} - Authorisation: Issue - {% elif event.auth_request_to %} - Authorisation: Sent - {% else %} - Authorisation: - {% endif %} + {% if event.organisation.union_account %} + {% if event.authorised %} + Authorisation: Complete + {% elif event.authorisation and event.authorisation.amount != event.total and event.authorisation.last_edited_at > event.auth_request_at %} + Authorisation: Issue + {% elif event.auth_request_to %} + Authorisation: Sent + {% else %} + Authorisation: + {% endif %} + {% else %} + PO: Received + {%endif %} {% endif %} {% if not event.dry_hire %} {% if event.riskassessment %} From c9165ff33c2b2f20fcdaee08115b656f8ad00216 Mon Sep 17 00:00:00 2001 From: James Cook Date: Thu, 16 Apr 2026 14:08:57 +0100 Subject: [PATCH 2/3] add check for PO back --- RIGS/templates/partials/event_status.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/RIGS/templates/partials/event_status.html b/RIGS/templates/partials/event_status.html index 13d8418f..d1c172e5 100644 --- a/RIGS/templates/partials/event_status.html +++ b/RIGS/templates/partials/event_status.html @@ -13,7 +13,11 @@ Authorisation: {% endif %} {% else %} + {% if event.purchase_order %} PO: Received + {% else %} + PO: + {%endif %} {%endif %} {% endif %} {% if not event.dry_hire %} From b3f264e0930596b35f5d3efd77b2bcccd4ca1a02 Mon Sep 17 00:00:00 2001 From: James Cook Date: Thu, 16 Apr 2026 14:09:19 +0100 Subject: [PATCH 3/3] add tick icon to PO received --- RIGS/templates/partials/event_status.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RIGS/templates/partials/event_status.html b/RIGS/templates/partials/event_status.html index d1c172e5..08c97c25 100644 --- a/RIGS/templates/partials/event_status.html +++ b/RIGS/templates/partials/event_status.html @@ -14,7 +14,7 @@ {% endif %} {% else %} {% if event.purchase_order %} - PO: Received + PO: Received {% else %} PO: {%endif %}