arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-02-14 10:39:41 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into assets

Browse Source
This commit is contained in:
FreneticScribbler
2019-12-04 20:25:51 +00:00
parent e22b288984 5210afc772
commit 43b7d5178d
4 changed files with 71 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
RIGS/migrations/0035_auto_20191124_1319.py Normal file
View File

@@ -0,0 +1,18 @@
# Generated by Django 2.0.13 on 2019-11-24 13:19
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('RIGS', '0034_event_risk_assessment_edit_url'),
]
operations = [
migrations.AlterField(
model_name='event',
name='risk_assessment_edit_url',
field=models.CharField(blank=True, max_length=255, null=True, verbose_name='risk assessment'),
),
]

2
RIGS/static/css/screen.css
View File

File diff suppressed because one or more lines are too long

2
RIGS/static/scss/screen.scss
View File

@@ -161,7 +161,7 @@ html.embedded{
padding:0; padding:0;
width:100%; width:100%;
background:none; background:none;
overflow: scroll; overflow: auto;
} }
.embed_container{ .embed_container{

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

@@ -70,39 +70,6 @@
</div> </div>
</div> </div>
{% endif %} {% endif %}
{% if event.is_rig and event.internal %}
<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> </div>
{% endif %} {% endif %}
<div class="col-sm-12 {% if event.is_rig %}col-md-6 col-lg-7{% endif %}"> <div class="col-sm-12 {% if event.is_rig %}col-md-6 col-lg-7{% endif %}">
@@ -180,10 +147,21 @@
<dd>{{ object.collector }}</dd> <dd>{{ object.collector }}</dd>
{% endif %} {% endif %}
{% if event.is_rig %} {% if event.is_rig and not event.internal %}
<dd>&nbsp;</dd> <dd>&nbsp;</dd>
<dt>PO</dt>
{% if object.internal %} <dd>{{ object.purchase_order }}</dd>
{% endif %}
</dl>
</div>
</div>
</div>
{% if event.is_rig and event.internal %}
<div class="col-sm-12">
<div class="panel panel-default">
<div class="panel-heading">Client Authorisation</div>
<div class="panel-body">
<dl class="dl-horizontal col-sm-6">
<dt>Authorisation Request</dt> <dt>Authorisation Request</dt>
<dd>{{ object.auth_request_to|yesno:"Yes,No" }}</dd> <dd>{{ object.auth_request_to|yesno:"Yes,No" }}</dd>
@@ -195,16 +173,37 @@
<dt>To</dt> <dt>To</dt>
<dd>{{ object.auth_request_to }}</dd> <dd>{{ object.auth_request_to }}</dd>
</dl>
<dd class="visible-xs">&nbsp;</dd>
<dl class="dl-horizontal col-sm-6">
<dt>Authorised</dt>
<dd>{{ object.authorised|yesno:"Yes,No" }}</dd>
{% else %} <dt>Authorised by</dt>
<dt>PO</dt> <dd>
<dd>{{ object.purchase_order }}</dd> {% if object.authorisation %}
{{ object.authorisation.name }}
(<a href="mailto:{{ object.authorisation.email }}">{{ object.authorisation.email }}</a>)
{% endif %} {% 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 %} {% endif %}
</dd>
<dt>Requested by</dt>
<dd>{{ object.authorisation.sent_by }}</dd>
</dl> </dl>
</div> </div>
</div> </div>
</div> <div>
{% endif %}
{% if not request.is_ajax %} {% if not request.is_ajax %}
<div class="col-sm-12 text-right"> <div class="col-sm-12 text-right">
{% include 'RIGS/event_detail_buttons.html' %} {% include 'RIGS/event_detail_buttons.html' %}