arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-10-08 05:25:34 +00:00
Code Issues Projects Releases Wiki Activity

Port to Django 5.2 (#635)

Browse Source 
* 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>
This commit is contained in:
FreneticScribbler
2026-10-02 00:43:41 +02:00
committed by GitHub
parent 4cd68f5a0f
commit 08171767a0
148 changed files with 6573 additions and 9514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

179
RIGS/forms.py
View File

@@ -1,4 +1,4 @@
from datetime import datetime, timedelta
from datetime import timedelta
import simplejson
from django import forms
@@ -6,15 +6,14 @@ from django.conf import settings
from django.core import serializers
from django.utils import timezone
from django.utils.html import format_html
from reversion import revisions as reversion
from RIGS import models
from training.models import TrainingLevel
# Override the django form defaults to use the HTML date/time/datetime UI elements
forms.DateField.widget = forms.DateInput(attrs={'type': 'date'})
forms.TimeField.widget = forms.TimeInput(attrs={'type': 'time'}, format='%H:%M')
forms.DateTimeField.widget = forms.DateTimeInput(attrs={'type': 'datetime-local'}, format='%Y-%m-%d %H:%M')
forms.DateField.widget = forms.DateInput(attrs={"type": "date"})
forms.TimeField.widget = forms.TimeInput(attrs={"type": "time"}, format="%H:%M")
forms.DateTimeField.widget = forms.DateTimeInput(attrs={"type": "datetime-local"}, format="%Y-%m-%d %H:%M")
# Events Shit
@@ -22,25 +21,29 @@ class EventForm(forms.ModelForm):
datetime_input_formats = list(settings.DATETIME_INPUT_FORMATS)
meet_at = forms.DateTimeField(input_formats=datetime_input_formats, required=False)
access_at = forms.DateTimeField(input_formats=datetime_input_formats, required=False)
parking_and_access = forms.BooleanField(label="Additional parking or access requirements (i.e. campus parking permits, wristbands)?", required=False)
parking_and_access = forms.BooleanField(
label="Additional parking or access requirements (i.e. campus parking permits, wristbands)?", required=False
)
items_json = forms.CharField()
items = {}
related_models = {
'person': models.Person,
'organisation': models.Organisation,
'venue': models.Venue,
'mic': models.Profile,
'checked_in_by': models.Profile,
"person": models.Person,
"organisation": models.Organisation,
"venue": models.Venue,
"mic": models.Profile,
"checked_in_by": models.Profile,
}
@property
def _get_items_json(self):
items = {}
if self.instance.pk is None:
return items
for item in self.instance.items.all():
data = serializers.serialize('json', [item])
data = serializers.serialize("json", [item])
struct = simplejson.loads(data)
items[item.pk] = simplejson.dumps(struct[0])
return simplejson.dumps(items)
@@ -48,23 +51,23 @@ class EventForm(forms.ModelForm):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
self.fields['items_json'].initial = self._get_items_json
self.fields['start_date'].widget.format = '%Y-%m-%d'
self.fields['end_date'].widget.format = '%Y-%m-%d'
self.fields["items_json"].initial = self._get_items_json
self.fields["start_date"].widget.format = "%Y-%m-%d"
self.fields["end_date"].widget.format = "%Y-%m-%d"
self.fields['access_at'].widget.format = '%Y-%m-%dT%H:%M:%S'
self.fields['meet_at'].widget.format = '%Y-%m-%dT%H:%M:%S'
self.fields["access_at"].widget.format = "%Y-%m-%dT%H:%M:%S"
self.fields["meet_at"].widget.format = "%Y-%m-%dT%H:%M:%S"
def init_items(self):
self.items = self.process_items_json()
return self.items
def process_items_json(self, event=None):
data = simplejson.loads(self.cleaned_data['items_json'])
data = simplejson.loads(self.cleaned_data["items_json"])
items = {}
for key in data:
pk = int(key)
items[pk] = self._get_or_initialise_item(pk, data[key]['fields'], event)
items[pk] = self._get_or_initialise_item(pk, data[key]["fields"], event)
return items
@@ -79,35 +82,45 @@ class EventForm(forms.ModelForm):
item = models.EventItem()
# Take the data from the form and update the item object
item.name = data['name']
item.description = data['description']
item.quantity = data['quantity']
item.cost = data['cost']
item.order = data['order']
item.name = data["name"]
item.description = data["description"]
item.quantity = data["quantity"]
item.cost = data["cost"]
item.order = data["order"]
if (event):
if event:
item.event = event
item.full_clean()
else:
item.full_clean('event')
item.full_clean("event")
return item
def clean(self):
if self.cleaned_data.get("is_rig") and not (
self.cleaned_data.get('person') or self.cleaned_data.get('organisation')):
self.cleaned_data.get("person") or self.cleaned_data.get("organisation")
):
raise forms.ValidationError(
'You haven\'t provided any client contact details. Please add a person or organisation.',
code='contact')
"You haven't provided any client contact details. Please add a person or organisation.", code="contact"
)
access = self.cleaned_data.get("access_at")
if 'warn-access' not in self.data and access is not None and access.date() < (self.cleaned_data.get("start_date") - timedelta(days=7)):
raise forms.ValidationError(format_html("Are you sure about that? Your access time seems a bit optimistic. If you're sure, save again. <input type='hidden' id='warn-access' name='warn-access' value='0'/>"), code='access_sanity')
if (
"warn-access" not in self.data
and access is not None
and access.date() < (self.cleaned_data.get("start_date") - timedelta(days=7))
):
raise forms.ValidationError(
format_html(
"Are you sure about that? Your access time seems a bit optimistic. If you're sure, save again. <input type='hidden' id='warn-access' name='warn-access' value='0'/>"
),
code="access_sanity",
)
return super().clean()
def save(self, commit=True):
m = super().save(commit=False)
if (commit):
if commit:
m.save()
cur_items = m.items.all()
items = self.process_items_json(m)
@@ -123,10 +136,29 @@ class EventForm(forms.ModelForm):
class Meta:
model = models.Event
fields = ['is_rig', 'name', 'venue', 'start_time', 'end_date', 'start_date',
'end_time', 'meet_at', 'access_at', 'description', 'notes', 'mic',
'person', 'organisation', 'dry_hire', 'checked_in_by', 'status',
'purchase_order', 'collector', 'forum_url', 'parking_and_access']
fields = [
"is_rig",
"name",
"venue",
"start_time",
"end_date",
"start_date",
"end_time",
"meet_at",
"access_at",
"description",
"notes",
"mic",
"person",
"organisation",
"dry_hire",
"checked_in_by",
"status",
"purchase_order",
"collector",
"forum_url",
"parking_and_access",
]
class BaseClientEventAuthorisationForm(forms.ModelForm):
@@ -134,8 +166,8 @@ class BaseClientEventAuthorisationForm(forms.ModelForm):
name = forms.CharField(label="Your Name")
def clean(self):
if self.cleaned_data.get('amount') != self.instance.event.total:
self.add_error('amount', 'The amount authorised must equal the total for the event (inc VAT).')
if self.cleaned_data.get("amount") != self.instance.event.total:
self.add_error("amount", "The amount authorised must equal the total for the event (inc VAT).")
return super().clean()
class Meta:
@@ -145,70 +177,81 @@ class BaseClientEventAuthorisationForm(forms.ModelForm):
class InternalClientEventAuthorisationForm(BaseClientEventAuthorisationForm):
def __init__(self, **kwargs):
super().__init__(**kwargs)
self.fields['uni_id'].required = True
self.fields['account_code'].required = True
self.fields["uni_id"].required = True
self.fields["account_code"].required = True
class Meta:
model = models.EventAuthorisation
fields = ('tos', 'name', 'amount', 'uni_id', 'account_code')
fields = ("tos", "name", "amount", "uni_id", "account_code")
class EventAuthorisationRequestForm(forms.Form):
email = forms.EmailField(required=True, label='Authoriser Email')
email = forms.EmailField(required=True, label="Authoriser Email")
class EventRiskAssessmentForm(forms.ModelForm):
related_models = {
'power_mic': models.Profile,
"power_mic": models.Profile,
}
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
for name, field in self.fields.items():
if str(name) == 'supervisor_consulted':
if str(name) == "supervisor_consulted":
field.widget = forms.CheckboxInput()
elif field.__class__ == forms.BooleanField:
field.widget = forms.RadioSelect(choices=[
(True, 'Yes'),
(False, 'No')
], attrs={'class': 'custom-control-input', 'required': 'true'})
field.widget = forms.RadioSelect(
choices=[(True, "Yes"), (False, "No")], attrs={"class": "custom-control-input", "required": "true"}
)
def clean(self):
if self.cleaned_data.get('big_power'):
if not self.cleaned_data.get('power_mic').level_qualifications.filter(level__department=TrainingLevel.POWER).exists():
self.add_error('power_mic', forms.ValidationError("Your Power MIC must be a Power Technician.", code="power_tech_required"))
if self.cleaned_data.get("big_power"):
power_mic = self.cleaned_data.get("power_mic")
if power_mic is None:
self.add_error(
"power_mic",
forms.ValidationError("A Power MIC is required for big power.", code="power_mic_required"),
)
elif not power_mic.level_qualifications.filter(level__department=TrainingLevel.POWER).exists():
self.add_error(
"power_mic",
forms.ValidationError("Your Power MIC must be a Power Technician.", code="power_tech_required"),
)
# Check expected values
unexpected_values = []
for field, value in models.RiskAssessment.expected_values.items():
if self.cleaned_data.get(field) != value:
unexpected_values.append(f"<li>{self._meta.model._meta.get_field(field).help_text}</li>")
if len(unexpected_values) > 0 and not self.cleaned_data.get('supervisor_consulted'):
raise forms.ValidationError(f"Your answers to these questions: <ul>{''.join([str(elem) for elem in unexpected_values])}</ul> require consulting with a supervisor.", code='unusual_answers')
if len(unexpected_values) > 0 and not self.cleaned_data.get("supervisor_consulted"):
raise forms.ValidationError(
f"Your answers to these questions: <ul>{''.join([str(elem) for elem in unexpected_values])}</ul> require consulting with a supervisor.",
code="unusual_answers",
)
return super().clean()
class Meta:
model = models.RiskAssessment
fields = '__all__'
exclude = ['reviewed_at', 'reviewed_by']
fields = "__all__"
exclude = ["reviewed_at", "reviewed_by"]
class EventChecklistForm(forms.ModelForm):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
self.fields['date'].widget.format = '%Y-%m-%d'
self.fields["date"].widget.format = "%Y-%m-%d"
for name, field in self.fields.items():
if field.__class__ == forms.NullBooleanField:
# Only display yes/no to user, the 'none' is only ever set in the background
field.widget = forms.CheckboxInput()
related_models = {
'venue': models.Venue,
"venue": models.Venue,
}
class Meta:
model = models.EventChecklist
fields = '__all__'
exclude = ['reviewed_at', 'reviewed_by']
fields = "__all__"
exclude = ["reviewed_at", "reviewed_by"]
class PowerTestRecordForm(forms.ModelForm):
@@ -220,29 +263,29 @@ class PowerTestRecordForm(forms.ModelForm):
field.widget = forms.CheckboxInput()
related_models = {
'venue': models.Venue,
'power_mic': models.Profile,
"venue": models.Venue,
"power_mic": models.Profile,
}
class Meta:
model = models.PowerTestRecord
fields = '__all__'
exclude = ['reviewed_at', 'reviewed_by']
fields = "__all__"
exclude = ["reviewed_at", "reviewed_by"]
class EventCheckInForm(forms.ModelForm):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
self.fields['time'].initial = timezone.now()
self.fields['role'].initial = "Crew"
self.fields["time"].initial = timezone.now()
self.fields["role"].initial = "Crew"
class Meta:
model = models.EventCheckIn
fields = '__all__'
exclude = ['end_time']
fields = "__all__"
exclude = ["end_time"]
class EditCheckInForm(forms.ModelForm):
class Meta:
model = models.EventCheckIn
fields = '__all__'
fields = "__all__"