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

Add basic tracking of when an event authorisation request was sent.

Browse Source 
Designed and requested by Ross because he can't remember if he's push a button...
This commit is contained in:
Tom Price
2017-04-19 18:14:36 +01:00
parent d9076a4f5f
commit 331dab20f7
6 changed files with 99 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -70,6 +70,39 @@
</div>
</div>
{% endif %}
{% if event.is_rig %}
<div class="panel panel-default">
<div class="panel-heading">Client Authorisation</div>
<div class="panel-body">
<dl class="dl-horizontal">
<dt>Authorised</dt>
<dd>{{ object.authorised|yesno:"Yes,No" }}</dd>
<dt>Authorised by</dt>
<dd>
{% if object.authorisation %}
{{ object.authorisation.name }}
(<a href="mailto:{{ object.authorisation.email }}">{{ object.authorisation.email }}</a>)
{% endif %}
</dd>
<dt>Authorised at</dt>
<dd>{{ object.authorisation.last_edited_at }}</dd>
<dt>Authorised amount</dt>
<dd>
{% if object.authorisation %}
£ {{ object.authorisation.amount|floatformat:"2" }}
{% endif %}
</dd>
<dt>Requested by</dt>
<dd>{{ object.authorisation.sent_by }}</dd>
</dl>
</div>
</div>
{% endif %}
</div>
{% endif %}
<div class="col-sm-12 {% if event.is_rig %}col-md-6 col-lg-7{% endif %}">
@@ -150,29 +183,17 @@
{% if event.is_rig %}
<dd>&nbsp;</dd>
<dt>Authorised</dt>
<dd>{{ object.authorised|yesno:"Yes,No" }}</dd>
<dt>Authorisation Request</dt>
<dd>{{ object.auth_request_to|yesno:"Yes,No" }}</dd>
<dt>Authorised by</dt>
<dd>
{% if object.authorised %}
{{ object.authorisation.name }}
(<a href="mailto:{{ object.authorisation.email }}">{{ object.authorisation.email }}</a>)
{% endif %}
</dd>
<dt>By</dt>
<dd>{{ object.auth_request_by }}</dd>
<dt>Authorised at</dt>
<dd>{{ object.authorisation.last_edited_at }}</dd>
<dt>At</dt>
<dd>{{ object.auth_request_at|date:"D d M Y H:i"|default:"" }}</dd>
<dt>Authorised amount</dt>
<dd>
{% if object.authorised %}
£ {{ object.authorisation.amount|floatformat:"2" }}
{% endif %}
</dd>
<dt>Authorsation request sent by</dt>
<dd>{{ object.authorisation.sent_by }}</dd>
<dt>To</dt>
<dd>{{ object.auth_request_to }}</dd>
{% endif %}
</dl>
</div>

14
RIGS/templates/RIGS/event_detail_buttons.html
View File

@@ -11,10 +11,18 @@
class="glyphicon glyphicon-duplicate"></span> <span
class="hidden-xs">Duplicate</span></a>
{% if event.is_rig %}
<a class="btn btn-default item-add modal-href event-authorise-request"
href="{% url 'event_authorise_request' object.pk %}">
<a class="btn btn-default item-add modal-href event-authorise-request
{% if event.authorised %}
btn-success
{% elif event.authorisation and event.authorisation.amount != event.total and event.authorisation.last_edited_at > event.auth_request_at %}
btn-warning
{% elif event.auth_request_to %}
btn-info
{% endif %}
"
href="{% url 'event_authorise_request' object.pk %}">
<span class="glyphicon glyphicon-send"></span>
Authorisation Request
<span class="hidden-xs">Authorisation Request</span>
</a>
{% if perms.RIGS.add_invoice %}
<a id="invoiceDropdownLabel" href="{% url 'invoice_event' event.pk %}" class="btn