mirror of
https://github.com/nottinghamtec/PyRIGS.git
synced 2026-10-05 12:05:38 +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>
95 lines
4.3 KiB
HTML
95 lines
4.3 KiB
HTML
{% extends is_ajax|yesno:'base_ajax.html,base_assets.html' %}
|
|
{% load widget_tweaks %}
|
|
|
|
{% block content %}
|
|
<script>
|
|
function setAcquired(today) {
|
|
var date = new Date(1970, 0, 1);
|
|
if(today) {
|
|
date = new Date();
|
|
}
|
|
$('#id_date_acquired').val([date.getFullYear(), ('0' + (date.getMonth()+1)).slice(-2), ('0' + date.getDate()).slice(-2)].join('-'));
|
|
return false;
|
|
}
|
|
function setFieldValue(ID, CSA) {
|
|
$('#' + String(ID)).val(CSA);
|
|
return false;
|
|
}
|
|
function checkIfCableHidden() {
|
|
document.getElementById("cable-table").hidden = !document.getElementById("id_is_cable").checked;
|
|
}
|
|
checkIfCableHidden();
|
|
</script>
|
|
<form method="POST" id="asset_audit_form" action="{{ form.action|default:request.path }}">
|
|
{% include 'form_errors.html' %}
|
|
{% csrf_token %}
|
|
<input type="hidden" name="id" value="{{ object.id|default:0 }}" hidden=true>
|
|
<div class="form-group form-row">
|
|
{% include 'partials/form_field.html' with field=form.asset_id col="col-6" %}
|
|
</div>
|
|
<div class="form-group form-row">
|
|
{% include 'partials/form_field.html' with field=form.description col="col-6" %}
|
|
</div>
|
|
<div class="form-group form-row">
|
|
{% include 'partials/form_field.html' with field=form.category col="col-6" %}
|
|
</div>
|
|
<div class="form-group form-row">
|
|
{% include 'partials/form_field.html' with field=form.status col="col-6" %}
|
|
</div>
|
|
<div class="form-group form-row">
|
|
{% include 'partials/form_field.html' with field=form.serial_number col="col-6" %}
|
|
</div>
|
|
<div class="form-group form-row">
|
|
{% include 'partials/form_field.html' with field=form.date_acquired col="col-6" %}
|
|
<div class="col-sm-2">
|
|
<button class="btn btn-info" onclick="return setAcquired(true);" tabindex="-1">Today</button>
|
|
<button class="btn btn-warning" onclick="return setAcquired(false);" tabindex="-1">Unknown</button>
|
|
</div>
|
|
</div>
|
|
<div class="form-group form-row">
|
|
{% include 'partials/form_field.html' with field=form.date_sold col="col-6" %}
|
|
</div>
|
|
<div class="form-group form-row">
|
|
{% include 'partials/form_field.html' with field=form.replacement_cost col="col-6" prepend="£" %}
|
|
</div>
|
|
<hr>
|
|
<div class="form-group form-row">
|
|
<label for="{{ form.is_cable.id_for_label }}" class="col-2">Cable?</label>
|
|
<div class="col-6">
|
|
{% render_field form.is_cable|attr:'onchange=checkIfCableHidden()' %}
|
|
</div>
|
|
</div>
|
|
<div id="cable-table">
|
|
<div class="form-group form-row">
|
|
{% include 'partials/form_field.html' with field=form.cable_type col="col-6" %}
|
|
</div>
|
|
<div class="form-group form-row">
|
|
{% include 'partials/form_field.html' with field=form.length append=form.length.help_text col="col-6" %}
|
|
<div class="col-4">
|
|
<button class="btn btn-danger" onclick="return setFieldValue('{{ form.length.id_for_label }}','5');" tabindex="-1" type="button">5{{ form.length.help_text }}</button>
|
|
<button class="btn btn-success" onclick="return setFieldValue('{{ form.length.id_for_label }}','10');" tabindex="-1" type="button">10{{ form.length.help_text }}</button>
|
|
<button class="btn btn-info" onclick="return setFieldValue('{{ form.length.id_for_label }}','20');" tabindex="-1" type="button">20{{ form.length.help_text }}</button>
|
|
</div>
|
|
</div>
|
|
<div class="form-group form-row">
|
|
{% include 'partials/form_field.html' with field=form.csa append=form.csa.help_text title='CSA' col="col-6" %}
|
|
<div class="col-4">
|
|
<button class="btn btn-secondary" onclick="return setFieldValue('{{ form.csa.id_for_label }}', '1.5');" tabindex="-1" type="button">1.5{{ form.csa.help_text }}</button>
|
|
<button class="btn btn-secondary" onclick="return setFieldValue('{{ form.csa.id_for_label }}', '2.5');" tabindex="-1" type="button">2.5{{ form.csa.help_text }}</button>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
{% if not is_ajax %}
|
|
<div class="form-group form-row pull-right">
|
|
<button class="btn btn-success" type="submit" form="asset_audit_form" id="id_mark_audited">Mark Audited</button>
|
|
</div>
|
|
{% endif %}
|
|
</form>
|
|
{% endblock %}
|
|
|
|
{% block footer %}
|
|
<div class="form-group form-row">
|
|
<button class="btn btn-success pull-right" type="submit" form="asset_audit_form" onclick="onAuditClick({{form.asset_id.value}});" id="id_mark_audited">Mark Audited</button>
|
|
</div>
|
|
{% endblock %}
|