mirror of
https://github.com/nottinghamtec/PyRIGS.git
synced 2026-10-10 14:52:53 +00:00
Port to Django 5.2 (#635)
* 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:
GitHub
@@ -16,7 +16,7 @@ from z3c.rml import rml2pdf
|
||||
|
||||
from RIGS import models
|
||||
|
||||
forms.DateField.widget = forms.DateInput(attrs={'type': 'date'})
|
||||
forms.DateField.widget = forms.DateInput(attrs={"type": "date"})
|
||||
|
||||
TIME_FILTERS = ["all", "year", "month", "week"]
|
||||
|
||||
@@ -27,53 +27,73 @@ def days_between(d1, d2):
|
||||
|
||||
|
||||
class InvoiceDashboard(generic.TemplateView):
|
||||
template_name = 'invoice_dashboard.html'
|
||||
template_name = "invoice_dashboard.html"
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
context = super().get_context_data(**kwargs)
|
||||
context['page_title'] = "Invoice Dashboard"
|
||||
context['description'] = "Overview of financial status of TEC rigs."
|
||||
context["page_title"] = "Invoice Dashboard"
|
||||
context["description"] = "Overview of financial status of TEC rigs."
|
||||
|
||||
time_filter = self.request.GET.get('time_filter', 'all')
|
||||
time_filter = self.request.GET.get("time_filter", "all")
|
||||
|
||||
if time_filter not in TIME_FILTERS:
|
||||
time_filter = 'all'
|
||||
time_filter = "all"
|
||||
|
||||
if time_filter == 'all':
|
||||
context['events'] = models.Event.objects.filter(is_rig=True)
|
||||
context['invoices'] = models.Invoice.objects.all()
|
||||
context['payments'] = models.Payment.objects.all()
|
||||
elif time_filter == 'year':
|
||||
context['events'] = models.Event.objects.filter(is_rig=True, start_date__gte=datetime.date.today() - datetime.timedelta(days=365))
|
||||
context['invoices'] = models.Invoice.objects.filter(invoice_date__gte=datetime.date.today() - datetime.timedelta(days=365))
|
||||
context['payments'] = models.Payment.objects.filter(date__gte=datetime.date.today() - datetime.timedelta(days=365))
|
||||
elif time_filter == 'month':
|
||||
context['events'] = models.Event.objects.filter(is_rig=True, start_date__gte=datetime.date.today() - datetime.timedelta(days=30))
|
||||
context['invoices'] = models.Invoice.objects.filter(invoice_date__gte=datetime.date.today() - datetime.timedelta(days=30))
|
||||
context['payments'] = models.Payment.objects.filter(date__gte=datetime.date.today() - datetime.timedelta(days=30))
|
||||
elif time_filter == 'week':
|
||||
context['events'] = models.Event.objects.filter(is_rig=True, start_date__gte=datetime.date.today() - datetime.timedelta(days=7))
|
||||
context['invoices'] = models.Invoice.objects.filter(invoice_date__gte=datetime.date.today() - datetime.timedelta(days=7))
|
||||
context['payments'] = models.Payment.objects.filter(date__gte=datetime.date.today() - datetime.timedelta(days=7))
|
||||
if time_filter == "all":
|
||||
context["events"] = models.Event.objects.filter(is_rig=True)
|
||||
context["invoices"] = models.Invoice.objects.all()
|
||||
context["payments"] = models.Payment.objects.all()
|
||||
elif time_filter == "year":
|
||||
context["events"] = models.Event.objects.filter(
|
||||
is_rig=True, start_date__gte=datetime.date.today() - datetime.timedelta(days=365)
|
||||
)
|
||||
context["invoices"] = models.Invoice.objects.filter(
|
||||
invoice_date__gte=datetime.date.today() - datetime.timedelta(days=365)
|
||||
)
|
||||
context["payments"] = models.Payment.objects.filter(
|
||||
date__gte=datetime.date.today() - datetime.timedelta(days=365)
|
||||
)
|
||||
elif time_filter == "month":
|
||||
context["events"] = models.Event.objects.filter(
|
||||
is_rig=True, start_date__gte=datetime.date.today() - datetime.timedelta(days=30)
|
||||
)
|
||||
context["invoices"] = models.Invoice.objects.filter(
|
||||
invoice_date__gte=datetime.date.today() - datetime.timedelta(days=30)
|
||||
)
|
||||
context["payments"] = models.Payment.objects.filter(
|
||||
date__gte=datetime.date.today() - datetime.timedelta(days=30)
|
||||
)
|
||||
elif time_filter == "week":
|
||||
context["events"] = models.Event.objects.filter(
|
||||
is_rig=True, start_date__gte=datetime.date.today() - datetime.timedelta(days=7)
|
||||
)
|
||||
context["invoices"] = models.Invoice.objects.filter(
|
||||
invoice_date__gte=datetime.date.today() - datetime.timedelta(days=7)
|
||||
)
|
||||
context["payments"] = models.Payment.objects.filter(
|
||||
date__gte=datetime.date.today() - datetime.timedelta(days=7)
|
||||
)
|
||||
|
||||
context["time_filter"] = time_filter
|
||||
|
||||
context['total_outstanding'] = sum([i.balance for i in models.Invoice.objects.outstanding_invoices()])
|
||||
context['total_waiting'] = sum([i.sum_total for i in models.Event.objects.waiting_invoices()])
|
||||
context['total_events'] = len(context['events'])
|
||||
context['total_invoices'] = len(context['invoices'])
|
||||
context['total_payments'] = len(context['payments'])
|
||||
context["total_outstanding"] = sum([i.balance for i in models.Invoice.objects.outstanding_invoices()])
|
||||
context["total_waiting"] = sum([i.sum_total for i in models.Event.objects.waiting_invoices()])
|
||||
context["total_events"] = len(context["events"])
|
||||
context["total_invoices"] = len(context["invoices"])
|
||||
context["total_payments"] = len(context["payments"])
|
||||
|
||||
payment_methods = dict(models.Payment.METHODS)
|
||||
|
||||
context['payment_methods'] = context["payments"].values('method').annotate(total=Sum('amount')).order_by('method')
|
||||
context["payment_methods"] = (
|
||||
context["payments"].values("method").annotate(total=Sum("amount")).order_by("method")
|
||||
)
|
||||
|
||||
for method in context['payment_methods']:
|
||||
method['method'] = payment_methods.get(method['method'], f"Unknown method ({method['method']})")
|
||||
for method in context["payment_methods"]:
|
||||
method["method"] = payment_methods.get(method["method"], f"Unknown method ({method['method']})")
|
||||
|
||||
context["total_income"] = sum([i['total'] for i in context['payment_methods']])
|
||||
context["total_income"] = sum([i["total"] for i in context["payment_methods"]])
|
||||
|
||||
payments = context['payments']
|
||||
payments = context["payments"]
|
||||
mean_duration = 0
|
||||
|
||||
for payment in payments:
|
||||
@@ -82,23 +102,25 @@ class InvoiceDashboard(generic.TemplateView):
|
||||
if len(payments) > 0:
|
||||
mean_duration /= len(payments)
|
||||
|
||||
context['mean_invoice_to_payment'] = mean_duration
|
||||
context["mean_invoice_to_payment"] = mean_duration
|
||||
|
||||
return context
|
||||
|
||||
|
||||
class InvoiceOutstanding(generic.ListView):
|
||||
model = models.Invoice
|
||||
template_name = 'invoice_list.html'
|
||||
template_name = "invoice_list.html"
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
context = super().get_context_data(**kwargs)
|
||||
total = 0
|
||||
for i in context['object_list']:
|
||||
for i in context["object_list"]:
|
||||
total += i.balance
|
||||
event_count = len(list(context['object_list']))
|
||||
context['page_title'] = f"Outstanding Invoices ({event_count} Events, £{total:.2f})"
|
||||
context['description'] = "Paperwork for these events has been sent to treasury, but the full balance has not yet appeared on a ledger"
|
||||
event_count = len(list(context["object_list"]))
|
||||
context["page_title"] = f"Outstanding Invoices ({event_count} Events, £{total:.2f})"
|
||||
context["description"] = (
|
||||
"Paperwork for these events has been sent to treasury, but the full balance has not yet appeared on a ledger"
|
||||
)
|
||||
return context
|
||||
|
||||
def get_queryset(self):
|
||||
@@ -107,18 +129,18 @@ class InvoiceOutstanding(generic.ListView):
|
||||
|
||||
class InvoiceDetail(generic.DetailView):
|
||||
model = models.Invoice
|
||||
template_name = 'invoice_detail.html'
|
||||
template_name = "invoice_detail.html"
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
context = super().get_context_data(**kwargs)
|
||||
invoice_date = self.object.invoice_date.strftime("%d/%m/%Y")
|
||||
context['page_title'] = f"Invoice {self.object.display_id} ({invoice_date})"
|
||||
context["page_title"] = f"Invoice {self.object.display_id} ({invoice_date})"
|
||||
if self.object.void:
|
||||
context['page_title'] += "<span class='badge badge-warning float-right'>VOID</span>"
|
||||
context["page_title"] += "<span class='badge badge-warning float-right'>VOID</span>"
|
||||
elif self.object.is_closed:
|
||||
context['page_title'] += "<span class='badge badge-success float-right'>PAID</span>"
|
||||
context["page_title"] += "<span class='badge badge-success float-right'>PAID</span>"
|
||||
else:
|
||||
context['page_title'] += "<span class='badge badge-info float-right'>OUTSTANDING</span>"
|
||||
context["page_title"] += "<span class='badge badge-info float-right'>OUTSTANDING</span>"
|
||||
return context
|
||||
|
||||
|
||||
@@ -126,17 +148,12 @@ class InvoicePrint(generic.View):
|
||||
def get(self, request, pk):
|
||||
invoice = get_object_or_404(models.Invoice, pk=pk)
|
||||
object = invoice.event
|
||||
template = get_template('event_print.xml')
|
||||
template = get_template("event_print.xml")
|
||||
|
||||
name = re.sub(r'[^a-zA-Z0-9 \n\.]', '', object.name)
|
||||
name = re.sub(r"[^a-zA-Z0-9 \n\.]", "", object.name)
|
||||
filename = f"Invoice {invoice.display_id} for {object.display_id} {name}.pdf"
|
||||
|
||||
context = {
|
||||
'object': object,
|
||||
'invoice': invoice,
|
||||
'current_user': request.user,
|
||||
'filename': filename
|
||||
}
|
||||
context = {"object": object, "invoice": invoice, "current_user": request.user, "filename": filename}
|
||||
|
||||
rml = template.render(context)
|
||||
|
||||
@@ -144,65 +161,65 @@ class InvoicePrint(generic.View):
|
||||
|
||||
pdfData = buffer.read()
|
||||
|
||||
response = HttpResponse(content_type='application/pdf')
|
||||
response['Content-Disposition'] = f'filename="{filename}"'
|
||||
response = HttpResponse(content_type="application/pdf")
|
||||
response["Content-Disposition"] = f'filename="{filename}"'
|
||||
response.write(pdfData)
|
||||
return response
|
||||
|
||||
|
||||
class InvoiceVoid(generic.View):
|
||||
def get(self, *args, **kwargs):
|
||||
pk = kwargs.get('pk')
|
||||
pk = kwargs.get("pk")
|
||||
object = get_object_or_404(models.Invoice, pk=pk)
|
||||
object.void = not object.void
|
||||
object.save()
|
||||
|
||||
if object.void:
|
||||
return HttpResponseRedirect(reverse('invoice_list'))
|
||||
return HttpResponseRedirect(reverse('invoice_detail', kwargs={'pk': object.pk}))
|
||||
return HttpResponseRedirect(reverse("invoice_list"))
|
||||
return HttpResponseRedirect(reverse("invoice_detail", kwargs={"pk": object.pk}))
|
||||
|
||||
|
||||
class InvoiceDelete(generic.DeleteView):
|
||||
model = models.Invoice
|
||||
template_name = 'invoice_confirm_delete.html'
|
||||
template_name = "invoice_confirm_delete.html"
|
||||
|
||||
def get(self, request, pk):
|
||||
obj = self.get_object()
|
||||
if obj.payment_set.all().count() > 0:
|
||||
messages.info(self.request, 'To delete an invoice, delete the payments first.')
|
||||
return HttpResponseRedirect(reverse('invoice_detail', kwargs={'pk': obj.pk}))
|
||||
messages.info(self.request, "To delete an invoice, delete the payments first.")
|
||||
return HttpResponseRedirect(reverse("invoice_detail", kwargs={"pk": obj.pk}))
|
||||
return super(InvoiceDelete, self).get(pk)
|
||||
|
||||
def post(self, request, pk):
|
||||
obj = self.get_object()
|
||||
if obj.payment_set.all().count() > 0:
|
||||
messages.info(self.request, 'To delete an invoice, delete the payments first.')
|
||||
return HttpResponseRedirect(reverse('invoice_detail', kwargs={'pk': obj.pk}))
|
||||
messages.info(self.request, "To delete an invoice, delete the payments first.")
|
||||
return HttpResponseRedirect(reverse("invoice_detail", kwargs={"pk": obj.pk}))
|
||||
return super(InvoiceDelete, self).post(pk)
|
||||
|
||||
def get_success_url(self):
|
||||
return self.request.POST.get('next')
|
||||
return self.request.POST.get("next")
|
||||
|
||||
|
||||
class InvoiceArchive(generic.ListView):
|
||||
model = models.Invoice
|
||||
template_name = 'invoice_list_archive.html'
|
||||
template_name = "invoice_list_archive.html"
|
||||
paginate_by = 25
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
context = super().get_context_data(**kwargs)
|
||||
context['page_title'] = "Invoice Archive"
|
||||
context['description'] = "This page displays all invoices: outstanding, paid, and void"
|
||||
context["page_title"] = "Invoice Archive"
|
||||
context["description"] = "This page displays all invoices: outstanding, paid, and void"
|
||||
return context
|
||||
|
||||
def get_queryset(self):
|
||||
return self.model.objects.search(self.request.GET.get('q')).order_by('-invoice_date')
|
||||
return self.model.objects.search(self.request.GET.get("q")).order_by("-invoice_date")
|
||||
|
||||
|
||||
class InvoiceWaiting(generic.ListView):
|
||||
model = models.Event
|
||||
paginate_by = 25
|
||||
template_name = 'invoice_list_waiting.html'
|
||||
template_name = "invoice_list_waiting.html"
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
context = super(InvoiceWaiting, self).get_context_data(**kwargs)
|
||||
@@ -210,7 +227,7 @@ class InvoiceWaiting(generic.ListView):
|
||||
objects = self.get_queryset()
|
||||
for obj in objects:
|
||||
total += obj.sum_total
|
||||
context['page_title'] = f"Events for Invoice ({len(objects)} Events, £{total:.2f})"
|
||||
context["page_title"] = f"Events for Invoice ({len(objects)} Events, £{total:.2f})"
|
||||
return context
|
||||
|
||||
def get_queryset(self):
|
||||
@@ -222,51 +239,51 @@ class InvoiceEvent(generic.View):
|
||||
@reversion.create_revision()
|
||||
def get(self, *args, **kwargs):
|
||||
reversion.set_user(self.request.user)
|
||||
epk = kwargs.get('pk')
|
||||
epk = kwargs.get("pk")
|
||||
event = models.Event.objects.get(pk=epk)
|
||||
invoice, created = models.Invoice.objects.get_or_create(event=event)
|
||||
|
||||
if created:
|
||||
invoice.invoice_date = datetime.date.today()
|
||||
messages.success(self.request, 'Invoice created successfully')
|
||||
messages.success(self.request, "Invoice created successfully")
|
||||
|
||||
if kwargs.get('void'):
|
||||
if kwargs.get("void"):
|
||||
invoice.void = not invoice.void
|
||||
invoice.save()
|
||||
messages.warning(self.request, 'Invoice voided')
|
||||
messages.warning(self.request, "Invoice voided")
|
||||
|
||||
return HttpResponseRedirect(reverse('invoice_detail', kwargs={'pk': invoice.pk}))
|
||||
return HttpResponseRedirect(reverse("invoice_detail", kwargs={"pk": invoice.pk}))
|
||||
|
||||
|
||||
class PaymentCreate(generic.CreateView):
|
||||
model = models.Payment
|
||||
fields = ['invoice', 'date', 'amount', 'method']
|
||||
template_name = 'payment_form.html'
|
||||
fields = ["invoice", "date", "amount", "method"]
|
||||
template_name = "payment_form.html"
|
||||
|
||||
def get_initial(self):
|
||||
initial = super().get_initial()
|
||||
invoicepk = self.request.GET.get('invoice', self.request.POST.get('invoice', None))
|
||||
invoicepk = self.request.GET.get("invoice", self.request.POST.get("invoice", None))
|
||||
if invoicepk is None:
|
||||
raise Http404()
|
||||
invoice = get_object_or_404(models.Invoice, pk=invoicepk)
|
||||
initial.update({'invoice': invoice})
|
||||
initial.update({"invoice": invoice})
|
||||
return initial
|
||||
|
||||
@transaction.atomic()
|
||||
@reversion.create_revision()
|
||||
def form_valid(self, form, *args, **kwargs):
|
||||
reversion.add_to_revision(form.cleaned_data['invoice'])
|
||||
reversion.add_to_revision(form.cleaned_data["invoice"])
|
||||
reversion.set_comment("Payment added")
|
||||
return super().form_valid(form, *args, **kwargs)
|
||||
|
||||
def get_success_url(self):
|
||||
messages.info(self.request, "location.reload()")
|
||||
return reverse('closemodal')
|
||||
return reverse("closemodal")
|
||||
|
||||
|
||||
class PaymentDelete(generic.DeleteView):
|
||||
model = models.Payment
|
||||
template_name = 'payment_confirm_delete.html'
|
||||
template_name = "payment_confirm_delete.html"
|
||||
|
||||
@transaction.atomic()
|
||||
@reversion.create_revision()
|
||||
@@ -276,4 +293,4 @@ class PaymentDelete(generic.DeleteView):
|
||||
return super().delete(*args, **kwargs)
|
||||
|
||||
def get_success_url(self):
|
||||
return self.request.POST.get('next')
|
||||
return self.request.POST.get("next")
|
||||
|
||||
Reference in New Issue
Block a user