mirror of
https://github.com/nottinghamtec/PyRIGS.git
synced 2026-01-17 13:32:15 +00:00
Arona Jones
2bf0175786
* Upgrade to heroku-20 stack * Move some gulp deps to dev rather than prod * npm upgrade * Fix audit time check in asset audit test * Attempt at parallelising tests where possible * Add basic calendar button test Mainly to pickup on FullCalendar loading errors * Upgrade python deps * Tends to help if I push valid yaml * You valid now? * Fix whoops in requirements.txt * Change python ver * Define service in coveralls task * Run parallelised RIGS tests as one matrix job * Update python version in tests * Cache python dependencies Should majorly speedup parallelillelelised testing * Purge old vagrant config * No Ruby compass bodge, no need for rubocop! * Purge old .idea config * Switch to gh-a artifact uploading instead of imgur 'hack' For test failure screenshots. Happy now @mattysmith22? ;p * Oops, remove unused import * Exclude tests from the coverage stats Seems to be artifically deflating our stats * Refactor asset audit tests with better selectors Also fixed a silly title error with the modal * Add title checking to the slightly insane assets test * Fix unauth test to not just immediately pass out * Upload failure screenshots as individual artifacts not a zip Turns out I can't unzip things from my phone, which is a pain * Should fix asset test on CI * What about this? * What about this? Swear I spend my life jiggerypokerying the damn test suite... * Does this help the coverage be less weird? * Revert "Does this help the coverage be less weird?" This reverts commit39ab9df836. * Use pytest as our test runner for better parallelism Also rewrote some asset tests to be in the pytest style. May do some more. Some warnings cleaned up in the process. * Bah, codestyle * Oops, remove obsolete if check * Fix screenshot uploading on CI (again) * Try this way of parallel coverage * Add codeclimate maintainability badge * Remove some unused gulp dependencies * Run asset building serverside * Still helps if I commit valid YAML * See below * Different approach to CI dependencies * Exclude node_modules from codestyle * Does this work? * Parallel parallel builds were giving me a headache, try this * Update codeclimate settings, purge some config files * Well the YAML was *syntactically* valid.... * Switch back to old coveralls method * Fix codeclimate config, mark 2 * Attempt to bodge asset test * Oops, again Probably bedtime.. * Might fix heroku building * Attempt #2 at fixing heroku * Belt and braces approach to coverage * Github, you need a Actions YAML validator! * Might fix actions? * Try ignoring some third party deprecation warnings * Another go at making coverage show up * Some template cleanup * Minor python cleanup * Import optimisation * Revert "Minor python cleanup" This reverts commit6a4620a2e5. * Add format arg to coverage command * Ignore test directories from Heroku slug * Maybe this works to purge deps postbuild * Bunch of test refactoring * Restore signals import, screw you import optimisation * Further template refactoring * Add support for running tests with geckodriver, do this on CI * Screw you codestyle * Disable firefox tests for now That was way more errors than I expected * Run cleanup script from the right location * Plausibly fix tests * Helps if I don't delete the pipeline folder prior to collectstatic * Enable whitenoise * Can I delete pipeline here? * Allow seconds difference in assert_times_equal * Disable codeclimate * Remove not working rm command * Maybe this fixes coverage? * Try different coverage reporter * Fix search_help to need login * Made versioning magic a bit less expansive We have more apps than I thought... * Fix IDI0T error in Assets URLS * Refactor 'no access to unauthed' test to cover all of PyRIGS * Add RAs/Checklists to sample data generator * Fix some HTML errors in templates Which apparently only Django's HTML parser cares about, browsers DGAF... * Port title test to project level * Fix more HTML * Fix cable type detail
368 lines
24 KiB
HTML
368 lines
24 KiB
HTML
{% extends request.is_ajax|yesno:'base_ajax.html,base_rigs.html' %}
|
||
{% load widget_tweaks %}
|
||
{% load static %}
|
||
{% load help_text from filters %}
|
||
{% load profile_by_index from filters %}
|
||
{% load button from filters %}
|
||
|
||
{% block css %}
|
||
{{ block.super }}
|
||
<link rel="stylesheet" href="{% static 'css/bootstrap-select.css' %}"/>
|
||
<link rel="stylesheet" href="{% static 'css/ajax-bootstrap-select.css' %}"/>
|
||
{% endblock %}
|
||
|
||
{% block preload_js %}
|
||
{{ block.super }}
|
||
<script src="{% static 'js/bootstrap-select.js' %}"></script>
|
||
<script src="{% static 'js/ajax-bootstrap-select.js' %}"></script>
|
||
{% endblock %}
|
||
|
||
{% block js %}
|
||
{{ block.super }}
|
||
<script src="{% static 'js/jquery-ui.js' %}"></script><!--TODO optimise-->
|
||
<script src="{% static 'js/interaction.js' %}"></script>
|
||
<script src="{% static 'js/modal.js' %}"></script>
|
||
<script src="{% static 'js/tooltip.js' %}"></script>
|
||
|
||
<script src="{% static 'js/autocompleter.js' %}"></script>
|
||
|
||
{% include 'partials/datetime-fix.html' %}
|
||
|
||
<script>
|
||
$(document).ready(function () {
|
||
$('button[data-action=add]').on('click', function (event) {
|
||
event.preventDefault();
|
||
let target = $($(this).attr('data-target'));
|
||
let newID = Number(target.attr('data-pk'));
|
||
let newRow = $($(this).attr('data-clone'))
|
||
.clone().attr('style', "")
|
||
.attr('id', function(i, val){
|
||
return val.split("_")[0] + '_' + newID;
|
||
})
|
||
.appendTo(target);
|
||
newRow.find('select,input').attr('name', function(i, val){
|
||
return val.split("_")[0] + '_' + newID;
|
||
})//Disabled is to prevent the hidden row being sent to the form
|
||
.removeAttr('disabled');
|
||
newRow.find('button[data-action=delete]').attr('data-id', newID);
|
||
newRow.find('select').addClass('selectpicker');
|
||
newRow.find('.selectpicker').selectpicker('refresh');
|
||
$(".selectpicker").each(function(){initPicker($(this))});
|
||
initDatetime();
|
||
$(target).attr('data-pk', newID - 1);
|
||
});
|
||
$(document).on('click', 'button[data-action=delete]', function(event) {
|
||
event.preventDefault();
|
||
$(this).closest('tr').remove();
|
||
});
|
||
//Somewhat rudimentary way of ensuring people fill in completely (if it hits the database validation the whole table row disappears when the page reloads...)
|
||
//the not is to avoid adding it to some of bootstrap-selects extra crap
|
||
$('#vehiclest,#crewmemberst').on('change', 'select,input', function () {
|
||
$(this).closest('tr').find("select,input").not(':input[type=search]').attr('required', 'true');
|
||
});
|
||
});
|
||
</script>
|
||
{% endblock %}
|
||
|
||
{% block content %}
|
||
<div class="col-12">
|
||
{% include 'form_errors.html' %}
|
||
{% if edit %}
|
||
<form role="form" method="POST" action="{% url 'ec_edit' pk=object.pk %}">
|
||
{% else %}
|
||
<form role="form" method="POST" action="{% url 'event_ec' pk=event.pk %}">
|
||
{% endif %}
|
||
<input type="hidden" name="{{ form.event.name }}" id="{{ form.event.id_for_label }}"
|
||
value="{{event.pk}}"/>
|
||
{% csrf_token %}
|
||
<div class="row">
|
||
<div class="col-12">
|
||
<div class="card">
|
||
<div class="card-header">Event Information</div>
|
||
<div class="card-body">
|
||
<dl class="row">
|
||
<dt class="col-4">Event Date</dt>
|
||
<dd class="col-8">{{ event.start_date}}{%if event.end_date %}-{{ event.end_date}}{%endif%}</dd>
|
||
<dt class="col-4">Event Name</dt>
|
||
<dd class="col-8">{{ event.name }}</dd>
|
||
<dt class="col-4">Client</dt>
|
||
<dd class="col-8">{{ event.person }}</dd>
|
||
<dt class="col-4">Event Size</dt>
|
||
<dd class="col-8">{% include 'partials/event_size.html' with object=event.riskassessment %}</dd>
|
||
</dl>
|
||
<div class="form-group form-row">
|
||
<label for="{{ form.date.id_for_label }}"
|
||
class="col-4 col-form-label">{{ form.date.label }}</label>
|
||
{% if not form.date.value %}
|
||
{% render_field form.date class+="form-control col-8" value=event.start_date %}
|
||
{% else %}
|
||
{% render_field form.date class+="form-control col-8" %}
|
||
{% endif %}
|
||
</div>
|
||
<div class="form-group form-row" id="{{ form.venue.id_for_label }}-group">
|
||
<label for="{{ form.venue.id_for_label }}"
|
||
class="col-4 col-form-label">{{ form.venue.label }}</label>
|
||
<select id="{{ form.venue.id_for_label }}" name="{{ form.venue.name }}" class="form-control selectpicker col-8" data-live-search="true" data-sourceurl="{% url 'api_secure' model='venue' %}">
|
||
{% if venue %}
|
||
<option value="{{venue.pk}}" selected="selected">{{ venue.name }}</option>
|
||
{% elif event.venue %}
|
||
<option value="{{event.venue.pk}}" selected="selected">{{ event.venue.name }}</option>
|
||
{% endif %}
|
||
</select>
|
||
</div>
|
||
<div class="form-group form-row" id="{{ form.power_mic.id_for_label }}-group">
|
||
<label for="{{ form.power_mic.id_for_label }}"
|
||
class="col-4 col-form-label">{{ form.power_mic.help_text }}</label>
|
||
<select id="{{ form.power_mic.id_for_label }}" name="{{ form.power_mic.name }}" class="form-control selectpicker col-8" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials" required="true">
|
||
{% if power_mic %}
|
||
<option value="{{power_mic.pk}}" selected="selected">{{ power_mic.name }}</option>
|
||
{% elif event.riskassessment.power_mic %}
|
||
<option value="{{event.riskassessment.power_mic.pk}}" selected="selected">{{ event.riskassessment.power_mic.name }}</option>
|
||
{% endif %}
|
||
</select>
|
||
</div>
|
||
<p class="pt-3 font-weight-bold">List vehicles and their drivers</p>
|
||
<div class="table-responsive">
|
||
<table class="table table-sm">
|
||
<thead>
|
||
<tr>
|
||
<th scope="col">Vehicle</th>
|
||
<th scope="col">Driver</th>
|
||
<th scope="col"></th>
|
||
</tr>
|
||
</thead>
|
||
<tbody id="vehiclest" data-pk="-1">
|
||
<tr id="vehicles_new" style="display: none;">
|
||
<td><input type="text" class="form-control" name="vehicle_new" disabled="true"/></td>
|
||
<td><select class="form-control" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials" name="driver_new" disabled="true"></select></td>
|
||
<td><button type="button" class="btn btn-danger btn-sm mt-1" data-action='delete' data-target='#vehicle'><span class="fas fa-times"></span></button></td>
|
||
</tr>
|
||
{% for i in object.vehicles.all %}
|
||
<tr id="vehicles_{{i.pk}}">
|
||
<td><input name="vehicle_{{i.pk}}" type="text" class="form-control" value="{{ i.vehicle }}"/></td>
|
||
<td>
|
||
<select name="driver_{{i.pk}}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials">
|
||
{% if i.driver != '' %}
|
||
<option value="{{i.driver.pk}}" selected="selected">{{ i.driver.name }}</option>
|
||
{% endif %}
|
||
</select>
|
||
</td>
|
||
<td><button type="button" class="btn btn-danger btn-sm mt-1" data-id='{{i.pk}}' data-action='delete' data-target='#vehicle'><span class="fas fa-times"></span></button></td>
|
||
</tr>
|
||
{% endfor %}
|
||
</tbody>
|
||
</table>
|
||
</div>
|
||
<div class="text-right">
|
||
<button type="button" class="btn btn-secondary" id="vehicle-add" data-action='add' data-target='#vehiclest' data-clone='#vehicles_new'><span class="fas fa-plus"></span> Add Vehicle</button>
|
||
</div>
|
||
</div>
|
||
</div>
|
||
</div>
|
||
</div>
|
||
<div class="row my-3">
|
||
<div class="col-12">
|
||
<div class="card">
|
||
<div class="card-header">Safety Checks</div>
|
||
<div class="card-body">
|
||
{% include 'partials/checklist_checkbox.html' with formitem=form.safe_parking %}
|
||
{% include 'partials/checklist_checkbox.html' with formitem=form.safe_packing %}
|
||
{% include 'partials/checklist_checkbox.html' with formitem=form.exits %}
|
||
{% include 'partials/checklist_checkbox.html' with formitem=form.trip_hazard %}
|
||
{% include 'partials/checklist_checkbox.html' with formitem=form.warning_signs %}
|
||
{% include 'partials/checklist_checkbox.html' with formitem=form.ear_plugs %}
|
||
<div class="row pt-3">
|
||
<label class="col-5" for="{{ form.hs_location.id_for_label }}">{{ form.hs_location.help_text }}</label>
|
||
{% render_field form.hs_location class+="form-control col-7 col-md-4" %}
|
||
</div>
|
||
<div class="row pt-1">
|
||
<label class="col-5" for="{{ form.extinguishers_location.id_for_label }}">{{ form.extinguishers_location.help_text }}</label>
|
||
{% render_field form.extinguishers_location class+="form-control col-7 col-md-4" %}
|
||
</div>
|
||
</div>
|
||
</div>
|
||
</div>
|
||
</div>
|
||
<div class="row my-3">
|
||
<div class="col-12">
|
||
<div class="card">
|
||
<div class="card-header">Crew Record</div>
|
||
<div class="card-body">
|
||
<div class="table-responsive">
|
||
<table class="table table-sm">
|
||
<thead>
|
||
<tr>
|
||
<th scope="col">Person</th>
|
||
<th scope="col">Start Time</th>
|
||
<th scope="col">Role</th>
|
||
<th scope="col">End Time</th>
|
||
<th scope="col"></th>
|
||
</tr>
|
||
</thead>
|
||
<tbody id="crewmemberst" data-pk="-1">
|
||
<tr id="crew_new" style="display: none;">
|
||
<td>
|
||
<select name="crewmember_new" class="form-control" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials" disabled="true"></select>
|
||
</td>
|
||
<td style="min-width: 15ch"><input name="start_new" type="datetime-local" class="form-control" value="{{ i.start }}" disabled=""/></td>
|
||
<td style="min-width: 15ch"><input name="role_new" type="text" class="form-control" value="{{ i.role }}" disabled="true"/></td>
|
||
<td style="min-width: 15ch"><input name="end_new" type="datetime-local" class="form-control" value="{{ i.end }}" disabled="true" /></td>
|
||
<td><button type="button" class="btn btn-danger btn-sm mt-1" data-id='{{crew.pk}}' data-action='delete' data-target='#crewmember'><span class="fas fa-times"></span></button></td>
|
||
</tr>
|
||
{% for crew in object.crew.all %}
|
||
<tr id="crew_{{crew.pk}}">
|
||
<td>
|
||
<select name="crewmember_{{crew.pk}}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials">
|
||
{% if crew.crewmember != '' %}
|
||
<option value="{{crew.crewmember.pk}}" selected="selected">{{ crew.crewmember.name }}</option>
|
||
{% endif %}
|
||
</select>
|
||
</td>
|
||
<td><input name="start_{{crew.pk}}" type="datetime-local" class="form-control" value="{{ crew.start|date:'Y-m-d' }}T{{ crew.start|date:'H:i:s' }}"/></td>
|
||
<td><input name="role_{{crew.pk}}" type="text" class="form-control" value="{{ crew.role }}"/></td>
|
||
<td><input name="end_{{crew.pk}}" type="datetime-local" class="form-control" value="{{ crew.end|date:'Y-m-d' }}T{{ crew.end|date:'H:i:s' }}"/></td>
|
||
<td><button type="button" class="btn btn-danger btn-sm mt-1" data-id='{{crew.pk}}' data-action='delete' data-target='#crewmember'><span class="fas fa-times"></span></button></td>
|
||
</tr>
|
||
{% endfor %}
|
||
</tbody>
|
||
</table>
|
||
</div>
|
||
</div>
|
||
<div class="card-footer">
|
||
<div class="text-right">
|
||
<button type="button" class="btn btn-secondary" data-action='add' data-target='#crewmemberst' data-clone='#crew_new'><span class="fas fa-plus"></span> Add Crewmember</button>
|
||
</div>
|
||
</div>
|
||
</div>
|
||
</div>
|
||
</div>
|
||
{% if event.riskassessment.event_size == 0 %}
|
||
<div class="row my-3" id="size-0">
|
||
<div class="col-12">
|
||
<div class="card border-success">
|
||
<div class="card-header">Electrical Checks <small>for ‘Small’ TEC Events <6kVA (approx. 26A)</small></div>
|
||
<div class="card-body">
|
||
{% include 'partials/checklist_checkbox.html' with formitem=form.rcds %}
|
||
{% include 'partials/checklist_checkbox.html' with formitem=form.supply_test %}
|
||
{% include 'partials/checklist_checkbox.html' with formitem=form.earthing %}
|
||
{% include 'partials/checklist_checkbox.html' with formitem=form.pat %}
|
||
</div>
|
||
</div>
|
||
</div>
|
||
</div>
|
||
{% elif event.riskassessment.event_size == 1 %}
|
||
<div class="row my-3" id="size-1">
|
||
<div class="col-12">
|
||
<div class="card border-warning">
|
||
<div class="card-header">Electrical Checks <small>for ‘Medium’ TEC Events </small></div>
|
||
<div class="card-body">
|
||
{% include 'partials/checklist_checkbox.html' with formitem=form.source_rcd %}
|
||
{% include 'partials/checklist_checkbox.html' with formitem=form.labelling %}
|
||
{% include 'partials/checklist_checkbox.html' with formitem=form.earthing %}
|
||
{% include 'partials/checklist_checkbox.html' with formitem=form.pat %}
|
||
<hr>
|
||
<p>Tests at first distro</p>
|
||
<div class="table-responsive">
|
||
<table class="table table-bordered table-sm">
|
||
<thead>
|
||
<tr>
|
||
<th scope="col" class="text-center">Test</th>
|
||
<th scope="col" colspan="3" class="text-center">Value</th>
|
||
</tr>
|
||
</thead>
|
||
<tbody>
|
||
<tr>
|
||
<th scope="row" rowspan="2">Voltage<br><small>(cube meter)</small></th>
|
||
<th class="text-center">{{ form.fd_voltage_l1.help_text }}</th>
|
||
<th class="text-center">{{ form.fd_voltage_l2.help_text }}</th>
|
||
<th class="text-center">{{ form.fd_voltage_l3.help_text }}</th>
|
||
</tr>
|
||
<tr>
|
||
<td>{% render_field form.fd_voltage_l1 class+="form-control" style="min-width: 5rem;" %}</td>
|
||
<td>{% render_field form.fd_voltage_l2 class+="form-control" style="min-width: 5rem;" %}</td>
|
||
<td>{% render_field form.fd_voltage_l3 class+="form-control" style="min-width: 5rem;" %}</td>
|
||
</tr>
|
||
<tr>
|
||
<th scope="row">{{form.fd_phase_rotation.help_text|safe}}</th>
|
||
<td colspan="3">{% include 'partials/checklist_checkbox.html' with formitem=form.fd_phase_rotation %}</td>
|
||
</tr>
|
||
<tr>
|
||
<th scope="row">{{form.fd_earth_fault.help_text|safe}}</th>
|
||
<td colspan="3">{% render_field form.fd_earth_fault class+="form-control" %}</td>
|
||
</tr>
|
||
<tr>
|
||
<th scope="row">{{form.fd_pssc.help_text|safe}}</th>
|
||
<td colspan="3">{% render_field form.fd_pssc class+="form-control" %}</td>
|
||
</tr>
|
||
</tbody>
|
||
</table>
|
||
</div>
|
||
<hr>
|
||
<p>Tests at 'Worst Case' points (at least 1 point required)</p>
|
||
<div class="table-responsive">
|
||
<table class="table table-bordered">
|
||
<thead>
|
||
<tr>
|
||
<th scope="col" class="text-center">Test</th>
|
||
<th scope="col" class="text-center">Point 1</th>
|
||
<th scope="col" class="text-center">Point 2</th>
|
||
<th scope="col" class="text-center">Point 3</th>
|
||
</tr>
|
||
</thead>
|
||
<tbody>
|
||
<tr>
|
||
<th scope="row">{{form.w1_description.help_text|safe}}</th>
|
||
<td>{% render_field form.w1_description class+="form-control" style="min-width: 5rem;" %}</td>
|
||
<td>{% render_field form.w2_description class+="form-control" style="min-width: 5rem;" %}</td>
|
||
<td>{% render_field form.w3_description class+="form-control" style="min-width: 5rem;" %}</td>
|
||
</tr>
|
||
<tr>
|
||
<th scope="row">{{form.w1_polarity.help_text|safe}}</th>
|
||
<td>{% render_field form.w1_polarity %}</td>
|
||
<td>{% render_field form.w2_polarity %}</td>
|
||
<td>{% render_field form.w3_polarity %}</td>
|
||
</tr>
|
||
<tr>
|
||
<th scope="row">{{form.w1_voltage.help_text|safe}}</th>
|
||
<td>{% render_field form.w1_voltage class+="form-control" %}</td>
|
||
<td>{% render_field form.w2_voltage class+="form-control" %}</td>
|
||
<td>{% render_field form.w3_voltage class+="form-control" %}</td>
|
||
</tr>
|
||
<tr>
|
||
<th scope="row">{{form.w1_earth_fault.help_text|safe}}</th>
|
||
<td>{% render_field form.w1_earth_fault class+="form-control" %}</td>
|
||
<td>{% render_field form.w2_earth_fault class+="form-control" %}</td>
|
||
<td>{% render_field form.w3_earth_fault class+="form-control" %}</td>
|
||
</tr>
|
||
</tbody>
|
||
</table>
|
||
</div>
|
||
<hr/>
|
||
{% include 'partials/checklist_checkbox.html' with formitem=form.all_rcds_tested %}
|
||
{% include 'partials/checklist_checkbox.html' with formitem=form.public_sockets_tested %}
|
||
{% include 'partials/ec_power_info.html' %}
|
||
</div>
|
||
</div>
|
||
</div>
|
||
</div>
|
||
{% else %}
|
||
<div class="row my-3" id="size-2">
|
||
<div class="col-12">
|
||
<div class="card border-danger">
|
||
<div class="card-header">Electrical Checks <small>for ‘Large’ TEC Events</small></div>
|
||
<div class="card-body">
|
||
<p>Outside the scope of this assessment. <strong>I really hope you checked with a supervisor...</strong></p>
|
||
</div>
|
||
</div>
|
||
</div>
|
||
</div>
|
||
{% endif %}
|
||
<div class="row mt-3">
|
||
<div class="col-sm-12 text-right">
|
||
{% button 'submit' %}
|
||
</div>
|
||
</div>
|
||
</form>
|
||
</div>
|
||
{% endblock %}
|