More optimisation and cleanup (#420)

RIGS/templates/partials/auth_details.html

@@ -1,15 +1,15 @@
 <div class="card card-default
-    {% if object.authorised %}
-        card-success
+    {% if event.authorised %}
+        border-success
     {% elif event.authorisation and event.authorisation.amount != event.total and event.authorisation.last_edited_at > event.auth_request_at %}
-        card-warning
+        border-warning
     {% elif event.auth_request_to %}
-        card-info
+        border-info
     {% endif %}
     ">
     <div class="card-header">Client Authorisation</div>
     <div class="card-body row">
-        <dl class="col-md-6">
+        <dl class="col-sm-6">
             <dt>Authorisation Request</dt>
             <dd>{{ object.auth_request_to|yesno:"Yes,No" }}</dd>
 
@@ -22,8 +22,8 @@
             <dt>To</dt>
             <dd>{{ object.auth_request_to }}</dd>
         </dl>
-        <dd class="d-block d-sm-none">&nbsp;</dd>
-        <dl class="col-md-6">
+        <dl class="col-sm-6">
+            <hr class="d-block d-sm-none">
             <dt>Authorised</dt>
             <dd>{{ object.authorised|yesno:"Yes,No" }}</dd>
 

RIGS/templates/partials/event_detail_buttons.html

@@ -0,0 +1,51 @@
+{% load button from filters %}
+<div class="btn-group py-3">
+    {% button 'edit' 'event_update' event.pk %}
+    {% if event.is_rig %}
+    {% button 'print' 'event_print' event.pk %}
+    {% endif %}
+    {% button 'duplicate' 'event_duplicate' event.pk %}
+    {% if event.is_rig %}
+        {% if event.internal %}
+            <a class="btn item-add modal-href event-authorise-request
+                    {% if event.authorised %}
+                        btn-success active
+                    {% elif event.authorisation and event.authorisation.amount != event.total and event.authorisation.last_edited_at > event.auth_request_at %}
+                        btn-warning
+                    {% elif event.auth_request_to %}
+                        btn-info
+                    {% else %}
+                        btn-secondary
+                    {% endif %}
+                    "
+               href="{% url 'event_authorise_request' object.pk %}">
+                <span class="fas fa-paper-plane"></span>
+                <span class="d-none d-sm-inline">
+                    {% if event.authorised %}
+                        Authorised
+                    {% 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 %}
+                        Awaiting Authorisation
+                    {% else %}
+                        Request Authorisation
+                    {% endif %}
+                </span>
+            </a>
+        {% endif %}
+
+        {% if perms.RIGS.add_invoice %}
+            <a id="invoiceDropdownLabel" href="{% url 'invoice_event' event.pk %}" class="btn
+                        {% if event.invoice and event.invoice.is_closed %}
+                            btn-success
+                        {% elif event.invoice %}
+                            btn-warning
+                        {% else %}
+                            btn-danger
+                        {% endif %}
+                        " title="Invoice Rig"><span
+                    class="fas fa-pound-sign"></span>
+                <span class="d-none d-sm-inline">Invoice</span></a>
+        {% endif %}
+    {% endif %}
+</div>

RIGS/templates/partials/event_details.html

@@ -20,15 +20,7 @@
 
             {% if event.is_rig %}
                 <dt class="col-sm-6">Event MIC</dt>
-                <dd class="col-sm-6">
-                    {% if event.mic and perms.RIGS.view_profile %}
-                        <a href="{% url 'profile_detail' event.mic.pk %}" class="modal-href">
-                            {{ event.mic.name }}
-                        </a>
-                    {% else %}
-                        {{ event.mic.name }}
-                    {% endif %}
-                </dd>
+                <dd class="col-sm-6">{% include 'partials/linked_name.html' with profile=event.mic %}</dd>
             {% endif %}
 
             <dt class="col-sm-6">Status</dt>
@@ -71,7 +63,7 @@
 
             {% if event.dry_hire %}
                 <dt class="col-sm-6">Checked In By</dt>
-                <dd class="col-sm-6">{{ object.checked_in_by.name }}</dd>
+                <dd class="col-sm-6">{% include 'partials/linked_name.html' with profile=event.checked_in_by %}</dd>
             {% endif %}
 
             {% if event.is_rig %}

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>

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-->

RIGS/templates/partials/linked_name.html

@@ -0,0 +1,7 @@
+{% if profile and perms.RIGS.view_profile %}
+    <a href="{% url 'profile_detail' profile.pk %}" class="modal-href">
+        {{ profile.name }}
+    </a>
+{% else %}
+    {{ profile.name }}
+{% endif %}