From f265da2f1d9277a404c849d1004fb7a2907c6df0 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Tue, 14 Jun 2016 19:45:45 +0100
Subject: [PATCH] Fixed #241 and #244

---
 RIGS/templates/RIGS/event_invoice.html | 124 +++++++++++++------------
 RIGS/templates/RIGS/invoice_list.html  |  82 ++++++++--------
 2 files changed, 105 insertions(+), 101 deletions(-)

diff --git a/RIGS/templates/RIGS/event_invoice.html b/RIGS/templates/RIGS/event_invoice.html
index 3136fe40..05b351aa 100644
--- a/RIGS/templates/RIGS/event_invoice.html
+++ b/RIGS/templates/RIGS/event_invoice.html
@@ -22,68 +22,70 @@
                 {% paginator %}
             </div>
         {% endif %}
-        <table class="table table-responsive table-hover">
-            <thead>
-            <tr>
-                <th class="hiddenx-xs">#</th>
-                <th>Start Date</th>
-                <th>Event Name</th>
-                <th>Client</th>
-                <th>Cost</th>
-                <th class="hidden-xs">MIC</th>
-                <th></th>
-            </tr>
-            </thead>
-            <tbody>
-            {% for object in object_list %}
-                <tr class="
-                        {% if object.cancelled %}
-                            active text-muted
-                        {% elif not object.is_rig %}
-                            info
-                        {% elif object.confirmed and object.mic %}
-                        {# interpreated as (booked and mic) #}
-                            success
-                        {% elif object.mic %}
-                            warning
-                        {% else %}
-                            danger
-                        {% endif %}
-                        ">
-                    <td class="hidden-xs"><a href="{% url 'event_detail' object.pk %}">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 %}
-                            {{ object.organisation.name }}
-                            <br>
-                            <span class="text-muted">{{ object.organisation.union_account|yesno:'Internal,External' }}</span>
-                        {% else %}
-                            {{ object.person.name }}
-                            <br>
-                            <span class="text-muted">External</span>
-                        {% endif %}
-
-                    </td>
-                    <td>{{ object.sum_total|floatformat:2 }}</td>
-                    <td class="text-center">
-                        {% 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 %}" 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>
+        <div class="table-responsive">
+            <table class="table table-hover">
+                <thead>
+                <tr>
+                    <th>#</th>
+                    <th>Start Date</th>
+                    <th>Event Name</th>
+                    <th>Client</th>
+                    <th>Cost</th>
+                    <th>MIC</th>
+                    <th></th>
                 </tr>
-            {% endfor %}
-            </tbody>
-        </table>
+                </thead>
+                <tbody>
+                {% for object in object_list %}
+                    <tr class="
+                            {% if object.cancelled %}
+                                active text-muted
+                            {% elif not object.is_rig %}
+                                info
+                            {% elif object.confirmed and object.mic %}
+                            {# interpreated as (booked and mic) #}
+                                success
+                            {% elif object.mic %}
+                                warning
+                            {% else %}
+                                danger
+                            {% endif %}
+                            ">
+                        <td><a href="{% url 'event_detail' object.pk %}">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 %}
+                                {{ object.organisation.name }}
+                                <br>
+                                <span class="text-muted">{{ object.organisation.union_account|yesno:'Internal,External' }}</span>
+                            {% else %}
+                                {{ object.person.name }}
+                                <br>
+                                <span class="text-muted">External</span>
+                            {% endif %}
+
+                        </td>
+                        <td>{{ object.sum_total|floatformat:2 }}</td>
+                        <td class="text-center">
+                            {% 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 %}" 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>
+                    </tr>
+                {% endfor %}
+                </tbody>
+            </table>
+        </div>
         {% if is_paginated %}
             <div class="col-md-6 col-md-offset-6 col-sm-12 text-right">
                 {% paginator %}
diff --git a/RIGS/templates/RIGS/invoice_list.html b/RIGS/templates/RIGS/invoice_list.html
index 7b080897..2c77d352 100644
--- a/RIGS/templates/RIGS/invoice_list.html
+++ b/RIGS/templates/RIGS/invoice_list.html
@@ -12,47 +12,49 @@
                 {% paginator %}
             </div>
         {% endif %}
-        <table class="table table-responsive table-hover">
-            <thead>
-            <tr>
-                <th>#</th>
-                <th>Event</th>
-                <th>Client</th>
-                <th>Event Date</th>
-                <th>Invoice Date</th>
-                <th>Balance</th>
-                <th></th>
-            </tr>
-            </thead>
-            <tbody>
-            {% 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>
-                    <td>{% if object.event.organisation %}
-                            {{ object.event.organisation.name }}
-                            <br>
-                            <span class="text-muted">{{ object.event.organisation.union_account|yesno:'Internal,External' }}</span>
-                        {% else %}
-                            {{ object.event.person.name }}
-                            <br>
-                            <span class="text-muted">External</span>
-                        {% endif %}
-                    </td>
-                    <td>{{ object.event.start_date }}</td>
-                    <td>{{ object.invoice_date }}</td>
-                    <td>{{ object.balance|floatformat:2 }}</td>
-                    <td class="text-right">
-                        <a href="{% url 'invoice_detail' object.pk %}" class="btn btn-default">
-                            <span class="glyphicon glyphicon-pencil"></span>
-                        </a>
-                    </td>
+        <div class="table-responsive">
+            <table class="table table-hover">
+                <thead>
+                <tr>
+                    <th>#</th>
+                    <th>Event</th>
+                    <th>Client</th>
+                    <th>Event Date</th>
+                    <th>Invoice Date</th>
+                    <th>Balance</th>
+                    <th></th>
                 </tr>
-            {% endfor %}
-            </tbody>
-        </table>
+                </thead>
+                <tbody>
+                {% 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>
+                        <td>{% if object.event.organisation %}
+                                {{ object.event.organisation.name }}
+                                <br>
+                                <span class="text-muted">{{ object.event.organisation.union_account|yesno:'Internal,External' }}</span>
+                            {% else %}
+                                {{ object.event.person.name }}
+                                <br>
+                                <span class="text-muted">External</span>
+                            {% endif %}
+                        </td>
+                        <td>{{ object.event.start_date }}</td>
+                        <td>{{ object.invoice_date }}</td>
+                        <td>{{ object.balance|floatformat:2 }}</td>
+                        <td class="text-right">
+                            <a href="{% url 'invoice_detail' object.pk %}" class="btn btn-default">
+                                <span class="glyphicon glyphicon-pencil"></span>
+                            </a>
+                        </td>
+                    </tr>
+                {% endfor %}
+                </tbody>
+            </table>
+        </div>
         {% if is_paginated %}
             <div class="col-md-6 col-md-offset-6 col-sm-12 text-right">
                 {% paginator %}