arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-02-04 06:08:22 +00:00
Code Issues Projects Releases Wiki Activity

Add space for power/rigging plans to be linked to RAs

Browse Source
This commit is contained in:
FreneticScribbler
2020-12-13 16:26:08 +00:00
parent dfdbcb651f
commit 124b7a8e51
5 changed files with 68 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
RIGS/templates/risk_assessment_detail.html
View File

@@ -2,6 +2,7 @@
{% block title %}Risk Assessment for Event N{{ object.event.pk|stringformat:"05d" }} {{ object.event.name }}{% endblock %}
{% load help_text from filters %}
{% load yesnoi from filters %}
{% load linkornone from filters %}
{% block content %}
<div class="row py-3">
@@ -11,7 +12,7 @@
<div class="card-header">General</div>
<div class="card-body">
<dl class="row">
<dt class="col-10">{{ object|help_text:'nonstandard_equipment' }}</dt>
<dt class="col-10">{{ object|help_text:'nonstandard_equipment'|safe }}</dt>
<dd class="col-2">
{{ object.nonstandard_equipment|yesnoi:'invert' }}
</dd>
@@ -19,11 +20,11 @@
<dd class="col-2">
{{ object.nonstandard_use|yesnoi:'invert' }}
</dd>
<dt class="col-10">{{ object|help_text:'contractors' }}</dt>
<dt class="col-10">{{ object|help_text:'contractors'|safe }}</dt>
<dd class="col-2">
{{ object.contractors|yesnoi:'invert' }}
</dd>
<dt class="col-10">{{ object|help_text:'other_companies' }}</dt>
<dt class="col-10">{{ object|help_text:'other_companies'|safe }}</dt>
<dd class="col-2">
{{ object.other_companies|yesnoi:'invert' }}
</dd>
@@ -74,6 +75,10 @@
<dd class="col-12">
{{ object.power_notes|default:'N/A'|linebreaks }}
</dd>
<dt class="col-6">{{ object|help_text:'power_plan'|safe }}</dt>
<dd class="col-6">
{{ object.power_plan|linkornone }}
</dd>
</dl>
</div>
</div>
@@ -139,6 +144,10 @@
<dd class="col-sm-6">
{{ object.persons_responsible_structures.name|default:'N/A'|linebreaks }}
</dd>
<dt class="col-6">{{ object|help_text:'rigging_plan'|safe }}</dt>
<dd class="col-6">
{{ object.rigging_plan|linkornone }}
</dd>
</dl>
</div>
</div>

4
RIGS/templates/risk_assessment_form.html
View File

@@ -100,6 +100,8 @@
{% include 'partials/yes_no_radio.html' with formitem=form.multiple_electrical_environments %}
<label for="{{ form.power_notes.id_for_label }}">{{ form.power_notes.help_text }}</label>
{% render_field form.power_notes class+="form-control" %}
<label for="{{ form.power_plan.id_for_label }}" class="mt-2">{{ form.power_plan.help_text|safe }}</label>
{% render_field form.power_plan class+="form-control" %}
</div>
</div>
</div>
@@ -142,6 +144,8 @@
{% 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" %}
<label for="{{ form.rigging_plan.id_for_label }}" class="mt-2">{{ form.rigging_plan.help_text|safe }}</label>
{% render_field form.rigging_plan class+="form-control" %}
</div>
</div>
</div>