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 %} - {% if event.riskassessment %} - RA: - {% else %} - RA: + {% if not event.dry_hire %} + {% if event.riskassessment %} + RA: + {% else %} + RA: + {% 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 %}"