mirror of
https://github.com/nottinghamtec/PyRIGS.git
synced 2026-01-17 05:22:16 +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
186 lines
11 KiB
HTML
186 lines
11 KiB
HTML
{% extends request.is_ajax|yesno:'base_ajax.html,base_rigs.html' %}
|
||
{% load widget_tweaks %}
|
||
{% load static %}
|
||
{% load help_text from filters %}
|
||
{% load nice_errors 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>
|
||
|
||
<script>
|
||
function parseBool(str) {
|
||
return str.toLowerCase() == 'true';
|
||
}
|
||
$('input[type=radio][name=big_power]').change(function() {
|
||
$('#{{ form.power_mic.id_for_label }}').prop('required', parseBool(this.value));
|
||
});
|
||
$('input[type=radio][name=outside], input[type=radio][name=generators], input[type=radio][name=other_companies_power], input[type=radio][name=nonstandard_equipment_power], input[type=radio][name=multiple_electrical_environments]').change(function() {
|
||
$('#{{ form.power_notes.id_for_label }}').prop('required', parseBool(this.value));
|
||
$('#{{ form.power_plan.id_for_label }}').prop('required', parseBool(this.value));
|
||
});
|
||
$('input[type=radio][name=special_structures]').change(function() {
|
||
$('#{{ form.persons_responsible_structures.id_for_label }}').prop('hidden', !parseBool(this.value)).prop('required', parseBool(this.value));
|
||
$('label[for={{ form.persons_responsible_structures.id_for_label }}]').prop('hidden', !parseBool(this.value));
|
||
});
|
||
$('input[type=radio][name=suspended_structures]').change(function() {
|
||
$('#{{ form.rigging_plan.id_for_label }}').prop('hidden', !parseBool(this.value)).prop('required', parseBool(this.value));
|
||
$('label[for={{ form.rigging_plan.id_for_label }}]').prop('hidden', !parseBool(this.value));
|
||
});
|
||
</script>
|
||
{% endblock %}
|
||
|
||
{% block content %}
|
||
<div class="col">
|
||
{% if form.errors %}
|
||
<div class="alert alert-danger alert-dismissable">
|
||
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
|
||
<dl>
|
||
{% with form|nice_errors as qq %}
|
||
{% for error_name,desc in qq.items %}
|
||
{% if error_name == 'General form errors' %}
|
||
{{ form.non_field_errors.0|safe }}
|
||
<div class="text-right">
|
||
{% render_field form.supervisor_consulted class+="form-check-input" form="form" %}<label class="form-check-label" for="{{ form.supervisor_consulted.id_for_label}}">Please confirm you've done so.</label><br>
|
||
<button class="btn btn-primary mt-2" type="submit" form="form"><span class="fas fa-thumbs-up"></span> Confirm</button>
|
||
</div>
|
||
{% else %}
|
||
<span class="row">
|
||
<dt class="col-4">{{error_name}}</dt>
|
||
<dd class="col-8">{{desc}}</dd>
|
||
</span>
|
||
{% endif %}
|
||
{% endfor %}
|
||
{% endwith %}
|
||
</dl>
|
||
</div>
|
||
{% endif %}
|
||
{% if edit %}
|
||
<form role="form" method="POST" action="{% url 'ra_edit' pk=object.pk %}" id="form">
|
||
{% else %}
|
||
<form role="form" method="POST" action="{% url 'event_ra' pk=event.pk %}" id="form">
|
||
{% 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">General</div>
|
||
<div class="card-body">
|
||
<p><strong>If the answer is yes to any of the below, you must consult a supervisor and make sure all activities planned to be undertaken are sufficiently covered by health and safety documentation</strong></p>
|
||
{% include 'partials/yes_no_radio.html' with formitem=form.nonstandard_equipment %}
|
||
{% include 'partials/yes_no_radio.html' with formitem=form.nonstandard_use %}
|
||
{% include 'partials/yes_no_radio.html' with formitem=form.contractors %}
|
||
{% include 'partials/yes_no_radio.html' with formitem=form.other_companies %}
|
||
{% include 'partials/yes_no_radio.html' with formitem=form.crew_fatigue %}
|
||
|
||
<label for="{{ form.general_notes.id_for_label }}">{{ form.general_notes.help_text }}</label>
|
||
{% render_field form.general_notes class+="form-control" %}
|
||
</div>
|
||
</div>
|
||
</div>
|
||
</div>
|
||
<div class="row my-3">
|
||
<div class="col-12">
|
||
<div class="card">
|
||
<div class="card-header">Power</div>
|
||
<div class="card-body">
|
||
{% include 'partials/yes_no_radio.html' with formitem=form.big_power %}
|
||
<label for="{{ form.power_mic.id_for_label }}"
|
||
class="col col-form-label">{{ form.power_mic.help_text|safe }}</label>
|
||
<div class="col-6">
|
||
<select id="{{ form.power_mic.id_for_label }}" name="{{ form.power_mic.name }}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials">
|
||
{% if object.power_mic %}
|
||
<option value="{{object.power_mic.pk}}" selected="selected">{{ object.power_mic.name }}</option>
|
||
{% endif %}
|
||
</select>
|
||
</div>
|
||
<p class="pt-4"><strong>If the answer is yes to ANY of the below questions this is a Large Event and you <em>must</em> consult a power supervisor</strong></p>
|
||
{% include 'partials/yes_no_radio.html' with formitem=form.outside %}
|
||
{% include 'partials/yes_no_radio.html' with formitem=form.generators label="Will generators be used?" %}
|
||
{% include 'partials/yes_no_radio.html' with formitem=form.other_companies_power %}
|
||
{% include 'partials/yes_no_radio.html' with formitem=form.nonstandard_equipment_power %}
|
||
{% 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>
|
||
</div>
|
||
<div class="row my-3">
|
||
<div class="col-12">
|
||
<div class="card">
|
||
<div class="card-header">Sound</div>
|
||
<div class="card-body">
|
||
<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" %}
|
||
</div>
|
||
</div>
|
||
</div>
|
||
</div>
|
||
<div class="row my-3">
|
||
<div class="col-12">
|
||
<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>
|
||
{% 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 %}
|
||
{% include 'partials/yes_no_radio.html' with formitem=form.area_outside_of_control %}
|
||
{% include 'partials/yes_no_radio.html' with formitem=form.barrier_required %}
|
||
{% include 'partials/yes_no_radio.html' with formitem=form.nonstandard_emergency_procedure %}
|
||
</div>
|
||
</div>
|
||
</div>
|
||
</div>
|
||
<div class="row my-3">
|
||
<div class="col-12">
|
||
<div class="card">
|
||
<div class="card-header">Structures</div>
|
||
<div class="card-body">
|
||
{% include 'partials/yes_no_radio.html' with formitem=form.special_structures %}
|
||
<label for="{{ form.persons_responsible_structures.id_for_label }}" class="mt-3" hidden="true">{{ form.persons_responsible_structures.help_text }}</label>
|
||
{% render_field form.persons_responsible_structures class+="form-control mb-3" hidden="true" %}
|
||
{% include 'partials/yes_no_radio.html' with formitem=form.suspended_structures %}
|
||
<label for="{{ form.rigging_plan.id_for_label }}" class="mt-2" hidden="true">{{ form.rigging_plan.help_text|safe }}</label>
|
||
{% render_field form.rigging_plan class+="form-control" hidden="true" %}
|
||
</div>
|
||
</div>
|
||
</div>
|
||
</div>
|
||
<div class="row mt-3">
|
||
<div class="col-sm-12 text-right">
|
||
<div class="btn-group">
|
||
<button type="submit" class="btn btn-primary" title="Save"><i
|
||
class="fas fa-save"></i> Save
|
||
</button>
|
||
</div>
|
||
</div>
|
||
</div>
|
||
</form>
|
||
</div>
|
||
{% endblock %}
|