mirror of
https://github.com/nottinghamtec/PyRIGS.git
synced 2026-10-08 13:35:25 +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>
177 lines
7.2 KiB
HTML
177 lines
7.2 KiB
HTML
{% extends is_ajax|yesno:"base_ajax.html,base_rigs.html" %}
|
|
{% load help_text from filters %}
|
|
{% load profile_by_index from filters %}
|
|
{% load yesnoi from filters %}
|
|
{% load button from filters %}
|
|
|
|
{% block content %}
|
|
<div class="row">
|
|
<div class="col-12 text-right my-3">
|
|
{% button 'edit' url='pt_edit' pk=object.pk %}
|
|
{% button 'view' url='event_detail' pk=object.event.pk text="Event" %}
|
|
{% include 'partials/review_status.html' with perm=perms.RIGS.review_power review='pt_review' %}
|
|
</div>
|
|
</div>
|
|
<div class="card mb-3">
|
|
<div class="card-header">{% include 'partials/event_size.html' with object=object.event.riskassessment %}</div>
|
|
<div class="card-body">
|
|
<dl class="row">
|
|
<dt class="col-6">{{ object|help_text:'power_mic' }}</dt>
|
|
<dd class="col-6">
|
|
{% if object.power_mic %}
|
|
<a href="{% url 'profile_detail' object.power_mic.pk %}">{{ object.power_mic.name }}</a>
|
|
{% else %}
|
|
None
|
|
{% endif %}
|
|
</dd>
|
|
<dt class="col-6">Venue</dt>
|
|
<dd class="col-6">
|
|
{% if object.venue %}
|
|
<a href="{% url 'venue_detail' object.venue.pk %}" class="modal-href">
|
|
{{ object.venue }}
|
|
</a>
|
|
{% endif %}
|
|
</dd>
|
|
<dt class="col-6">Notes</dt>
|
|
<dd class="col-6">
|
|
{{ object.notes }}
|
|
</dd>
|
|
</dl>
|
|
{% if object.event.riskassessment.event_size == 0 %}
|
|
<dl class="row">
|
|
<dt class="col-10">{{ object|help_text:'rcds'|safe }}</dt>
|
|
<dd class="col-2">
|
|
{{ object.rcds|yesnoi }}
|
|
</dd>
|
|
<dt class="col-10">{{ object|help_text:'supply_test'|safe }}</dt>
|
|
<dd class="col-2">
|
|
{{ object.supply_test|yesnoi }}
|
|
</dd>
|
|
<dt class="col-10">{{ object|help_text:'earthing'|safe }}</dt>
|
|
<dd class="col-2">
|
|
{{ object.earthing|yesnoi }}
|
|
</dd>
|
|
<dt class="col-10">{{ object|help_text:'pat'|safe }}</dt>
|
|
<dd class="col-2">
|
|
{{ object.pat|yesnoi }}
|
|
</dd>
|
|
</dl>
|
|
{% else %}
|
|
<dl class="row">
|
|
<dt class="col-10">{{ object|help_text:'source_rcd'|safe }}</dt>
|
|
<dd class="col-2">
|
|
{{ object.source_rcd|yesnoi }}
|
|
</dd>
|
|
<dt class="col-10">{{ object|help_text:'labelling'|safe }}</dt>
|
|
<dd class="col-2">
|
|
{{ object.labelling|yesnoi }}
|
|
</dd>
|
|
<dt class="col-10">{{ object|help_text:'earthing'|safe }}</dt>
|
|
<dd class="col-2">
|
|
{{ object.earthing|yesnoi }}
|
|
</dd>
|
|
<dt class="col-10">{{ object|help_text:'pat'|safe }}</dt>
|
|
<dd class="col-2">
|
|
{{ object.pat|yesnoi }}
|
|
</dd>
|
|
</dl>
|
|
<hr>
|
|
<p>Tests at first distro</p>
|
|
<table class="table table-bordered">
|
|
<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> / V</th>
|
|
<th>{{ object|help_text:'fd_voltage_l1' }}</th>
|
|
<th>{{ object|help_text:'fd_voltage_l2' }}</th>
|
|
<th>{{ object|help_text:'fd_voltage_l3' }}</th>
|
|
</tr>
|
|
<tr>
|
|
<td>{{ object.fd_voltage_l1 }}</td>
|
|
<td>{{ object.fd_voltage_l2 }}</td>
|
|
<td>{{ object.fd_voltage_l3 }}</td>
|
|
</tr>
|
|
<tr>
|
|
<th scope="row">{{ object|help_text:'fd_phase_rotation'|safe }}</th>
|
|
<td colspan="3">{{ object.fd_phase_rotation|yesnoi }}</td>
|
|
</tr>
|
|
<tr>
|
|
<th scope="row">{{ object|help_text:'fd_earth_fault'|safe}}</th>
|
|
<td colspan="3">{{ object.fd_earth_fault }}</td>
|
|
</tr>
|
|
<tr>
|
|
<th scope="row">{{ object|help_text:'fd_pssc'}}</th>
|
|
<td colspan="3">{{ object.fd_pssc }}</td>
|
|
</tr>
|
|
</tbody>
|
|
</table>
|
|
<hr>
|
|
<p>Tests at 'Worst Case' points (at least 1 point required)</p>
|
|
<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">{{ object|help_text:'w1_description'|safe}}</th>
|
|
<td>{{ object.w1_description }}</td>
|
|
<td>{{ object.w2_description|default:'' }}</td>
|
|
<td>{{ object.w3_description|default:'' }}</td>
|
|
</tr>
|
|
<tr>
|
|
<th scope="row">{{ object|help_text:'w1_polarity'|safe}}</th>
|
|
<td>{{ object.w1_polarity|yesnoi }}</td>
|
|
<td>{{ object.w2_polarity|default:''|yesnoi }}</td>
|
|
<td>{{ object.w3_polarity|default:''|yesnoi }}</td>
|
|
</tr>
|
|
<tr>
|
|
<th scope="row">{{ object|help_text:'w1_voltage'|safe}}</th>
|
|
<td>{{ object.w1_voltage }}</td>
|
|
<td>{{ object.w2_voltage|default:'' }}</td>
|
|
<td>{{ object.w3_voltage|default:'' }}</td>
|
|
</tr>
|
|
<tr>
|
|
<th scope="row">{{ object|help_text:'w1_earth_fault'|safe}}</th>
|
|
<td>{{ object.w1_earth_fault }}</td>
|
|
<td>{{ object.w2_earth_fault|default:'' }}</td>
|
|
<td>{{ object.w3_earth_fault|default:'' }}</td>
|
|
</tr>
|
|
</tbody>
|
|
</table>
|
|
<hr>
|
|
<dl class="row">
|
|
<dt class="col-10">{{ object|help_text:'all_rcds_tested'|safe }}</dt>
|
|
<dd class="col-2">
|
|
{{ object.all_rcds_tested|yesnoi }}
|
|
</dd>
|
|
<dt class="col-10">{{ object|help_text:'public_sockets_tested'|safe }}</dt>
|
|
<dd class="col-2">
|
|
{{ object.public_sockets_tested|yesnoi }}
|
|
</dd>
|
|
</dl>
|
|
<hr>
|
|
{% include 'partials/ec_power_info.html' %}
|
|
{% endif %}
|
|
</div>
|
|
</div>
|
|
<div class="col-12 text-right">
|
|
{% button 'print' 'pt_print' object.pk %}
|
|
{% button 'edit' url='pt_edit' pk=object.pk %}
|
|
{% button 'view' url='event_detail' pk=object.event.pk text="Event" %}
|
|
{% include 'partials/review_status.html' with perm=perms.RIGS.review_power review='pt_review' %}
|
|
</div>
|
|
<div class="col-12 text-right">
|
|
{% include 'partials/last_edited.html' with target="powertestrecord_history" %}
|
|
</div>
|
|
{% endblock %}
|