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>
100 lines
5.2 KiB
HTML
100 lines
5.2 KiB
HTML
{% extends 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/selects.css' %}"/>
|
|
{% endblock %}
|
|
|
|
{% block preload_js %}
|
|
{{ block.super }}
|
|
<script src="{% static 'js/selects.js' %}"></script>
|
|
<script src="{% static 'js/interaction.js' %}"></script>
|
|
{% endblock %}
|
|
|
|
{% block js %}
|
|
{{ block.super }}
|
|
<script src="{% static 'js/autocompleter.js' %}"></script>
|
|
{% endblock %}
|
|
|
|
{% block content %}
|
|
<div class="col-12">
|
|
{% include 'form_errors.html' %}
|
|
|
|
<form role="form" method="POST" action="{% if edit %}{% url 'ec_edit' pk=object.pk %}{% else %}{% 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="selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='venue' %}">
|
|
{% if venue %}
|
|
<option value="{{venue.pk}}" selected="selected">{{ venue.name }}</option>
|
|
{% endif %}
|
|
</select>
|
|
</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 mt-3">
|
|
<div class="col-sm-12 text-right">
|
|
{% button 'submit' %}
|
|
</div>
|
|
</div>
|
|
</form>
|
|
</div>
|
|
{% endblock %}
|