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

Update templates to include the new authorisation fields

Browse Source
This commit is contained in:
Tom Price
2017-04-10 21:43:18 +01:00
parent 22119a3d08
commit 5d17d642ec
7 changed files with 102 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,7 +13,7 @@
<div class="col-sm-12 text-right">
{% include 'RIGS/event_detail_buttons.html' %}
</div>
{% endif %}
{% if object.is_rig %}
{# only need contact details for a rig #}
@@ -148,8 +148,33 @@
{% endif %}
{% if event.is_rig %}
<dt>PO</dt>
<dd>{{ object.purchase_order }}</dd>
{% if object.purchase_order %}
<dt>PO</dt>
<dd>{{ object.purchase_order }}</dd>
{% endif %}
<dd>&nbsp;</dd>
<dt>Authorised</dt>
<dd>{{ object.authorised|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>Authorised at</dt>
<dd>{{ object.authorisation.last_edited_at }}</dd>
<dt>Authorised amount</dt>
<dd>
{% if object.authorised %}
£ {{ object.authorisation.amount|floatformat:"2" }}
{% endif %}
</dd>
{% endif %}
</dl>
</div>

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

@@ -398,14 +398,6 @@
{% render_field form.collector class+="form-control" %}
</div>
</div>
<div class="form-group" data-toggle="tooltip" title="The purchase order number (for external clients)">
<label for="{{ form.purchase_order.id_for_label }}"
class="col-sm-4 control-label">{{ form.purchase_order.label }}</label>
<div class="col-sm-8">
{% render_field form.purchase_order class+="form-control" %}
</div>
</div>
</div>
</div>
</div>

15
RIGS/templates/RIGS/event_invoice.html
View File

@@ -54,7 +54,12 @@
<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>
{{ object.name }}
{% if object.is_rig and perms.RIGS.view_event and object.authorised %}
<span class="glyphicon glyphicon-check"></span>
{% endif %}
</td>
<td>
{% if object.organisation %}
{{ object.organisation.name }}
@@ -67,7 +72,11 @@
{% endif %}
</td>
<td>{{ object.sum_total|floatformat:2 }}</td>
<td>
{{ object.sum_total|floatformat:2 }}
<br />
<span class="text-muted">{{ object.authorisation.po }}</span>
</td>
<td class="text-center">
{% if object.mic %}
{{ object.mic.initials }}<br>
@@ -92,4 +101,4 @@
</div>
{% endif %}
</div>
{% endblock %}
{% endblock %}

9
RIGS/templates/RIGS/event_table.html
View File

@@ -33,13 +33,18 @@
</td>
<td>
<h4>
<a {% if perms.RIGS.view_event %}href="{% url 'event_detail' event.pk %}" {% endif %}>{{ event.name }}</a>
<a {% if perms.RIGS.view_event %}href="{% url 'event_detail' event.pk %}" {% endif %}>
{{ event.name }}
</a>
{% if event.venue %}
<small>at {{ event.venue }}</small>
{% endif %}
{% if event.dry_hire %}
<span class="label label-default">Dry Hire</span>
{% endif %}
{% if event.is_rig and perms.RIGS.view_event and event.authorised %}
<span class="glyphicon glyphicon-check"></span>
{% endif %}
</h4>
{% if event.is_rig and not event.cancelled %}
<h5>
@@ -99,4 +104,4 @@
{% endfor %}
</tbody>
</table>
</div>
</div>

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

@@ -76,8 +76,45 @@
<dd>{{ object.checked_in_by.name }}</dd>
{% endif %}
<dt>PO</dt>
<dd>{{ object.event.purchase_order }}</dd>
{% if object.event.purchase_order %}
<dt>PO</dt>
<dd>{{ object.event.purchase_order }}</dd>
{% endif %}
<dd>&nbsp;</dd>
<dt>Authorised</dt>
<dd>{{ object.event.authorised|yesno:"Yes,No" }}</dd>
<dt>Authorised by</dt>
<dd>
{% if object.event.authorised %}
{{ object.event.authorisation.name }}
(<a href="mailto:{{ object.event.authorisation.email }}">{{ object.event.authorisation.email }}</a>)
{% endif %}
</dd>
{% if object.event.organisation.union_account %}
{# internal #}
<dt>Uni ID</dt>
<dd>{{ object.event.authorisation.uni_id }}</dd>
<dt>Account code</dt>
<dd>{{ object.event.authorisation.account_code }}</dd>
{% else %}
<dt>PO</dt>
<dd>{{ object.event.authorisation.po }}</dd>
{% endif %}
<dt>Authorised at</dt>
<dd>{{ object.event.authorisation.last_edited_at }}</dd>
<dt>Authorised amount</dt>
<dd>
{% if object.event.authorised %}
£ {{ object.event.authorisation.amount|floatformat:"2" }}
{% endif %}
</dd>
</dl>
</div>
</div>
@@ -139,4 +176,4 @@
</div>
</div>
{% endblock %}
{% endblock %}

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

@@ -59,7 +59,11 @@
</td>
<td>{{ object.event.start_date }}</td>
<td>{{ object.invoice_date }}</td>
<td>{{ object.balance|floatformat:2 }}</td>
<td>
{{ object.balance|floatformat:2 }}
<br />
<span class="text-muted">{{ object.event.authorisation.po }}</span>
</td>
<td class="text-right">
<a href="{% url 'invoice_detail' object.pk %}" class="btn btn-default">
<span class="glyphicon glyphicon-pencil"></span>
@@ -76,4 +80,4 @@
</div>
{% endif %}
</div>
{% endblock %}
{% endblock %}

17
RIGS/urls.py
View File

@@ -115,14 +115,6 @@ urlpatterns = patterns('',
permission_required_with_403('RIGS.view_event')(versioning.VersionHistory.as_view()),
name='event_history', kwargs={'model': models.Event}),
url(r'^event/(?P<pk>\d+)/auth/$',
permission_required_with_403('RIGS.change_event')(
rigboard.EventAuthorisationRequest.as_view()
),
name='event_authorise_request'),
url(r'^event/(?P<pk>\d+)/(?P<hmac>[-:\w]+)/$', rigboard.EventAuthorise.as_view(),
name='event_authorise'),
# Finance
url(r'^invoice/$',
permission_required_with_403('RIGS.view_invoice')(finance.InvoiceIndex.as_view()),
@@ -157,6 +149,15 @@ urlpatterns = patterns('',
permission_required_with_403('RIGS.add_payment')(finance.PaymentDelete.as_view()),
name='payment_delete'),
# Client event authorisation
url(r'^event/(?P<pk>\d+)/auth/$',
permission_required_with_403('RIGS.change_event')(
rigboard.EventAuthorisationRequest.as_view()
),
name='event_authorise_request'),
url(r'^event/(?P<pk>\d+)/(?P<hmac>[-:\w]+)/$', rigboard.EventAuthorise.as_view(),
name='event_authorise'),
# User editing
url(r'^user/$', login_required(views.ProfileDetail.as_view()), name='profile_detail'),
url(r'^user/(?P<pk>\d+)/$',