From f43635ee89671083a4e2b64cda5a8027af39665f Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Sun, 29 May 2016 22:42:17 +0100
Subject: [PATCH] Added more useful information to the invoice tables

---
 RIGS/templates/RIGS/event_invoice.html | 29 +++++++++++++++++++-------
 RIGS/templates/RIGS/invoice_list.html  | 12 ++++++++++-
 2 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/RIGS/templates/RIGS/event_invoice.html b/RIGS/templates/RIGS/event_invoice.html
index 3324911a..94d84f04 100644
--- a/RIGS/templates/RIGS/event_invoice.html
+++ b/RIGS/templates/RIGS/event_invoice.html
@@ -1,8 +1,18 @@
 {% extends 'base.html' %}
 {% load paginator from filters %}
+{% load static %}
 
 {% block title %}Events for Invoice{% endblock %}
 
+{% block js %}
+<script src="{% static "js/tooltip.js" %}"></script>
+<script>
+    $(function () {
+      $('[data-toggle="tooltip"]').tooltip();
+    });
+</script>
+{% endblock %}
+
 {% block content %}
     <div class="col-sm-12">
         <h2>Events for Invoice ({{object_list|length}} Events, £ {{ total|floatformat:2 }})</h2>
@@ -16,8 +26,8 @@
             <thead>
             <tr>
                 <th class="hiddenx-xs">#</th>
-                <th>Date</th>
-                <th>Event</th>
+                <th>Start Date</th>
+                <th>Event Name</th>
                 <th>Client</th>
                 <th>Cost</th>
                 <th class="hidden-xs">MIC</th>
@@ -40,8 +50,9 @@
                             danger
                         {% endif %}
                         ">
-                    <td class="hidden-xs"><a href="{% url 'event_detail' object.pk %}" target="_blank">N{{ object.pk|stringformat:"05d" }}</a></td>
-                    <td>{{ object.end_date }}</td>
+                    <td class="hidden-xs"><a href="{% url 'event_detail' object.pk %}" target="_blank">N{{ object.pk|stringformat:"05d" }}</a><br>
+                        <span class="text-muted">{{ object.get_status_display }}</span></td>
+                    <td>{{ object.start_date }}</td>
                     <td>{{ object.name }}</td>
                     <td>
                         {% if object.organisation %}
@@ -52,11 +63,15 @@
                     </td>
                     <td>{{ object.sum_total|floatformat:2 }}</td>
                     <td class="text-center">
-                        {{ object.mic.initials }}<br/>
-                        <img src="{{ object.mic.profile_picture }}" class="event-mic-photo"/>
+                        {% if object.mic %}
+                            {{ object.mic.initials }}<br>
+                            <img src="{{ object.mic.profile_picture }}" class="event-mic-photo"/>
+                        {% else %}
+                            <span class="glyphicon glyphicon-exclamation-sign"></span>
+                        {% endif %}
                     </td>
                     <td class="text-right">
-                        <a href="{% url 'invoice_event' object.pk %}" target="_blank" class="btn btn-default">
+                        <a href="{% url 'invoice_event' object.pk %}" target="_blank" class="btn btn-default" data-toggle="tooltip" title="'Invoice' this event - click this when paperwork has been sent to treasury">
                             <span class="glyphicon glyphicon-gbp"></span>
                         </a>
                     </td>
diff --git a/RIGS/templates/RIGS/invoice_list.html b/RIGS/templates/RIGS/invoice_list.html
index 26ddeb12..cb63b7f5 100644
--- a/RIGS/templates/RIGS/invoice_list.html
+++ b/RIGS/templates/RIGS/invoice_list.html
@@ -17,6 +17,8 @@
             <tr>
                 <th>#</th>
                 <th>Event</th>
+                <th>Client</th>
+                <th>Event Date</th>
                 <th>Invoice Date</th>
                 <th>Balance</th>
                 <th></th>
@@ -26,7 +28,15 @@
             {% 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 %}" target="_blank">N{{ object.event.pk|stringformat:"05d" }}</a>: {{ object.event.name }}</td>
+                    <td><a href="{% url 'event_detail' object.event.pk %}" target="_blank">N{{ object.event.pk|stringformat:"05d" }}</a>: {{ object.event.name }} <br>
+                        <span class="text-muted">{{ object.event.get_status_display }}</span></td>
+                    </td>
+                    <td>{% if object.organisation %}
+                            {{ object.event.organisation.name }}
+                        {% else %}
+                            {{ object.event.person.name }}
+                        {% endif %}</td>
+                    <td>{{ object.event.start_date }}</td>
                     <td>{{ object.invoice_date }}</td>
                     <td>{{ object.balance|floatformat:2 }}</td>
                     <td class="text-right">