arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-23 08:22:15 +00:00
Code Issues Projects Releases Wiki Activity

Added full MIC name displaying to event detail

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

Highlighted missing MIC better due to bootstrap changes
This commit is contained in:
Tom Price
2014-12-02 01:44:35 +00:00
parent 3aec6c212d
commit 0ecfe9369c
3 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
RIGS/templates/RIGS/event_detail.html
View File

@@ -60,9 +60,9 @@
<dd>{{object.venue}}</dd> <dd>{{object.venue}}</dd>
<dt>Event MIC</dt> <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 %} {% if event.is_rig %}
<dt>Crew Meet</dt> <dt>Crew Meet</dt>

21
RIGS/templates/RIGS/event_form.html
View File

@@ -106,11 +106,7 @@
<div class="col-xs-9"> <div class="col-xs-9">
<input type="text" id="{{ form.person.id_for_label }}-input" <input type="text" id="{{ form.person.id_for_label }}-input"
class="form-control autocomplete-json" class="form-control autocomplete-json"
data-valueurl="{% if form.person.value %} value="{{ object.person|default_if_none:"" }}"
{% url 'api_secure' model='person' pk=form.person.value %}
{% else %}
{% url 'api_secure' model='person' %}
{% endif %}?fields=name"
data-sourceurl="{% url 'api_secure' model='person' %}" data-sourceurl="{% url 'api_secure' model='person' %}"
data-target="{{ form.person.id_for_label }}"/> data-target="{{ form.person.id_for_label }}"/>
</div> </div>
@@ -137,11 +133,7 @@
<div class="col-xs-9"> <div class="col-xs-9">
<input type="text" id="{{ form.organisation.id_for_label }}-input" <input type="text" id="{{ form.organisation.id_for_label }}-input"
class="form-control autocomplete-json" class="form-control autocomplete-json"
data-valueurl="{% if form.organisation.value %} value="{{ object.organisation|default_if_none:"" }}"
{% url 'api_secure' model='organisation' pk=form.organisation.value %}
{% else %}
{% url 'api_secure' model='organisation' %}
{% endif %}?fields=name"
data-sourceurl="{% url 'api_secure' model='organisation' %}" data-sourceurl="{% url 'api_secure' model='organisation' %}"
data-target="{{ form.organisation.id_for_label }}"/> data-target="{{ form.organisation.id_for_label }}"/>
</div> </div>
@@ -295,14 +287,9 @@
<input type="text" id="{{ form.mic.id_for_label }}-input" <input type="text" id="{{ form.mic.id_for_label }}-input"
class="form-control autocomplete-json" 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-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>
</div> </div>
{#% include 'RIGS/eventitem_table.html' %#} {#% include 'RIGS/eventitem_table.html' %#}

10
RIGS/templates/RIGS/rigboard.html
View File

@@ -47,7 +47,7 @@
{% elif event.mic %} {% elif event.mic %}
warning warning
{% else %} {% else %}
danger danger text-danger
{% endif %} {% endif %}
"> ">
<td class="hidden-xs">{{ event.pk }}</td> <td class="hidden-xs">{{ event.pk }}</td>
@@ -100,8 +100,12 @@
{% endif %} {% endif %}
</dl> </dl>
</td> </td>
<td> <td class="text-center">
{{ event.mic.initials }} {% if event.mic or not event.is_rig %}
{{ event.mic.initials }}
{% else %}
<span class="glyphicon glyphicon-exclamation-sign"></span>
{% endif %}
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}