mirror of
https://github.com/nottinghamtec/PyRIGS.git
synced 2026-01-17 05:22:16 +00:00
* Start to seperate versioning into its own app * Start reworking invoice things * Reduced overall font size a touch * Improvements to generic lists * Tweak some colours to be a bit less OTT I need to work out if I can seperate background and primary colours like BS3 did * Improvements to event table mobile * First pass at mobile-ising the generic list * Item table fixes * Fixed fullcalendar print css not included * Asset list table improvements * Tweak asset list to be more in line with other lists * Versioning template improvements //TODO Rather than have seperate asset templates, convert 'id' into a template variable * Tweak versioning templates to allow ID overrides Asset specific templates begone. Still need to bring back the ID formatting for the Rigboard. * Asset form fixes * Use the right autocompleter.js... * Breakout (most) user stuff to separate module The model remains in RIGS for now, as it's pretty painful to move... * Python Format/import opt * Test Refactor Part 1 - Shuffle things around * Fix migrations TODO - need to ensure moved models are *moved* rather than deleted and recreated! * Start on new tests * Initial work on event create test reimpl * Init other tests, more rigs test faffery * Desaturate theme colors even more Much closer to BS3 * Fix event item adding Bit too heavy handed with the deduplication there Arona * Initial refactor of event item testing * Upgrade bootstrap-select * Updated bootstrap-select for BS4 * Initial port of duplicate testing Needs the latter half rewriting once we have an EventDetail POM * Refactor date validation test So close to killing test_functional.EventTest! * Deduplication of testing code * pep8 * Fix some tests And some things that were actually borked * FIX: Prevent setting access time after start time Cherry pick ofd274ea4606. Will close #405. * Refactor calendar tests * FIX: Don't show asset buttons/history for basic users * Really ought to get a pre-commit hook for pep8... * Fully replace test_functional * Dedupe generic search logic * Fix the remaining tests * Ensure submit button is scrolled to in tests * Fix asset creation test + actually verify its results * Make CI use latest (stable) chromedriver rather than some ancient one Since Travis uses the latest stable chrome, should always match. Bash oneliner \o/ * Of course | is part of YAML syntax, of course... Maybe this works. * Update python version Trying to get CI to match my local environment as much as possible... * Minor test futzing * Well that wasn't clever of me * That was even less clever of me * Revert to old submit wait behaviour * What about if I did this * Try disabling chrome cache * Added screenshot recording of test failures * Fixed RIGS tests not being run * Fixed Pep8 - I promise I'll make a pre-commit hook sometime! * Very initial work at togglable darktheme. Dammit @alexdaniel654 just when I had my scope creep kinda under control. It'll be v. nice to have though...! * More dark theme wangling * Fix some asset template things * FIX: CI Locale Issues * Fix sample command * Initial work at integrating the risk assessment #136. No clever database structure as yet... * FIX: Don't set every boolean input to radios * Different approach to RA linking * Move text definitions to somewhere more authoratitive * FIX: Undo breakage causing autopep8 o.O * Expand detail template * Use correct view for RA history * Initial work at coercing activity feed into showing RAs Also shows Asset/Supplier on the homepage feed. * Refactor activity feed template logic Yay for removing arbitrary if/else chains! * Initial work on caching activity feed Server side that is. Ref #162. * Start RA list template * Refactor RA creation stuff, again * Add H&S Details to Event Detail View * Display venue notes in event detail Notes are no use if nobody reads them. Not sure on this one. * Add ability to filter event archive by status Closes #168. * Fix lingering naive time * Use locmem cache in sqlite environments Otherwise the tests just lock up totally. Should close #162 * Update dependencies Mirrors/supersedes0e67da82e2* Add global ctrl/meta-enter shortcut for form submission Wants rewriting for better efficiency, but hey, it works! * Update dependencies * Fix for a situation that should be impossible * Fix navbar alignment * FEAT: Improve 'omni'search - Partialised template - Added to assets header - Added ability to search assets/suppliers - Improved selection logic - Have it display current query * Move closemodal into PyRIGS * Fix tests for search improvements * Dark mode colour improvements * Fix table colors for dry hires * further darktheme fixes * Remove the dark header from light theme * Fix reload loops when CSS/JS is changed * Move dark theme SCSS to separate file, fix inactive pagination styling * Genercise detail pages * Testing something re notes I wonder if I can make that global, rather than per-template... * Dark theme palette shenanigans I just can't decide * Match darktheme palette to forum darktheme palette Why reinvent the wheel. * Make supplier detail use the generic template * Disable mobile event table PoC for now * Remove the defaults from the RA fields + make them required * More RA fixes * Fixes to revisions for RAs * Add bootstrap 4 test page * Bunch of dark mode fixes from test page * Do not use Django 'required' for radio selects As this requires them to be True, whereas we just need to require that an option be entered. * Properly fixed popover darktheme * Fixed search for events * Style fixes to asset list * Start RA 'mark review' feature * Add reviewing to revision history, fix RA editing not working Also actually commit all the files, that helps * Fix Power MIC being lost on RA edit Why it is subtly different to the Event Update behaviour? Who knows * Invalidate RA review if it is edited after review * Start work on event checklist * Add a button for creating and instantly voiding invoices Handy dandy for when you have loads of cancelled events, like say, a pandemic * Mooooore status chips, mooore * Initial shenanigans on storing my overly fancy EC form * Proof of concept for JSON parsing/storage \o/ * Add new line functionality for vehicles/drivers Might it have been easier to create 'dummy' models like with EventItems? Probably... * Alter rig_count to not include un-checked-in dry hires * Insert a divider between still-out dry hires and actually upcoming events on rigboard * Initial work on new checklist handling. No more JSON! * Versioning module now does magic Automatic creation of views/urls for anything registered with reversion, with a small amount of hackage to preserve legacy stuff. (and the DAMNED asset IDs!) I would never get distracted... * Cleanup * Event checklist crew works Mostly - its not happy with timezones * Medium event power stuff done, barring worst case stuff * Misc fixes * Validation of power reqs * Worst case points on checklist * Templating improvements to RA/EC stuff * Do event table color logic at python level * Audit template fixes * Restrict versioning to one level of depth for speed Also fixed the template for nested changes * Event properties internal/authorised always return a explicit boolean rather than sometimes None * Use template filter for notes * Fix list templates TODO: Sensible place to define the 'expected answer' stuff. * Fix cable table template * Rethink rigboard color logic again Also revert some broken stuff * Test fixes * Modify auth test so it doesn't try and test for external authorisations Cause that's not a thing * Why does this work Bloody overzealous autoformatter... * Formatting... * Initial work on RA tests * Pages/start of tests for EventChecklists * Much better coverage of H&S things * Cleanup & Squash migrations * Fix wrong variable name in settings.py * Fix broken invoice list template * Add revision history to invoices/payments. Also patches previously introduced reversion permissions hole. Supersedes and closes #337. * Various misc fixes * Fix for my fix * Curse youuuuu pep8 * Invoice template improvements * Minor fixes * More tweaks * More fixes * Major improvements/fixes to authorisation templates * Add ability to mark event checklists as Large Event This just disables the checks to allow the rest of it to be filled out for large events, though I expect paper forms may still be used... * Remove database ID from generic list * Put power threshold values in a collapse * Use template filter for consistent removal of 'None links' Plus cleaner template markup! More HTML-in-Python tho, which always feels a bit CSS-in-JS * Tweak asset list markup * Begin to change add buttons success -> primary Also change search primary -> info to avoid clash * Begin to improve event checklist on mobile * Asset detail template improvements * Fix #326 (again) * Fix errors being squashed * Fix rigboard validation tests * Initial work on BS4 button templatetag Newfeatureitis strikes again * Allow multiple event checklists per event TODO: Status chip now needs rethinking * Minor event detail fixes * Fix tests * Rework button tag * Mobile fixes for search * Fix event checklist on mobile * Redo light theme palette * Switch rigboard new button to primary * Kill off excess whitespace on rigboard * Rigboard Timing display tweaks * Fix tests * Properly handle eventauthorisations in new versioning It's not great, not terrible... * Prevent creating duplicate revisions on event Potential fix for #322 - I couldn't reproduce even before this change... * Template improvements * Minor test fixes * Revert "Prevent creating duplicate revisions on event" Apparently it was too strong at preventing dupes... This reverts commitcce0ad0f9f. # Conflicts: # RIGS/models.py * Better approach to generic list templates + other deduplication * Also apply better approach to generic detail pages * One of these days I'll remember to test BEFORE pushing... * And now the same for generic forms * Display tick/cross rather than true/false in boolean version diffs * Upgrade dependencies * Fixes fixes fixes * Fix dependency hell Probably * Correct handling of spaces in paperwork filenames Also normalises display of Invoice IDs. Partial fix for #391. * Buggerit millennium hand and shrimp Knew I was gonna forget to fix the tests * FIX: Set duplicated event status to provisional Closes #398. Flip flop. Flip flop. * Update polyfill for datetime-local Bloody Firefox. We love to hate you. Proper CSS of the fill to come, SoonTM. Closes #391 * Curses! * Minor typo fixes * Initial pass at soop-consult confirmation screen for RAs * Fix migration * Make venue/date editable on EC For multi venue, multi day events Defaults to date and venue set on the event. Also made power MIC default to that set in RA * Clearer logic for RA inverted fields * (probably) fix tests * Give keyholders supplier edit perm * Generic list only displays edit button if user has perm * Same perm check for generic details * H&S Details takes up free space on non-internal events * Remove flash of content when loading new rig page * First pass at clearer display of asset list filters * Fix tests / default to headless tests (fingers crossed) * Fix autocompleter.js to properly disable edit links again * Move status color logic back to template Cause that somehow makes it work better?? * Display note icon on event detail page * Fix caching * Put rounded corners back where they belong * Remove lingering use of 'page-header' BS removed that style * More search and replace for BS changes Thought I'd got them all. Clearly not! * Remove enforced linebreak on status chips * Fix horizontal-ness on some forms * Remove animation on prefers-reduced-motion/low referesh rate devices Also normalises handling of asset list cable table & improves its use of space on large devices * Make version changes badges more readable * First pass at making the calendar less crap * Fix event table success logic Yay for copy paste fails >.> * Use borders rather than block colors for coloured tables under darktheme * First pass at porting calendar from FC V3 to V5 Two major versions and all they did was rename a bunch of names...TWICE. * Rework version name method to avoid blank names on eventchecklist vehicles/crew * Fix cable test * Made radio button focus much more obvious on dark theme * Implement Jerb's wording changes * Fix one test, break another... * Fix recent change stream list mutation issue * FIX: Do not naively cache event table Not that easy, it turns out. Duh. * FEAT: Implement #413 show associated assets on cable type detail pg Closes #413 * Allow H&S for non-events * Update emergency contact number * Improvements to profile detail page * Implement some of Jonny's suggested changes TODO: - Define event size at RA time, pass through to EC - Have later power questions be context dependent * Test fixes * Add space for power/rigging plans to be linked to RAs * Start move of event size logic to RA from Ec * Javascript required shenanigans for RA power * More moving of event size logic * Fixing tests for new logic etc * Why does this work Indeed, it may not * FIX: Stupid typo in versioning.py * Further minor fixes to versioning * Add icons to H&S menu items * Should fix calendar breaking in production * Small alignment fix in asset list * Squash migrations Co-authored-by: Matthew Smith <psyms13@nottingham.ac.uk>
265 lines
9.3 KiB
Python
265 lines
9.3 KiB
Python
import datetime
|
|
import re
|
|
|
|
from django.contrib import messages
|
|
from django.urls import reverse_lazy
|
|
from django.http import Http404, HttpResponseRedirect
|
|
from django.http import HttpResponse
|
|
from django.shortcuts import get_object_or_404
|
|
from django.template import RequestContext
|
|
from django.template.loader import get_template
|
|
from django.views import generic
|
|
from django.db.models import Q
|
|
from z3c.rml import rml2pdf
|
|
from django.db.models import Q
|
|
|
|
from django.db import transaction
|
|
import reversion
|
|
|
|
from RIGS import models
|
|
|
|
from django import forms
|
|
|
|
forms.DateField.widget = forms.DateInput(attrs={'type': 'date'})
|
|
|
|
|
|
class InvoiceIndex(generic.ListView):
|
|
model = models.Invoice
|
|
template_name = 'invoice_list.html'
|
|
|
|
def get_context_data(self, **kwargs):
|
|
context = super(InvoiceIndex, self).get_context_data(**kwargs)
|
|
total = 0
|
|
for i in context['object_list']:
|
|
total += i.balance
|
|
context['page_title'] = "Outstanding Invoices ({} Events, £{:.2f})".format(len(list(context['object_list'])), total)
|
|
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):
|
|
# Manual query is the only way I have found to do this efficiently. Not ideal but needs must
|
|
sql = "SELECT * FROM " \
|
|
"(SELECT " \
|
|
"(SELECT COUNT(p.amount) FROM \"RIGS_payment\" AS p WHERE p.invoice_id=\"RIGS_invoice\".id) AS \"payment_count\", " \
|
|
"(SELECT SUM(ei.cost * ei.quantity) FROM \"RIGS_eventitem\" AS ei WHERE ei.event_id=\"RIGS_invoice\".event_id) AS \"cost\", " \
|
|
"(SELECT SUM(p.amount) FROM \"RIGS_payment\" AS p WHERE p.invoice_id=\"RIGS_invoice\".id) AS \"payments\", " \
|
|
"\"RIGS_invoice\".\"id\", \"RIGS_invoice\".\"event_id\", \"RIGS_invoice\".\"invoice_date\", \"RIGS_invoice\".\"void\" FROM \"RIGS_invoice\") " \
|
|
"AS sub " \
|
|
"WHERE (((cost > 0.0) AND (payment_count=0)) OR (cost - payments) <> 0.0) AND void = '0'" \
|
|
"ORDER BY invoice_date"
|
|
|
|
query = self.model.objects.raw(sql)
|
|
|
|
return query
|
|
|
|
|
|
class InvoiceDetail(generic.DetailView):
|
|
model = models.Invoice
|
|
template_name = 'invoice_detail.html'
|
|
|
|
def get_context_data(self, **kwargs):
|
|
context = super(InvoiceDetail, self).get_context_data(**kwargs)
|
|
context['page_title'] = "Invoice {} ({})".format(self.object.display_id, self.object.invoice_date.strftime("%d/%m/%Y"))
|
|
return context
|
|
|
|
|
|
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')
|
|
|
|
context = {
|
|
'object': object,
|
|
'fonts': {
|
|
'opensans': {
|
|
'regular': 'RIGS/static/fonts/OPENSANS-REGULAR.TTF',
|
|
'bold': 'RIGS/static/fonts/OPENSANS-BOLD.TTF',
|
|
}
|
|
},
|
|
'invoice': invoice,
|
|
'current_user': request.user,
|
|
'filename': 'Invoice {} for {} {}.pdf'.format(invoice.display_id, object.display_id, re.sub(r'[^a-zA-Z0-9 \n\.]', '', object.name))
|
|
}
|
|
|
|
rml = template.render(context)
|
|
|
|
buffer = rml2pdf.parseString(rml)
|
|
|
|
pdfData = buffer.read()
|
|
|
|
response = HttpResponse(content_type='application/pdf')
|
|
response['Content-Disposition'] = 'filename="{}"'.format(context['filename'])
|
|
response.write(pdfData)
|
|
return response
|
|
|
|
|
|
class InvoiceVoid(generic.View):
|
|
def get(self, *args, **kwargs):
|
|
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_lazy('invoice_list'))
|
|
return HttpResponseRedirect(reverse_lazy('invoice_detail', kwargs={'pk': object.pk}))
|
|
|
|
|
|
class InvoiceDelete(generic.DeleteView):
|
|
model = models.Invoice
|
|
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_lazy('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_lazy('invoice_detail', kwargs={'pk': obj.pk}))
|
|
return super(InvoiceDelete, self).post(pk)
|
|
|
|
def get_success_url(self):
|
|
return self.request.POST.get('next')
|
|
|
|
|
|
class InvoiceArchive(generic.ListView):
|
|
model = models.Invoice
|
|
template_name = 'invoice_list_archive.html'
|
|
paginate_by = 25
|
|
|
|
def get_context_data(self, **kwargs):
|
|
context = super(InvoiceArchive, self).get_context_data(**kwargs)
|
|
context['page_title'] = "Invoice Archive"
|
|
context['description'] = "This page displays all invoices: outstanding, paid, and void"
|
|
return context
|
|
|
|
def get_queryset(self):
|
|
q = self.request.GET.get('q', "")
|
|
|
|
filter = Q(event__name__icontains=q)
|
|
|
|
# try and parse an int
|
|
try:
|
|
val = int(q)
|
|
filter = filter | Q(pk=val)
|
|
filter = filter | Q(event__pk=val)
|
|
except: # noqa
|
|
# not an integer
|
|
pass
|
|
|
|
try:
|
|
if q[0] == "N":
|
|
val = int(q[1:])
|
|
filter = Q(event__pk=val) # If string is Nxxxxx then filter by event number
|
|
elif q[0] == "#":
|
|
val = int(q[1:])
|
|
filter = Q(pk=val) # If string is #xxxxx then filter by invoice number
|
|
except: # noqa
|
|
pass
|
|
|
|
object_list = self.model.objects.filter(filter).order_by('-invoice_date')
|
|
|
|
return object_list
|
|
|
|
|
|
class InvoiceWaiting(generic.ListView):
|
|
model = models.Event
|
|
paginate_by = 25
|
|
template_name = 'invoice_list_waiting.html'
|
|
|
|
def get_context_data(self, **kwargs):
|
|
context = super(InvoiceWaiting, self).get_context_data(**kwargs)
|
|
total = 0
|
|
for obj in self.get_objects():
|
|
total += obj.sum_total
|
|
context['page_title'] = "Events for Invoice ({} Events, £{:.2f})".format(len(self.get_objects()), total)
|
|
return context
|
|
|
|
def get_queryset(self):
|
|
return self.get_objects()
|
|
|
|
def get_objects(self):
|
|
# @todo find a way to select items
|
|
events = self.model.objects.filter(
|
|
(
|
|
Q(start_date__lte=datetime.date.today(), end_date__isnull=True) | # Starts before with no end
|
|
Q(end_date__lte=datetime.date.today()) # Has end date, finishes before
|
|
) & Q(invoice__isnull=True) & # Has not already been invoiced
|
|
Q(is_rig=True) # Is a rig (not non-rig)
|
|
|
|
).order_by('start_date') \
|
|
.select_related('person',
|
|
'organisation',
|
|
'venue', 'mic') \
|
|
.prefetch_related('items')
|
|
|
|
return events
|
|
|
|
|
|
class InvoiceEvent(generic.View):
|
|
@transaction.atomic()
|
|
@reversion.create_revision()
|
|
def get(self, *args, **kwargs):
|
|
reversion.set_user(self.request.user)
|
|
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')
|
|
|
|
if kwargs.get('void'):
|
|
invoice.void = not invoice.void
|
|
invoice.save()
|
|
messages.warning(self.request, 'Invoice voided')
|
|
|
|
return HttpResponseRedirect(reverse_lazy('invoice_detail', kwargs={'pk': invoice.pk}))
|
|
|
|
|
|
class PaymentCreate(generic.CreateView):
|
|
model = models.Payment
|
|
fields = ['invoice', 'date', 'amount', 'method']
|
|
template_name = 'payment_form.html'
|
|
|
|
def get_initial(self):
|
|
initial = super(generic.CreateView, self).get_initial()
|
|
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})
|
|
return initial
|
|
|
|
@transaction.atomic()
|
|
@reversion.create_revision()
|
|
def form_valid(self, form, *args, **kwargs):
|
|
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_lazy('closemodal')
|
|
|
|
|
|
class PaymentDelete(generic.DeleteView):
|
|
model = models.Payment
|
|
template_name = 'payment_confirm_delete.html'
|
|
|
|
@transaction.atomic()
|
|
@reversion.create_revision()
|
|
def delete(self, *args, **kwargs):
|
|
reversion.add_to_revision(self.get_object().invoice)
|
|
reversion.set_comment("Payment removed")
|
|
return super().delete(*args, **kwargs)
|
|
|
|
def get_success_url(self):
|
|
return self.request.POST.get('next')
|