From 01d2eae7bcffd4c36684be2a15afec8da78fabd3 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Sun, 10 Jul 2016 11:14:24 +0100
Subject: [PATCH] More invoice UI improvements - makes colouring consistent -
 also closes #242

---
 RIGS/templates/RIGS/invoice_detail.html |  7 +++++--
 RIGS/templates/RIGS/invoice_list.html   | 19 +++++++++++++++++--
 templates/base.html                     |  4 ++--
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/RIGS/templates/RIGS/invoice_detail.html b/RIGS/templates/RIGS/invoice_detail.html
index 2973c358..af26ad21 100644
--- a/RIGS/templates/RIGS/invoice_detail.html
+++ b/RIGS/templates/RIGS/invoice_detail.html
@@ -38,8 +38,11 @@
                 </div>
             </div>
             <div class="col-sm-6">
-                <div class="panel panel-{% if object.void %}danger{% elif object.is_closed %}success{% else %}info{% endif %}">
-                    <div class="panel-heading">Event Details</div>
+                <div class="panel panel-{% if object.is_closed %}success{% else %}warning{% endif %}">
+                    <div class="panel-heading">Event Details<span class="pull-right">
+                        {% if object.void %}(VOID){% elif object.is_closed %}(PAID){% else %}(OUTSTANDING){% endif %}
+                        </span>
+                    </div>
                     <div class="panel-body">
                         <dl class="dl-horizontal">
                             <dt>Event Number</dt>
diff --git a/RIGS/templates/RIGS/invoice_list.html b/RIGS/templates/RIGS/invoice_list.html
index 5bd7ef70..7dc6d8ee 100644
--- a/RIGS/templates/RIGS/invoice_list.html
+++ b/RIGS/templates/RIGS/invoice_list.html
@@ -29,8 +29,23 @@
                 {% for object in object_list %}
                     <tr class="{% if object.void %}danger{% elif object.balance == 0 %}success{% endif %}">
                         <td>{{ object.pk }}</td>
-                        <td><a href="{% url 'event_detail' object.event.pk %}">N{{ object.event.pk|stringformat:"05d" }}</a>: {{ object.event.name }} <br>
-                            <span class="text-muted">{{ object.event.get_status_display }}</span></td>
+                        <td class="
+                            {% if object.event.cancelled %}
+                                active text-muted
+                            {% elif not object.event.is_rig %}
+                                info
+                            {% elif object.event.confirmed and object.event.mic %}
+                            {# interpreated as (booked and mic) #}
+                                success
+                            {% elif object.event.mic %}
+                                warning
+                            {% else %}
+                                danger
+                            {% endif %}
+                            "><a href="{% url 'event_detail' object.event.pk %}">N{{ object.event.pk|stringformat:"05d" }}</a>: {{ object.event.name }} <br>
+                            <span class="text-muted">{{ object.event.get_status_display }}
+                            {% if not object.event.mic %}(No MIC){% endif %}
+                            </span></td>
                         </td>
                         <td>{% if object.event.organisation %}
                                 {{ object.event.organisation.name }}
diff --git a/templates/base.html b/templates/base.html
index 7a2d15f9..24cc30bc 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -76,9 +76,9 @@
                         <ul class="dropdown-menu">
                             {% if perms.RIGS.add_invoice %}
                                 <li><a href="{% url 'invoice_waiting' %}"><span
-                                        class="glyphicon glyphicon-briefcase"></span> Waiting</a></li>
+                                        class="glyphicon glyphicon-briefcase text-danger"></span> Waiting</a></li>
                             {% endif %}
-                            <li><a href="{% url 'invoice_list' %}"><span class="glyphicon glyphicon-gbp"></span> Outstanding</a>
+                            <li><a href="{% url 'invoice_list' %}"><span class="glyphicon glyphicon-gbp text-warning"></span> Outstanding</a>
                             </li>
                             <li><a href="{% url 'invoice_archive' %}"><span class="glyphicon glyphicon-book"></span>
                                 Archive</a></li>