From 8c0c0941c27ec510ec284a6c0f46d288b2a2e30d Mon Sep 17 00:00:00 2001 From: FreneticScribbler Date: Thu, 23 Sep 2021 11:39:54 +0100 Subject: [PATCH] Update event authorisation status chip with more statusi Closes #446 --- RIGS/templates/partials/event_detail_buttons.html | 2 +- RIGS/templates/partials/event_status.html | 4 ++++ RIGS/templates/partials/event_table.html | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/RIGS/templates/partials/event_detail_buttons.html b/RIGS/templates/partials/event_detail_buttons.html index f8f30c65..4c571f12 100644 --- a/RIGS/templates/partials/event_detail_buttons.html +++ b/RIGS/templates/partials/event_detail_buttons.html @@ -48,6 +48,6 @@ Invoice {% endif %} - Subhire Insurance Form + Subhire Insurance Form {% endif %} diff --git a/RIGS/templates/partials/event_status.html b/RIGS/templates/partials/event_status.html index 60f8efa1..bc0e9579 100644 --- a/RIGS/templates/partials/event_status.html +++ b/RIGS/templates/partials/event_status.html @@ -6,6 +6,10 @@ PO: {{ event.purchase_order }} {% 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 %} diff --git a/RIGS/templates/partials/event_table.html b/RIGS/templates/partials/event_table.html index a027e688..e6bd7c8d 100644 --- a/RIGS/templates/partials/event_table.html +++ b/RIGS/templates/partials/event_table.html @@ -67,9 +67,9 @@ {% if event.is_rig and not event.cancelled %}
- {{ event.person.name }} + {{ event.person.name }} {% if event.organisation %} - for {{ event.organisation.name }} + for {{ event.organisation.name }} {% endif %}
{% endif %}