From cdc83542edda0910caf3e2dfbf1637d3163cb1aa Mon Sep 17 00:00:00 2001
From: Tom Price <tom@codedinternet.com>
Date: Tue, 2 Dec 2014 01:44:35 +0000
Subject: [PATCH] Added full MIC name displaying to event detail

Optimised displaying of values in autocomplete boxes on the event form (removed extra AJAX request)

Highlighted missing MIC better due to bootstrap changes
---
 RIGS/templates/RIGS/event_detail.html |  4 ++--
 RIGS/templates/RIGS/event_form.html   | 21 ++++-----------------
 RIGS/templates/RIGS/rigboard.html     | 10 +++++++---
 3 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/RIGS/templates/RIGS/event_detail.html b/RIGS/templates/RIGS/event_detail.html
index 96b13d81..9e56e10f 100644
--- a/RIGS/templates/RIGS/event_detail.html
+++ b/RIGS/templates/RIGS/event_detail.html
@@ -60,9 +60,9 @@
 				<dd>{{object.venue}}</dd>
 
 				<dt>Event MIC</dt>
-				<dd>{{event.mic.get_full_name}}</dd>
+                <dd>{{ event.mic.name }}</dd>
 
-				<dd>&nbsp;</dd>
+                <dd>&nbsp;</dd>
 
 				{% if event.is_rig %}
 					<dt>Crew Meet</dt>
diff --git a/RIGS/templates/RIGS/event_form.html b/RIGS/templates/RIGS/event_form.html
index 34435adc..90698f29 100644
--- a/RIGS/templates/RIGS/event_form.html
+++ b/RIGS/templates/RIGS/event_form.html
@@ -106,11 +106,7 @@
                             <div class="col-xs-9">
                                 <input type="text" id="{{ form.person.id_for_label }}-input"
                                        class="form-control autocomplete-json"
-                                       data-valueurl="{% if form.person.value %}
-											{% url 'api_secure' model='person' pk=form.person.value %}
-										{% else %}
-											{% url 'api_secure' model='person' %}
-										{% endif %}?fields=name"
+                                       value="{{ object.person|default_if_none:"" }}"
                                        data-sourceurl="{% url 'api_secure' model='person' %}"
                                        data-target="{{ form.person.id_for_label }}"/>
                             </div>
@@ -137,11 +133,7 @@
                             <div class="col-xs-9">
                                 <input type="text" id="{{ form.organisation.id_for_label }}-input"
                                        class="form-control autocomplete-json"
-                                       data-valueurl="{% if form.organisation.value %}
-												{% url 'api_secure' model='organisation' pk=form.organisation.value %}
-											{% else %}
-												{% url 'api_secure' model='organisation' %}
-											{% endif %}?fields=name"
+                                       value="{{ object.organisation|default_if_none:"" }}"
                                        data-sourceurl="{% url 'api_secure' model='organisation' %}"
                                        data-target="{{ form.organisation.id_for_label }}"/>
                             </div>
@@ -295,14 +287,9 @@
 
                                 <input type="text" id="{{ form.mic.id_for_label }}-input"
                                        class="form-control autocomplete-json"
-                                       data-valueurl="
-                                        {% if form.mic.value %}
-											{% url 'api_secure' model='mic' pk=form.mic.value %}
-										{% else %}
-											{% url 'api_secure' model='mic' %}
-										{% endif %}?fields=name"
                                        data-sourceurl="{% url 'api_secure' model='mic' %}?fields=first_name,username,initials"
-                                       data-target="{{ form.mic.id_for_label }}"/>
+                                       data-target="{{ form.mic.id_for_label }}"
+                                       value="{{ object.mic.name|default_if_none:"" }}"/>
                             </div>
                         </div>
                         {#% include 'RIGS/eventitem_table.html' %#}
diff --git a/RIGS/templates/RIGS/rigboard.html b/RIGS/templates/RIGS/rigboard.html
index c64f42ab..f38fe68c 100644
--- a/RIGS/templates/RIGS/rigboard.html
+++ b/RIGS/templates/RIGS/rigboard.html
@@ -47,7 +47,7 @@
 						{% elif event.mic %}
 							warning
 						{% else %}
-							danger
+							danger text-danger
 						{% endif %}
                         ">
                             <td class="hidden-xs">{{ event.pk }}</td>
@@ -100,8 +100,12 @@
                                     {% endif %}
                                 </dl>
                             </td>
-                            <td>
-                                {{ event.mic.initials }}
+                            <td class="text-center">
+                                {% if event.mic or not event.is_rig %}
+                                    {{ event.mic.initials }}
+                                {% else %}
+                                    <span class="glyphicon glyphicon-exclamation-sign"></span>
+                                {% endif %}
                             </td>
                         </tr>
                     {% endfor %}