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

Implement some of Jonny's suggested changes

Browse Source 
TODO:
- Define event size at RA time, pass through to EC
- Have later power questions be context dependent
This commit is contained in:
FreneticScribbler
2020-11-16 18:26:28 +00:00
parent 97b29bc549
commit e0615f318c
7 changed files with 58 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
RIGS/templates/partials/ec_power_info.html
View File

@@ -1,4 +1,4 @@
<h5 class="py-3"><a class="btn btn-info" data-toggle="collapse" href="#values" aria-expanded="false" aria-controls="values">View Threshhold Values</a></h5>
<h5 class="py-3"><a class="btn btn-info" data-toggle="collapse" href="#values" aria-expanded="false" aria-controls="values">View Threshold Values</a></h5>
<div class="row collapse" id="values">
<div class="table-responsive">
<table class="table table-bordered">

18
RIGS/templates/risk_assessment_detail.html
View File

@@ -51,6 +51,10 @@
{{ object.power_mic.name|default:'None' }}
</dd>
<dt class="col-sm-6">{{ object|help_text:'generators' }}</dt>
<dd class="col-sm-6">
{{ object.outside|yesnoi:'invert' }}
</dd>
<dt class="col-sm-6">{{ object|help_text:'outside' }}</dt>
<dd class="col-sm-6">
{{ object.generators|yesnoi:'invert' }}
</dd>
@@ -94,15 +98,15 @@
<dl class="row">
<dt class="col-sm-6">{{ object|help_text:'known_venue' }}</dt>
<dd class="col-sm-6">
{{ object.known_venue|yesnoi }}
{{ object.known_venue|yesnoi:'invert' }}
</dd>
<dt class="col-sm-6">{{ object|help_text:'safe_loading'|safe }}</dt>
<dd class="col-sm-6">
{{ object.safe_loading|yesnoi }}
{{ object.safe_loading|yesnoi:'invert' }}
</dd>
<dt class="col-sm-6">{{ object|help_text:'safe_storage' }}</dt>
<dd class="col-sm-6">
{{ object.safe_storage|yesnoi }}
{{ object.safe_storage|yesnoi:'invert' }}
</dd>
<dt class="col-sm-6">{{ object|help_text:'area_outside_of_control' }}</dt>
<dd class="col-sm-6">
@@ -127,14 +131,14 @@
<dd class="col-sm-6">
{{ object.special_structures|yesnoi:'invert' }}
</dd>
<dt class="col-sm-6">{{ object|help_text:'persons_responsible_structures' }}</dt>
<dd class="col-sm-6">
{{ object.persons_responsible_structures.name|default:'N/A'|linebreaks }}
</dd>
<dt class="col-sm-6">{{ object|help_text:'suspended_structures' }}</dt>
<dd class="col-sm-6">
{{ object.suspended_structures|yesnoi:'invert' }}
</dd>
<dt class="col-sm-6">{{ object|help_text:'persons_responsible_structures' }}</dt>
<dd class="col-sm-6">
{{ object.persons_responsible_structures.name|default:'N/A'|linebreaks }}
</dd>
</dl>
</div>
</div>

7
RIGS/templates/risk_assessment_form.html
View File

@@ -83,6 +83,7 @@
<div class="card-header">Power</div>
<div class="card-body">
{% include 'partials/yes_no_radio.html' with formitem=form.big_power %}
{% include 'partials/yes_no_radio.html' with formitem=form.outside %}
<label for="{{ form.power_mic.id_for_label }}"
class="col-sm-8 col-form-label">{{ form.power_mic.help_text }}</label>
<div class="col-sm-8">
@@ -108,7 +109,7 @@
<div class="card">
<div class="card-header">Sound</div>
<div class="card-body">
<p><strong>If yes, consult a supervisor of sound and make sure an appropriate noise monitoring plan and risk assessment is drawn up</strong></p>
<p><strong>If yes, consult a supervisor of sound</strong></p>
{% include 'partials/yes_no_radio.html' with formitem=form.noise_monitoring %}
<label for="{{ form.sound_notes.id_for_label }}">{{ form.sound_notes.help_text }}</label>
{% render_field form.sound_notes class+="form-control" %}
@@ -121,7 +122,7 @@
<div class="card">
<div class="card-header">Site Details</div>
<div class="card-body">
<p><strong>If YES to any of the below, a site visit must be conducted, and an assessment of the venue completed and added to TEC’s records</strong></p>
<p><strong>If yes to any of the below, a site visit must be conducted, and an assessment of the venue completed and added to TEC’s records</strong></p>
{% include 'partials/yes_no_radio.html' with formitem=form.known_venue %}
{% include 'partials/yes_no_radio.html' with formitem=form.safe_loading %}
{% include 'partials/yes_no_radio.html' with formitem=form.safe_storage %}
@@ -138,9 +139,9 @@
<div class="card-header">Structures</div>
<div class="card-body">
{% include 'partials/yes_no_radio.html' with formitem=form.special_structures %}
{% include 'partials/yes_no_radio.html' with formitem=form.suspended_structures %}
<label for="{{ form.persons_responsible_structures.id_for_label }}" class="mt-3">{{ form.persons_responsible_structures.help_text }}</label>
{% render_field form.persons_responsible_structures class+="form-control mb-3" %}
{% include 'partials/yes_no_radio.html' with formitem=form.suspended_structures %}
</div>
</div>
</div>