mirror of
https://github.com/nottinghamtec/PyRIGS.git
synced 2026-10-10 14:52:53 +00:00
AJ
08171767a0
* 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>
178 lines
9.6 KiB
HTML
178 lines
9.6 KiB
HTML
{% extends is_ajax|yesno:"base_ajax.html,base_rigs.html" %}
|
|
{% load filters %}
|
|
|
|
{% block content %}
|
|
<div class="row py-3">
|
|
<div class="col-12">
|
|
<div class="card card-default mb-3">
|
|
<div class="card-header">General</div>
|
|
<div class="card-body">
|
|
<dl class="row">
|
|
<dt class="col-10">{{ object|help_text:'nonstandard_equipment'|safe }}</dt>
|
|
<dd class="col-2">
|
|
{{ object.nonstandard_equipment|yesnoi:'invert' }}
|
|
</dd>
|
|
<dt class="col-10">{{ object|help_text:'nonstandard_use'|safe }}</dt>
|
|
<dd class="col-2">
|
|
{{ object.nonstandard_use|yesnoi:'invert' }}
|
|
</dd>
|
|
<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'|safe }}</dt>
|
|
<dd class="col-2">
|
|
{{ object.other_companies|yesnoi:'invert' }}
|
|
</dd>
|
|
<dt class="col-10">{{ object|help_text:'crew_fatigue' }}</dt>
|
|
<dd class="col-2">
|
|
{{ object.crew_fatigue|yesnoi:'invert' }}
|
|
</dd>
|
|
<dt class="col-12">{{ object|help_text:'general_notes' }}</dt>
|
|
<dd class="col-12">
|
|
{{ object.general_notes|default:'N/A'|linebreaks }}
|
|
</dd>
|
|
</dl>
|
|
</div>
|
|
</div>
|
|
<div class="card card-default mb-3">
|
|
<div class="card-header">Power {% include 'partials/event_size.html' %}</div>
|
|
<div class="card-body">
|
|
<dl class="row">
|
|
<dt class="col-sm-6">{{ object|help_text:'big_power' }}</dt>
|
|
<dd class="col-sm-6">
|
|
{{ object.big_power|yesnoi:'invert' }}
|
|
</dd>
|
|
<dt class="col-sm-6">{{ object|help_text:'power_mic'|safe }}</dt>
|
|
<dd class="col-sm-6">
|
|
{{ object.power_mic.name|default:object.event.mic }}
|
|
</dd>
|
|
<dt class="col-sm-6">{{ object|help_text:'outside' }}</dt>
|
|
<dd class="col-sm-6">
|
|
{{ object.outside|yesnoi:'invert' }}
|
|
</dd>
|
|
<dt class="col-sm-6">{{ object|help_text:'generators' }}</dt>
|
|
<dd class="col-sm-6">
|
|
{{ object.generators|yesnoi:'invert' }}
|
|
</dd>
|
|
<dt class="col-sm-6">{{ object|help_text:'other_companies_power' }}</dt>
|
|
<dd class="col-sm-6">
|
|
{{ object.other_companies_power|yesnoi:'invert' }}
|
|
</dd>
|
|
<dt class="col-sm-6">{{ object|help_text:'nonstandard_equipment_power' }}</dt>
|
|
<dd class="col-sm-6">
|
|
{{ object.nonstandard_equipment_power|yesnoi:'invert' }}
|
|
</dd>
|
|
<dt class="col-sm-6">{{ object|help_text:'multiple_electrical_environments' }}</dt>
|
|
<dd class="col-sm-6">
|
|
{{ object.multiple_electrical_environments|yesnoi:'invert' }}
|
|
</dd>
|
|
<dt class="col-12">{{ object|help_text:'power_notes' }}</dt>
|
|
<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>
|
|
<div class="card card-default mb-3">
|
|
<div class="card-header">Sound</div>
|
|
<div class="card-body">
|
|
<dl class="row">
|
|
<dt class="col-sm-6">{{ object|help_text:'noise_monitoring' }}</dt>
|
|
<dd class="col-sm-6">
|
|
{{ object.noise_monitoring|yesnoi:'invert' }}
|
|
</dd>
|
|
<dt class="col-12">{{ object|help_text:'sound_notes' }}</dt>
|
|
<dd class="col-12">
|
|
{{ object.sound_notes|default:'N/A'|linebreaks }}
|
|
</dd>
|
|
</dl>
|
|
</div>
|
|
</div>
|
|
<div class="row">
|
|
<div class="col-lg-6 col-12">
|
|
<div class="card card-default mb-3">
|
|
<div class="card-header">Site Details</div>
|
|
<div class="card-body">
|
|
<dl class="row">
|
|
<dt class="col-10">{{ object|help_text:'known_venue' }}</dt>
|
|
<dd class="col-2">
|
|
{{ object.known_venue|yesnoi:'invert' }}
|
|
</dd>
|
|
<dt class="col-10">{{ object|help_text:'safe_loading'|safe }}</dt>
|
|
<dd class="col-2">
|
|
{{ object.safe_loading|yesnoi:'invert' }}
|
|
</dd>
|
|
<dt class="col-10">{{ object|help_text:'safe_storage' }}</dt>
|
|
<dd class="col-2">
|
|
{{ object.safe_storage|yesnoi:'invert' }}
|
|
</dd>
|
|
<dt class="col-10">{{ object|help_text:'area_outside_of_control' }}</dt>
|
|
<dd class="col-2">
|
|
{{ object.area_outside_of_control|yesnoi:'invert' }}
|
|
</dd>
|
|
<dt class="col-10">{{ object|help_text:'barrier_required' }}</dt>
|
|
<dd class="col-2">
|
|
{{ object.barrier_required|yesnoi:'invert' }}
|
|
</dd>
|
|
<dt class="col-10">{{ object|help_text:'nonstandard_emergency_procedure' }}</dt>
|
|
<dd class="col-2">
|
|
{{ object.nonstandard_emergency_procedure|yesnoi:'invert' }}
|
|
</dd>
|
|
</dl>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div class="col-lg-6 col-12">
|
|
<div class="card card-default mb-3">
|
|
<div class="card-header">Structures</div>
|
|
<div class="card-body">
|
|
<dl class="row">
|
|
<dt class="col-10">{{ object|help_text:'special_structures' }}</dt>
|
|
<dd class="col-2">
|
|
{{ object.special_structures|yesnoi:'invert' }}
|
|
</dd>
|
|
<dt class="col-10">{{ object|help_text:'suspended_structures' }}</dt>
|
|
<dd class="col-2">
|
|
{{ object.suspended_structures|yesnoi:'invert' }}
|
|
</dd>
|
|
<dt class="col-12">{{ object|help_text:'persons_responsible_structures' }}</dt>
|
|
<dd class="col-12">
|
|
{{ object.persons_responsible_structures|default:'N/A'|linebreaks }}
|
|
</dd>
|
|
<dt class="col-12">{{ object|help_text:'rigging_plan'|safe }}</dt>
|
|
<dd class="col-12">
|
|
{{ object.rigging_plan|linkornone|default:'N/A' }}
|
|
</dd>
|
|
</dl>
|
|
</div>
|
|
</div>
|
|
<div class="card card-default mb-3">
|
|
<div class="card-header">Venue Access</div>
|
|
<div class="card-body">
|
|
<dl class="row">
|
|
<dt class="col-10">{{ object|help_text:'parking_and_access' }}</dt>
|
|
<dd class="col-2">
|
|
{{ object.parking_and_access|yesnoi:'invert' }}
|
|
</dd>
|
|
</dl>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div class="col-12 text-right">
|
|
{% button 'print' 'ra_print' object.pk %}
|
|
<a href="{% url 'ra_edit' object.pk %}" class="btn btn-warning my-3"><span class="fas fa-edit"></span> <span
|
|
class="d-none d-sm-inline">Edit</span></a>
|
|
<a href="{% url 'event_detail' object.event.pk %}" class="btn btn-primary"><span class="fas fa-eye"></span> View Event</a>
|
|
{{ object.review_string|safe }}
|
|
{% include 'partials/last_edited.html' with target="riskassessment_history" %}
|
|
</div>
|
|
</div>
|
|
{% endblock %}
|