mirror of
https://github.com/nottinghamtec/PyRIGS.git
synced 2026-10-08 05:25:34 +00:00
* Port to Django 5.2 * Pin pluggy to 1.2.0 Any newer and the mystery importlib metadata error appears. Weird! >_> * Update for premailer changed default * Update view logic for is_ajax being changed to a template context processor * Port a few more tests to pytest proper Having two distinct test flavours is giving me a headache * Version 1 dockerfile Makes a VERY big image, I suspect we can optimise this a lot... * Optimise dockerfile a little lot a bit * fix(users): change logout link to POST request * fix(tests): fix some syntax errors in test code still got lots of failed tests :( * fix: replace deprecated Django APIs * ci: update Dockerfile * ci: update Dockerfile * fix(dependencies+tests): update EoL/vulnerable dependencies and improve test stability * Upgrade Python from 3.10 to 3.12 * Update frontend dependencies, replace node-sass with sass * chore(logging): ignore dangling obj reference warning from pypdf * ci: update compose.yml for prod deployment - Add Nginx as a reverse proxy - Add cert-selfsign.sh for generating self-signed certificates - Add certbot-issue.sh for Let's Encrypt certificate issuance and renewal - Add cron-install.sh and cron-uninstall.sh for system cron management - Add .env.example as an environment variable template * style: reformat code * ci: add more sleep trying to pass tests * ci: ignore browser-based tests during ci testing * fix: create home for the new user during Dockerfile building * chore: remove heroku conf file * fix: RIGS not franken anymore * fix: restore is_ajax as a boolean and split out the context processor * test: remove Selenium interaction tests and their CI workarounds * fix: harden production settings (CSRF origins, env casts, ADMINS) and drop dead debug toolbar code * deploy: serve static files from nginx, pin PGDATA, and make cert scripts loud on failure * build: switch .dockerignore to an allowlist * build: drop unused dependencies, soft-pin the rest and target Python 3.14 * build: move image to Python 3.14 / Node 24 and force DEBUG off * ci: add dependabot config for uv, npm, docker and actions * build: narrow Sass deprecation silencing to @import and require Node 24 * build: provide placeholder env for collectstatic now that DEBUG is off in the image * deploy: add plain-HTTP nginx config for local development and use it in compose * deploy: remove self-signed cert script * build: make the image multi-arch with official node and python base images * ci: lint and test on PRs, build the image on PRs and push it to GHCR on master * docs: add local running and sample data instructions * fix: report a form error instead of crashing when big power has no Power MIC * fix: upgrade pypdf and urllib3 to patched releases * fix: apply non-breaking npm audit fixes * fix: strip whitespace in ALLOWED_HOSTS and drop misleading HSTS preload * deploy: add a pyrigs healthcheck and make nginx wait for it * build: pin the uv image version * fix: correct the check-in person picker condition and use BeautifulSoup's string argument * refactor: replace unique_together with UniqueConstraint * build: replace pycodestyle with ruff and fix what it found Removes unused imports and variables, and fixes a few real problems it surfaced: - EventCheckIn.active() referenced an undefined name and raised NameError; it now returns whether the check-in has no end time - RIGS.admin defined EventChecklistAdmin twice; the second is now PowerTestRecordAdmin - RIGS/tests/conftest.py used date/timedelta without importing them - the signal-registering imports in apps.py are kept with noqa pycodestyle config in setup.cfg is dropped. * style: format the codebase with ruff * style: normalise line endings, trailing whitespace and end-of-file newlines * ci: run ruff and file hygiene through prek, and document it --------- Co-authored-by: Hang <me@hangxu.me> Co-authored-by: Joe Banks <joe@jb3.dev>
188 lines
11 KiB
HTML
188 lines
11 KiB
HTML
{% extends 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 %}
|
||
<link rel="stylesheet" href="{% static 'css/selects.css' %}"/>
|
||
{% endblock %}
|
||
|
||
{% block preload_js %}
|
||
<script src="{% static 'js/selects.js' %}"></script>
|
||
{% endblock %}
|
||
|
||
{% block js %}
|
||
<script src="{% static 'js/autocompleter.js' %}"></script>
|
||
<script src="{% static 'js/tooltip.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="selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials">
|
||
{% if power_mic %}
|
||
<option value="{{form.power_mic.value}}" selected="selected">{{ power_mic }}</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 my-3">
|
||
<div class="col-12">
|
||
<div class="card">
|
||
<div class="card-header">Venue Access</div>
|
||
<div class="card-body">
|
||
<p><strong>If yes to the below, ensure you have communicated with the client and secured all necessary access prior to the event commencing.</strong></p>
|
||
{% include 'partials/yes_no_radio.html' with formitem=form.parking_and_access %}
|
||
</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 %}
|