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

More invoice UI improvements - makes colouring consistent - also closes #242

Browse Source
This commit is contained in:
David Taylor
2016-07-10 11:14:24 +01:00
parent 39d27d2730
commit 01d2eae7bc
3 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
RIGS/templates/RIGS/invoice_detail.html
View File

@@ -38,8 +38,11 @@
</div> </div>
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">
<div class="panel panel-{% if object.void %}danger{% elif object.is_closed %}success{% else %}info{% endif %}"> <div class="panel panel-{% if object.is_closed %}success{% else %}warning{% endif %}">
<div class="panel-heading">Event Details</div> <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"> <div class="panel-body">
<dl class="dl-horizontal"> <dl class="dl-horizontal">
<dt>Event Number</dt> <dt>Event Number</dt>

19
RIGS/templates/RIGS/invoice_list.html
View File

@@ -29,8 +29,23 @@
{% for object in object_list %} {% for object in object_list %}
<tr class="{% if object.void %}danger{% elif object.balance == 0 %}success{% endif %}"> <tr class="{% if object.void %}danger{% elif object.balance == 0 %}success{% endif %}">
<td>{{ object.pk }}</td> <td>{{ object.pk }}</td>
<td><a href="{% url 'event_detail' object.event.pk %}">N{{ object.event.pk|stringformat:"05d" }}</a>: {{ object.event.name }} <br> <td class="
<span class="text-muted">{{ object.event.get_status_display }}</span></td> {% 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>
<td>{% if object.event.organisation %} <td>{% if object.event.organisation %}
{{ object.event.organisation.name }} {{ object.event.organisation.name }}

4
templates/base.html
View File

@@ -76,9 +76,9 @@
<ul class="dropdown-menu"> <ul class="dropdown-menu">
{% if perms.RIGS.add_invoice %} {% if perms.RIGS.add_invoice %}
<li><a href="{% url 'invoice_waiting' %}"><span <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 %} {% 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>
<li><a href="{% url 'invoice_archive' %}"><span class="glyphicon glyphicon-book"></span> <li><a href="{% url 'invoice_archive' %}"><span class="glyphicon glyphicon-book"></span>
Archive</a></li> Archive</a></li>