From 5e60675115de763d768e13beee430dd1379c181d Mon Sep 17 00:00:00 2001 From: FreneticScribbler Date: Sun, 12 Apr 2020 19:28:17 +0100 Subject: [PATCH] Python Format/import opt --- PyRIGS/decorators.py | 11 +- PyRIGS/formats/en/formats.py | 2 - PyRIGS/settings.py | 10 +- PyRIGS/tests/pages.py | 6 +- PyRIGS/views.py | 2 +- PyRIGS/wsgi.py | 1 + RIGS/admin.py | 1 + RIGS/finance.py | 8 +- RIGS/forms.py | 8 +- RIGS/ical.py | 24 ++-- .../commands/generateSampleRIGSData.py | 121 ++++++++++++++---- RIGS/models.py | 27 ++-- RIGS/rigboard.py | 9 +- RIGS/templatetags/filters.py | 2 - RIGS/test_functional.py | 32 +++-- RIGS/test_models.py | 15 ++- RIGS/test_unit.py | 21 ++- RIGS/urls.py | 36 ++++-- RIGS/views.py | 11 +- users/forms.py | 3 +- users/views.py | 2 +- versioning/versioning.py | 16 ++- 22 files changed, 257 insertions(+), 111 deletions(-) diff --git a/PyRIGS/decorators.py b/PyRIGS/decorators.py index 3ad24ccb..a21f6c41 100644 --- a/PyRIGS/decorators.py +++ b/PyRIGS/decorators.py @@ -8,7 +8,8 @@ from RIGS import models def get_oembed(login_url, request, oembed_view, kwargs): context = {} - context['oembed_url'] = "{0}://{1}{2}".format(request.scheme, request.META['HTTP_HOST'], reverse(oembed_view, kwargs=kwargs)) + context['oembed_url'] = "{0}://{1}{2}".format(request.scheme, request.META['HTTP_HOST'], + reverse(oembed_view, kwargs=kwargs)) context['login_url'] = "{0}?{1}={2}".format(login_url, REDIRECT_FIELD_NAME, request.get_full_path()) resp = render(request, 'login_redirect.html', context=context) return resp @@ -28,9 +29,11 @@ def has_oembed(oembed_view, login_url=None): return get_oembed(login_url, request, oembed_view, kwargs) else: return HttpResponseRedirect('%s?%s=%s' % (login_url, REDIRECT_FIELD_NAME, request.get_full_path())) + _checklogin.__doc__ = view_func.__doc__ _checklogin.__dict__ = view_func.__dict__ return _checklogin + return _dec @@ -60,9 +63,11 @@ def user_passes_test_with_403(test_func, login_url=None, oembed_view=None): resp = render(request, '403.html') resp.status_code = 403 return resp + _checklogin.__doc__ = view_func.__doc__ _checklogin.__dict__ = view_func.__dict__ return _checklogin + return _dec @@ -80,6 +85,7 @@ def api_key_required(function): Failed users will be given a 403 error. Should only be used for urls which include and kwargs """ + def wrap(request, *args, **kwargs): userid = kwargs.get('api_pk') @@ -101,6 +107,7 @@ def api_key_required(function): if user_object.api_key != key: return error_resp return function(request, *args, **kwargs) + return wrap @@ -108,6 +115,7 @@ def nottinghamtec_address_required(function): """ Checks that the current user has an email address ending @nottinghamtec.co.uk """ + def wrap(request, *args, **kwargs): # Fail if current user's email address isn't @nottinghamtec.co.uk if not request.user.email.endswith('@nottinghamtec.co.uk'): @@ -115,4 +123,5 @@ def nottinghamtec_address_required(function): return error_resp return function(request, *args, **kwargs) + return wrap diff --git a/PyRIGS/formats/en/formats.py b/PyRIGS/formats/en/formats.py index 201335b9..0c2f21d6 100644 --- a/PyRIGS/formats/en/formats.py +++ b/PyRIGS/formats/en/formats.py @@ -1,5 +1,3 @@ - - DATETIME_FORMAT = ('d/m/Y H:i') DATE_FORMAT = ('d/m/Y') TIME_FORMAT = ('H:i') diff --git a/PyRIGS/settings.py b/PyRIGS/settings.py index da984d07..77e6c557 100644 --- a/PyRIGS/settings.py +++ b/PyRIGS/settings.py @@ -26,7 +26,6 @@ SECRET_KEY = os.environ.get('SECRET_KEY') if os.environ.get( # SECURITY WARNING: don't run with debug turned on in production! DEBUG = bool(int(os.environ.get('DEBUG'))) if os.environ.get('DEBUG') else True - STAGING = bool(int(os.environ.get('STAGING'))) if os.environ.get('STAGING') else False ALLOWED_HOSTS = ['pyrigs.nottinghamtec.co.uk', 'rigs.nottinghamtec.co.uk', 'pyrigs.herokuapp.com'] @@ -45,7 +44,8 @@ if not DEBUG: INTERNAL_IPS = ['127.0.0.1'] -ADMINS = [('Tom Price', 'tomtom5152@gmail.com'), ('IT Manager', 'it@nottinghamtec.co.uk'), ('Arona Jones', 'arona.jones@nottinghamtec.co.uk')] +ADMINS = [('Tom Price', 'tomtom5152@gmail.com'), ('IT Manager', 'it@nottinghamtec.co.uk'), + ('Arona Jones', 'arona.jones@nottinghamtec.co.uk')] if DEBUG: ADMINS.append(('Testing Superuser', 'superuser@example.com')) @@ -167,8 +167,10 @@ LOGOUT_URL = '/user/logout/' ACCOUNT_ACTIVATION_DAYS = 7 # reCAPTCHA settings -RECAPTCHA_PUBLIC_KEY = os.environ.get('RECAPTCHA_PUBLIC_KEY', "6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI") # If not set, use development key -RECAPTCHA_PRIVATE_KEY = os.environ.get('RECAPTCHA_PRIVATE_KEY', "6LeIxAcTAAAAAGG-vFI1TnRWxMZNFuojJ4WifJWe") # If not set, use development key +RECAPTCHA_PUBLIC_KEY = os.environ.get('RECAPTCHA_PUBLIC_KEY', + "6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI") # If not set, use development key +RECAPTCHA_PRIVATE_KEY = os.environ.get('RECAPTCHA_PRIVATE_KEY', + "6LeIxAcTAAAAAGG-vFI1TnRWxMZNFuojJ4WifJWe") # If not set, use development key NOCAPTCHA = True SILENCED_SYSTEM_CHECKS = ['captcha.recaptcha_test_key_error'] diff --git a/PyRIGS/tests/pages.py b/PyRIGS/tests/pages.py index 4bf34a6d..e4e6db16 100644 --- a/PyRIGS/tests/pages.py +++ b/PyRIGS/tests/pages.py @@ -31,8 +31,10 @@ class FormPage(BasePage): _errors_selector = (By.CLASS_NAME, "alert-danger") def remove_all_required(self): - self.driver.execute_script("Array.from(document.getElementsByTagName(\"input\")).forEach(function (el, ind, arr) { el.removeAttribute(\"required\")});") - self.driver.execute_script("Array.from(document.getElementsByTagName(\"select\")).forEach(function (el, ind, arr) { el.removeAttribute(\"required\")});") + self.driver.execute_script( + "Array.from(document.getElementsByTagName(\"input\")).forEach(function (el, ind, arr) { el.removeAttribute(\"required\")});") + self.driver.execute_script( + "Array.from(document.getElementsByTagName(\"select\")).forEach(function (el, ind, arr) { el.removeAttribute(\"required\")});") @property def errors(self): diff --git a/PyRIGS/views.py b/PyRIGS/views.py index 4b435dc7..0024f5ff 100644 --- a/PyRIGS/views.py +++ b/PyRIGS/views.py @@ -16,11 +16,11 @@ import operator from registration.views import RegistrationView from django.views.decorators.csrf import csrf_exempt - from RIGS import models, forms from assets import models as asset_models from functools import reduce + class SecureAPIRequest(generic.View): models = { 'venue': models.Venue, diff --git a/PyRIGS/wsgi.py b/PyRIGS/wsgi.py index aa4cc434..ff4fa810 100644 --- a/PyRIGS/wsgi.py +++ b/PyRIGS/wsgi.py @@ -7,6 +7,7 @@ For more information on this file, see https://docs.djangoproject.com/en/1.7/howto/deployment/wsgi/ """ import os + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "PyRIGS.settings") from django.core.wsgi import get_wsgi_application # noqa diff --git a/RIGS/admin.py b/RIGS/admin.py index f487eeb6..df7fb0e8 100644 --- a/RIGS/admin.py +++ b/RIGS/admin.py @@ -22,6 +22,7 @@ admin.site.register(models.EventItem, VersionAdmin) admin.site.register(models.Invoice) admin.site.register(models.Payment) + def approve_user(modeladmin, request, queryset): queryset.update(is_approved=True) diff --git a/RIGS/finance.py b/RIGS/finance.py index 2c458c82..477b2608 100644 --- a/RIGS/finance.py +++ b/RIGS/finance.py @@ -16,6 +16,7 @@ from django.db.models import Q from RIGS import models from django import forms + forms.DateField.widget = forms.DateInput(attrs={'type': 'date'}) @@ -81,7 +82,8 @@ class InvoicePrint(generic.View): escapedEventName = re.sub(r'[^a-zA-Z0-9 \n\.]', '', object.name) response = HttpResponse(content_type='application/pdf') - response['Content-Disposition'] = "filename=Invoice %05d - N%05d | %s.pdf" % (invoice.pk, invoice.event.pk, escapedEventName) + response['Content-Disposition'] = "filename=Invoice %05d - N%05d | %s.pdf" % ( + invoice.pk, invoice.event.pk, escapedEventName) response.write(pdfData) return response @@ -174,8 +176,8 @@ class InvoiceWaiting(generic.ListView): # @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(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) diff --git a/RIGS/forms.py b/RIGS/forms.py index 5f449c5f..07d59bb1 100644 --- a/RIGS/forms.py +++ b/RIGS/forms.py @@ -16,6 +16,7 @@ forms.DateField.widget = forms.DateInput(attrs={'type': 'date'}) forms.TimeField.widget = forms.TextInput(attrs={'type': 'time'}) forms.DateTimeField.widget = forms.DateTimeInput(attrs={'type': 'datetime-local'}) + # Events Shit class EventForm(forms.ModelForm): datetime_input_formats = formats.get_format_lazy("DATETIME_INPUT_FORMATS") + list(settings.DATETIME_INPUT_FORMATS) @@ -92,8 +93,11 @@ class EventForm(forms.ModelForm): 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')): - raise forms.ValidationError('You haven\'t provided any client contact details. Please add a person or organisation.', code='contact') + if self.cleaned_data.get("is_rig") and not ( + 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') return super(EventForm, self).clean() def save(self, commit=True): diff --git a/RIGS/ical.py b/RIGS/ical.py index 6317f1fb..bd3dfcba 100644 --- a/RIGS/ical.py +++ b/RIGS/ical.py @@ -40,8 +40,10 @@ class CalendarICS(ICalFeed): return params def description(self, params): - desc = "Calendar generated by RIGS system. This includes event types: " + ('Rig, ' if params['rig'] else '') + ('Non-rig, ' if params['non-rig'] else '') + ('Dry Hire ' if params['dry-hire'] else '') + '\n' - desc = desc + "Includes events with status: " + ('Cancelled, ' if params['cancelled'] else '') + ('Provisional, ' if params['provisional'] else '') + ('Confirmed/Booked, ' if params['confirmed'] else '') + desc = "Calendar generated by RIGS system. This includes event types: " + ('Rig, ' if params['rig'] else '') + ( + 'Non-rig, ' if params['non-rig'] else '') + ('Dry Hire ' if params['dry-hire'] else '') + '\n' + desc = desc + "Includes events with status: " + ('Cancelled, ' if params['cancelled'] else '') + ( + 'Provisional, ' if params['provisional'] else '') + ('Confirmed/Booked, ' if params['confirmed'] else '') return desc @@ -72,7 +74,8 @@ class CalendarICS(ICalFeed): filter = filter & typeFilters & statusFilters - return models.Event.objects.filter(filter).order_by('-start_date').select_related('person', 'organisation', 'venue', 'mic') + return models.Event.objects.filter(filter).order_by('-start_date').select_related('person', 'organisation', + 'venue', 'mic') def item_title(self, item): title = '' @@ -117,19 +120,24 @@ class CalendarICS(ICalFeed): desc += 'Event = ' + item.name + '\n' desc += 'Venue = ' + (item.venue.name if item.venue else '---') + '\n' if item.is_rig and item.person: - desc += 'Client = ' + item.person.name + ((' for ' + item.organisation.name) if item.organisation else '') + '\n' + desc += 'Client = ' + item.person.name + ( + (' for ' + item.organisation.name) if item.organisation else '') + '\n' desc += 'Status = ' + str(item.get_status_display()) + '\n' desc += 'MIC = ' + (item.mic.name if item.mic else '---') + '\n' desc += '\n' if item.meet_at: - desc += 'Crew Meet = ' + (item.meet_at.astimezone(tz).strftime('%Y-%m-%d %H:%M') if item.meet_at else '---') + '\n' + desc += 'Crew Meet = ' + ( + item.meet_at.astimezone(tz).strftime('%Y-%m-%d %H:%M') if item.meet_at else '---') + '\n' if item.access_at: - desc += 'Access At = ' + (item.access_at.astimezone(tz).strftime('%Y-%m-%d %H:%M') if item.access_at else '---') + '\n' + desc += 'Access At = ' + ( + item.access_at.astimezone(tz).strftime('%Y-%m-%d %H:%M') if item.access_at else '---') + '\n' if item.start_date: - desc += 'Event Start = ' + item.start_date.strftime('%Y-%m-%d') + ((' ' + item.start_time.strftime('%H:%M')) if item.has_start_time else '') + '\n' + desc += 'Event Start = ' + item.start_date.strftime('%Y-%m-%d') + ( + (' ' + item.start_time.strftime('%H:%M')) if item.has_start_time else '') + '\n' if item.end_date: - desc += 'Event End = ' + item.end_date.strftime('%Y-%m-%d') + ((' ' + item.end_time.strftime('%H:%M')) if item.has_end_time else '') + '\n' + desc += 'Event End = ' + item.end_date.strftime('%Y-%m-%d') + ( + (' ' + item.end_time.strftime('%H:%M')) if item.has_end_time else '') + '\n' desc += '\n' if item.description: diff --git a/RIGS/management/commands/generateSampleRIGSData.py b/RIGS/management/commands/generateSampleRIGSData.py index a46394c2..e5733238 100644 --- a/RIGS/management/commands/generateSampleRIGSData.py +++ b/RIGS/management/commands/generateSampleRIGSData.py @@ -27,7 +27,8 @@ class Command(BaseCommand): if not (settings.DEBUG or settings.STAGING): raise CommandError('You cannot run this command in production') - random.seed('Some object to seed the random number generator') # otherwise it is done by time, which could lead to inconsistant tests + random.seed( + 'Some object to seed the random number generator') # otherwise it is done by time, which could lead to inconsistant tests with transaction.atomic(): models.VatRate.objects.create(start_at='2014-03-05', rate=0.20, comment='test1') @@ -45,8 +46,18 @@ class Command(BaseCommand): self.setupUsefulProfiles() def setupPeople(self): - names = ["Regulus Black", "Sirius Black", "Lavender Brown", "Cho Chang", "Vincent Crabbe", "Vincent Crabbe", "Bartemius Crouch", "Fleur Delacour", "Cedric Diggory", "Alberforth Dumbledore", "Albus Dumbledore", "Dudley Dursley", "Petunia Dursley", "Vernon Dursley", "Argus Filch", "Seamus Finnigan", "Nicolas Flamel", "Cornelius Fudge", "Goyle", "Gregory Goyle", "Hermione Granger", "Rubeus Hagrid", "Igor Karkaroff", "Viktor Krum", "Bellatrix Lestrange", "Alice Longbottom", "Frank Longbottom", "Neville Longbottom", "Luna Lovegood", "Xenophilius Lovegood", # noqa - "Remus Lupin", "Draco Malfoy", "Lucius Malfoy", "Narcissa Malfoy", "Olympe Maxime", "Minerva McGonagall", "Mad-Eye Moody", "Peter Pettigrew", "Harry Potter", "James Potter", "Lily Potter", "Quirinus Quirrell", "Tom Riddle", "Mary Riddle", "Lord Voldemort", "Rita Skeeter", "Severus Snape", "Nymphadora Tonks", "Dolores Janes Umbridge", "Arthur Weasley", "Bill Weasley", "Charlie Weasley", "Fred Weasley", "George Weasley", "Ginny Weasley", "Molly Weasley", "Percy Weasley", "Ron Weasley", "Dobby", "Fluffy", "Hedwig", "Moaning Myrtle", "Aragog", "Grawp"] # noqa + names = ["Regulus Black", "Sirius Black", "Lavender Brown", "Cho Chang", "Vincent Crabbe", "Vincent Crabbe", + "Bartemius Crouch", "Fleur Delacour", "Cedric Diggory", "Alberforth Dumbledore", "Albus Dumbledore", + "Dudley Dursley", "Petunia Dursley", "Vernon Dursley", "Argus Filch", "Seamus Finnigan", + "Nicolas Flamel", "Cornelius Fudge", "Goyle", "Gregory Goyle", "Hermione Granger", "Rubeus Hagrid", + "Igor Karkaroff", "Viktor Krum", "Bellatrix Lestrange", "Alice Longbottom", "Frank Longbottom", + "Neville Longbottom", "Luna Lovegood", "Xenophilius Lovegood", # noqa + "Remus Lupin", "Draco Malfoy", "Lucius Malfoy", "Narcissa Malfoy", "Olympe Maxime", + "Minerva McGonagall", "Mad-Eye Moody", "Peter Pettigrew", "Harry Potter", "James Potter", + "Lily Potter", "Quirinus Quirrell", "Tom Riddle", "Mary Riddle", "Lord Voldemort", "Rita Skeeter", + "Severus Snape", "Nymphadora Tonks", "Dolores Janes Umbridge", "Arthur Weasley", "Bill Weasley", + "Charlie Weasley", "Fred Weasley", "George Weasley", "Ginny Weasley", "Molly Weasley", "Percy Weasley", + "Ron Weasley", "Dobby", "Fluffy", "Hedwig", "Moaning Myrtle", "Aragog", "Grawp"] # noqa for i, name in enumerate(names): with reversion.create_revision(): reversion.set_user(random.choice(self.profiles)) @@ -68,8 +79,32 @@ class Command(BaseCommand): self.people.append(newPerson) def setupOrganisations(self): - names = ["Acme, inc.", "Widget Corp", "123 Warehousing", "Demo Company", "Smith and Co.", "Foo Bars", "ABC Telecom", "Fake Brothers", "QWERTY Logistics", "Demo, inc.", "Sample Company", "Sample, inc", "Acme Corp", "Allied Biscuit", "Ankh-Sto Associates", "Extensive Enterprise", "Galaxy Corp", "Globo-Chem", "Mr. Sparkle", "Globex Corporation", "LexCorp", "LuthorCorp", "North Central Positronics", "Omni Consimer Products", "Praxis Corporation", "Sombra Corporation", "Sto Plains Holdings", "Tessier-Ashpool", "Wayne Enterprises", "Wentworth Industries", "ZiffCorp", "Bluth Company", "Strickland Propane", "Thatherton Fuels", "Three Waters", "Water and Power", "Western Gas & Electric", "Mammoth Pictures", "Mooby Corp", "Gringotts", "Thrift Bank", "Flowers By Irene", "The Legitimate Businessmens Club", "Osato Chemicals", "Transworld Consortium", "Universal Export", "United Fried Chicken", "Virtucon", "Kumatsu Motors", "Keedsler Motors", "Powell Motors", "Industrial Automation", "Sirius Cybernetics Corporation", "U.S. Robotics and Mechanical Men", "Colonial Movers", "Corellian Engineering Corporation", "Incom Corporation", "General Products", "Leeding Engines Ltd.", "Blammo", # noqa - "Input, Inc.", "Mainway Toys", "Videlectrix", "Zevo Toys", "Ajax", "Axis Chemical Co.", "Barrytron", "Carrys Candles", "Cogswell Cogs", "Spacely Sprockets", "General Forge and Foundry", "Duff Brewing Company", "Dunder Mifflin", "General Services Corporation", "Monarch Playing Card Co.", "Krustyco", "Initech", "Roboto Industries", "Primatech", "Sonky Rubber Goods", "St. Anky Beer", "Stay Puft Corporation", "Vandelay Industries", "Wernham Hogg", "Gadgetron", "Burleigh and Stronginthearm", "BLAND Corporation", "Nordyne Defense Dynamics", "Petrox Oil Company", "Roxxon", "McMahon and Tate", "Sixty Second Avenue", "Charles Townsend Agency", "Spade and Archer", "Megadodo Publications", "Rouster and Sideways", "C.H. Lavatory and Sons", "Globo Gym American Corp", "The New Firm", "SpringShield", "Compuglobalhypermeganet", "Data Systems", "Gizmonic Institute", "Initrode", "Taggart Transcontinental", "Atlantic Northern", "Niagular", "Plow King", "Big Kahuna Burger", "Big T Burgers and Fries", "Chez Quis", "Chotchkies", "The Frying Dutchman", "Klimpys", "The Krusty Krab", "Monks Diner", "Milliways", "Minuteman Cafe", "Taco Grande", "Tip Top Cafe", "Moes Tavern", "Central Perk", "Chasers"] # noqa + names = ["Acme, inc.", "Widget Corp", "123 Warehousing", "Demo Company", "Smith and Co.", "Foo Bars", + "ABC Telecom", "Fake Brothers", "QWERTY Logistics", "Demo, inc.", "Sample Company", "Sample, inc", + "Acme Corp", "Allied Biscuit", "Ankh-Sto Associates", "Extensive Enterprise", "Galaxy Corp", + "Globo-Chem", "Mr. Sparkle", "Globex Corporation", "LexCorp", "LuthorCorp", + "North Central Positronics", "Omni Consimer Products", "Praxis Corporation", "Sombra Corporation", + "Sto Plains Holdings", "Tessier-Ashpool", "Wayne Enterprises", "Wentworth Industries", "ZiffCorp", + "Bluth Company", "Strickland Propane", "Thatherton Fuels", "Three Waters", "Water and Power", + "Western Gas & Electric", "Mammoth Pictures", "Mooby Corp", "Gringotts", "Thrift Bank", + "Flowers By Irene", "The Legitimate Businessmens Club", "Osato Chemicals", "Transworld Consortium", + "Universal Export", "United Fried Chicken", "Virtucon", "Kumatsu Motors", "Keedsler Motors", + "Powell Motors", "Industrial Automation", "Sirius Cybernetics Corporation", + "U.S. Robotics and Mechanical Men", "Colonial Movers", "Corellian Engineering Corporation", + "Incom Corporation", "General Products", "Leeding Engines Ltd.", "Blammo", # noqa + "Input, Inc.", "Mainway Toys", "Videlectrix", "Zevo Toys", "Ajax", "Axis Chemical Co.", "Barrytron", + "Carrys Candles", "Cogswell Cogs", "Spacely Sprockets", "General Forge and Foundry", + "Duff Brewing Company", "Dunder Mifflin", "General Services Corporation", "Monarch Playing Card Co.", + "Krustyco", "Initech", "Roboto Industries", "Primatech", "Sonky Rubber Goods", "St. Anky Beer", + "Stay Puft Corporation", "Vandelay Industries", "Wernham Hogg", "Gadgetron", + "Burleigh and Stronginthearm", "BLAND Corporation", "Nordyne Defense Dynamics", "Petrox Oil Company", + "Roxxon", "McMahon and Tate", "Sixty Second Avenue", "Charles Townsend Agency", "Spade and Archer", + "Megadodo Publications", "Rouster and Sideways", "C.H. Lavatory and Sons", "Globo Gym American Corp", + "The New Firm", "SpringShield", "Compuglobalhypermeganet", "Data Systems", "Gizmonic Institute", + "Initrode", "Taggart Transcontinental", "Atlantic Northern", "Niagular", "Plow King", + "Big Kahuna Burger", "Big T Burgers and Fries", "Chez Quis", "Chotchkies", "The Frying Dutchman", + "Klimpys", "The Krusty Krab", "Monks Diner", "Milliways", "Minuteman Cafe", "Taco Grande", + "Tip Top Cafe", "Moes Tavern", "Central Perk", "Chasers"] # noqa for i, name in enumerate(names): with reversion.create_revision(): reversion.set_user(random.choice(self.profiles)) @@ -93,8 +128,18 @@ class Command(BaseCommand): self.organisations.append(newOrganisation) def setupVenues(self): - names = ["Bear Island", "Crossroads Inn", "Deepwood Motte", "The Dreadfort", "The Eyrie", "Greywater Watch", "The Iron Islands", "Karhold", "Moat Cailin", "Oldstones", "Raventree Hall", "Riverlands", "The Ruby Ford", "Saltpans", "Seagard", "Torrhen's Square", "The Trident", "The Twins", "The Vale of Arryn", "The Whispering Wood", "White Harbor", "Winterfell", "The Arbor", "Ashemark", "Brightwater Keep", "Casterly Rock", "Clegane's Keep", "Dragonstone", "Dorne", "God's Eye", "The Golden Tooth", # noqa - "Harrenhal", "Highgarden", "Horn Hill", "Fingers", "King's Landing", "Lannisport", "Oldtown", "Rainswood", "Storm's End", "Summerhall", "Sunspear", "Tarth", "Castle Black", "Craster's Keep", "Fist of the First Men", "The Frostfangs", "The Gift", "The Skirling Pass", "The Wall", "Asshai", "Astapor", "Braavos", "The Dothraki Sea", "Lys", "Meereen", "Myr", "Norvos", "Pentos", "Qarth", "Qohor", "The Red Waste", "Tyrosh", "Vaes Dothrak", "Valyria", "Village of the Lhazareen", "Volantis", "Yunkai"] # noqa + names = ["Bear Island", "Crossroads Inn", "Deepwood Motte", "The Dreadfort", "The Eyrie", "Greywater Watch", + "The Iron Islands", "Karhold", "Moat Cailin", "Oldstones", "Raventree Hall", "Riverlands", + "The Ruby Ford", "Saltpans", "Seagard", "Torrhen's Square", "The Trident", "The Twins", + "The Vale of Arryn", "The Whispering Wood", "White Harbor", "Winterfell", "The Arbor", "Ashemark", + "Brightwater Keep", "Casterly Rock", "Clegane's Keep", "Dragonstone", "Dorne", "God's Eye", + "The Golden Tooth", # noqa + "Harrenhal", "Highgarden", "Horn Hill", "Fingers", "King's Landing", "Lannisport", "Oldtown", + "Rainswood", "Storm's End", "Summerhall", "Sunspear", "Tarth", "Castle Black", "Craster's Keep", + "Fist of the First Men", "The Frostfangs", "The Gift", "The Skirling Pass", "The Wall", "Asshai", + "Astapor", "Braavos", "The Dothraki Sea", "Lys", "Meereen", "Myr", "Norvos", "Pentos", "Qarth", + "Qohor", "The Red Waste", "Tyrosh", "Vaes Dothrak", "Valyria", "Village of the Lhazareen", "Volantis", + "Yunkai"] # noqa for i, name in enumerate(names): with reversion.create_revision(): reversion.set_user(random.choice(self.profiles)) @@ -139,9 +184,11 @@ class Command(BaseCommand): self.finance_group.permissions.add(Permission.objects.get(codename=permId)) def setupGenericProfiles(self): - names = ["Clara Oswin Oswald", "Rory Williams", "Amy Pond", "River Song", "Martha Jones", "Donna Noble", "Jack Harkness", "Mickey Smith", "Rose Tyler"] + names = ["Clara Oswin Oswald", "Rory Williams", "Amy Pond", "River Song", "Martha Jones", "Donna Noble", + "Jack Harkness", "Mickey Smith", "Rose Tyler"] for i, name in enumerate(names): - newProfile = models.Profile.objects.create(username=name.replace(" ", ""), first_name=name.split(" ")[0], last_name=name.split(" ")[-1], + newProfile = models.Profile.objects.create(username=name.replace(" ", ""), first_name=name.split(" ")[0], + last_name=name.split(" ")[-1], email=name.replace(" ", "") + "@example.com", initials="".join([j[0].upper() for j in name.split()])) if i % 2 == 0: @@ -151,19 +198,23 @@ class Command(BaseCommand): self.profiles.append(newProfile) def setupUsefulProfiles(self): - superUser = models.Profile.objects.create(username="superuser", first_name="Super", last_name="User", initials="SU", - email="superuser@example.com", is_superuser=True, is_active=True, is_staff=True) + superUser = models.Profile.objects.create(username="superuser", first_name="Super", last_name="User", + initials="SU", + email="superuser@example.com", is_superuser=True, is_active=True, + is_staff=True) superUser.set_password('superuser') superUser.save() - financeUser = models.Profile.objects.create(username="finance", first_name="Finance", last_name="User", initials="FU", + financeUser = models.Profile.objects.create(username="finance", first_name="Finance", last_name="User", + initials="FU", email="financeuser@example.com", is_active=True) financeUser.groups.add(self.finance_group) financeUser.groups.add(self.keyholder_group) financeUser.set_password('finance') financeUser.save() - keyholderUser = models.Profile.objects.create(username="keyholder", first_name="Keyholder", last_name="User", initials="KU", + keyholderUser = models.Profile.objects.create(username="keyholder", first_name="Keyholder", last_name="User", + initials="KU", email="keyholderuser@example.com", is_active=True) keyholderUser.groups.add(self.keyholder_group) keyholderUser.set_password('keyholder') @@ -175,20 +226,32 @@ class Command(BaseCommand): basicUser.save() def setupEvents(self): - names = ["Outdoor Concert", "Hall Open Mic Night", "Festival", "Weekend Event", "Magic Show", "Society Ball", "Evening Show", "Talent Show", "Acoustic Evening", "Hire of Things", "SU Event", - "End of Term Show", "Theatre Show", "Outdoor Fun Day", "Summer Carnival", "Open Days", "Magic Show", "Awards Ceremony", "Debating Event", "Club Night", "DJ Evening", "Building Projection", "Choir Concert"] - descriptions = ["A brief description of the event", "This event is boring", "Probably wont happen", "Warning: this has lots of kit"] - notes = ["The client came into the office at some point", "Who knows if this will happen", "Probably should check this event", "Maybe not happening", "Run away!"] + names = ["Outdoor Concert", "Hall Open Mic Night", "Festival", "Weekend Event", "Magic Show", "Society Ball", + "Evening Show", "Talent Show", "Acoustic Evening", "Hire of Things", "SU Event", + "End of Term Show", "Theatre Show", "Outdoor Fun Day", "Summer Carnival", "Open Days", "Magic Show", + "Awards Ceremony", "Debating Event", "Club Night", "DJ Evening", "Building Projection", + "Choir Concert"] + descriptions = ["A brief description of the event", "This event is boring", "Probably wont happen", + "Warning: this has lots of kit"] + notes = ["The client came into the office at some point", "Who knows if this will happen", + "Probably should check this event", "Maybe not happening", "Run away!"] - itemOptions = [{'name': 'Speakers', 'description': 'Some really really big speakers \n these are very loud', 'quantity': 2, 'cost': 200.00}, - {'name': 'Projector', 'description': 'Some kind of video thinamejig, probably with unnecessary processing for free', 'quantity': 1, 'cost': 500.00}, - {'name': 'Lighting Desk', 'description': 'Cannot provide guarentee that it will work', 'quantity': 1, 'cost': 200.52}, - {'name': 'Moving lights', 'description': 'Flashy lights, with the copper', 'quantity': 8, 'cost': 50.00}, - {'name': 'Microphones', 'description': 'Make loud noise \n you will want speakers with this', 'quantity': 5, 'cost': 0.50}, - {'name': 'Sound Mixer Thing', 'description': 'Might be analogue, might be digital', 'quantity': 1, 'cost': 100.00}, - {'name': 'Electricity', 'description': 'You need this', 'quantity': 1, 'cost': 200.00}, - {'name': 'Crew', 'description': 'Costs nothing, because reasons', 'quantity': 1, 'cost': 0.00}, - {'name': 'Loyalty Discount', 'description': 'Have some negative moneys', 'quantity': 1, 'cost': -50.00}] + itemOptions = [ + {'name': 'Speakers', 'description': 'Some really really big speakers \n these are very loud', 'quantity': 2, + 'cost': 200.00}, + {'name': 'Projector', + 'description': 'Some kind of video thinamejig, probably with unnecessary processing for free', + 'quantity': 1, 'cost': 500.00}, + {'name': 'Lighting Desk', 'description': 'Cannot provide guarentee that it will work', 'quantity': 1, + 'cost': 200.52}, + {'name': 'Moving lights', 'description': 'Flashy lights, with the copper', 'quantity': 8, 'cost': 50.00}, + {'name': 'Microphones', 'description': 'Make loud noise \n you will want speakers with this', 'quantity': 5, + 'cost': 0.50}, + {'name': 'Sound Mixer Thing', 'description': 'Might be analogue, might be digital', 'quantity': 1, + 'cost': 100.00}, + {'name': 'Electricity', 'description': 'You need this', 'quantity': 1, 'cost': 200.00}, + {'name': 'Crew', 'description': 'Costs nothing, because reasons', 'quantity': 1, 'cost': 0.00}, + {'name': 'Loyalty Discount', 'description': 'Have some negative moneys', 'quantity': 1, 'cost': -50.00}] dayDelta = -120 # start adding events from 4 months ago @@ -226,7 +289,8 @@ class Command(BaseCommand): newEvent.venue = random.choice(self.venues) # Could have any status, equally weighted - newEvent.status = random.choice([models.Event.BOOKED, models.Event.CONFIRMED, models.Event.PROVISIONAL, models.Event.CANCELLED]) + newEvent.status = random.choice( + [models.Event.BOOKED, models.Event.CONFIRMED, models.Event.PROVISIONAL, models.Event.CANCELLED]) newEvent.dry_hire = (random.randint(0, 7) == 0) # 1 in 7 are dry hire @@ -257,4 +321,5 @@ class Command(BaseCommand): if newEvent.status is models.Event.CANCELLED: # void cancelled events newInvoice.void = True elif random.randint(0, 2) > 1: # 1 in 3 have been paid - models.Payment.objects.create(invoice=newInvoice, amount=newInvoice.balance, date=datetime.date.today()) + models.Payment.objects.create(invoice=newInvoice, amount=newInvoice.balance, + date=datetime.date.today()) diff --git a/RIGS/models.py b/RIGS/models.py index 54cffd88..a186ca80 100644 --- a/RIGS/models.py +++ b/RIGS/models.py @@ -25,7 +25,8 @@ class Profile(AbstractUser): phone = models.CharField(max_length=13, null=True, blank=True) api_key = models.CharField(max_length=40, blank=True, editable=False, null=True) is_approved = models.BooleanField(default=False) - last_emailed = models.DateTimeField(blank=True, null=True) # Currently only populated by the admin approval email. TODO: Populate it each time we send any email, might need that... + last_emailed = models.DateTimeField(blank=True, + null=True) # Currently only populated by the admin approval email. TODO: Populate it each time we send any email, might need that... @classmethod def make_api_key(cls): @@ -38,7 +39,8 @@ class Profile(AbstractUser): def profile_picture(self): url = "" if settings.USE_GRAVATAR or settings.USE_GRAVATAR is None: - url = "https://www.gravatar.com/avatar/" + hashlib.md5(self.email.encode('utf-8')).hexdigest() + "?d=wavatar&s=500" + url = "https://www.gravatar.com/avatar/" + hashlib.md5( + self.email.encode('utf-8')).hexdigest() + "?d=wavatar&s=500" return url @property @@ -225,12 +227,18 @@ class Venue(models.Model, RevisionMixin): class EventManager(models.Manager): def current_events(self): events = self.filter( - (models.Q(start_date__gte=timezone.now().date(), end_date__isnull=True, dry_hire=False) & ~models.Q(status=Event.CANCELLED)) | # Starts after with no end - (models.Q(end_date__gte=timezone.now().date(), dry_hire=False) & ~models.Q(status=Event.CANCELLED)) | # Ends after - (models.Q(dry_hire=True, start_date__gte=timezone.now().date()) & ~models.Q(status=Event.CANCELLED)) | # Active dry hire - (models.Q(dry_hire=True, checked_in_by__isnull=True) & (models.Q(status=Event.BOOKED) | models.Q(status=Event.CONFIRMED))) | # Active dry hire GT + (models.Q(start_date__gte=timezone.now().date(), end_date__isnull=True, dry_hire=False) & ~models.Q( + status=Event.CANCELLED)) | # Starts after with no end + (models.Q(end_date__gte=timezone.now().date(), dry_hire=False) & ~models.Q( + status=Event.CANCELLED)) | # Ends after + (models.Q(dry_hire=True, start_date__gte=timezone.now().date()) & ~models.Q( + status=Event.CANCELLED)) | # Active dry hire + (models.Q(dry_hire=True, checked_in_by__isnull=True) & ( + models.Q(status=Event.BOOKED) | models.Q(status=Event.CONFIRMED))) | # Active dry hire GT models.Q(status=Event.CANCELLED, start_date__gte=timezone.now().date()) # Canceled but not started - ).order_by('start_date', 'end_date', 'start_time', 'end_time', 'meet_at').select_related('person', 'organisation', 'venue', 'mic') + ).order_by('start_date', 'end_date', 'start_time', 'end_time', 'meet_at').select_related('person', + 'organisation', + 'venue', 'mic') return events def events_in_bounds(self, start, end): @@ -261,7 +269,7 @@ class EventManager(models.Manager): (models.Q(dry_hire=True, start_date__gte=timezone.now().date(), is_rig=True) & ~models.Q( status=Event.CANCELLED)) | # Active dry hire (models.Q(dry_hire=True, checked_in_by__isnull=True, is_rig=True) & ( - models.Q(status=Event.BOOKED) | models.Q(status=Event.CONFIRMED))) # Active dry hire GT + models.Q(status=Event.BOOKED) | models.Q(status=Event.CONFIRMED))) # Active dry hire GT ).count() return event_count @@ -302,7 +310,8 @@ class Event(models.Model, RevisionMixin): meet_info = models.CharField(max_length=255, blank=True, null=True) # Crew management - checked_in_by = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='event_checked_in', blank=True, null=True, on_delete=models.CASCADE) + checked_in_by = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='event_checked_in', blank=True, null=True, + on_delete=models.CASCADE) mic = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='event_mic', blank=True, null=True, verbose_name="MIC", on_delete=models.CASCADE) diff --git a/RIGS/rigboard.py b/RIGS/rigboard.py index 1b196423..764de702 100644 --- a/RIGS/rigboard.py +++ b/RIGS/rigboard.py @@ -95,7 +95,8 @@ class EventRA(generic.base.RedirectView): 'entry.708610078': f'N{event.pk:05}', 'entry.905899507': event.name, 'entry.139491562': event.venue.name if event.venue else '', - 'entry.1689826056': event.start_date.strftime('%Y-%m-%d') + ((' - ' + event.end_date.strftime('%Y-%m-%d')) if event.end_date else ''), + 'entry.1689826056': event.start_date.strftime('%Y-%m-%d') + ( + (' - ' + event.end_date.strftime('%Y-%m-%d')) if event.end_date else ''), 'entry.902421165': event.mic.name if event.mic else '' } return settings.RISK_ASSESSMENT_URL + "?" + urllib.parse.urlencode(params) @@ -149,10 +150,12 @@ class EventUpdate(generic.UpdateView): if not hasattr(context, 'duplicate'): # If this event has already been emailed to a client, show a warning if self.object.auth_request_at is not None: - messages.info(self.request, 'This event has already been sent to the client for authorisation, any changes you make will be visible to them immediately.') + messages.info(self.request, + 'This event has already been sent to the client for authorisation, any changes you make will be visible to them immediately.') if hasattr(self.object, 'authorised'): - messages.warning(self.request, 'This event has already been authorised by client, any changes to price will require reauthorisation.') + messages.warning(self.request, + 'This event has already been authorised by client, any changes to price will require reauthorisation.') return super(EventUpdate, self).render_to_response(context, **response_kwargs) def get_success_url(self): diff --git a/RIGS/templatetags/filters.py b/RIGS/templatetags/filters.py index 60b7117d..6912fc61 100644 --- a/RIGS/templatetags/filters.py +++ b/RIGS/templatetags/filters.py @@ -91,7 +91,6 @@ register.inclusion_tag('pagination.html', takes_context=True)(paginator) @register.simple_tag def url_replace(request, field, value): - dict_ = request.GET.copy() dict_[field] = value @@ -101,7 +100,6 @@ def url_replace(request, field, value): @register.simple_tag def orderby(request, field, attr): - dict_ = request.GET.copy() if dict_.__contains__(field) and dict_[field] == attr: diff --git a/RIGS/test_functional.py b/RIGS/test_functional.py index c40e9592..7cd04926 100644 --- a/RIGS/test_functional.py +++ b/RIGS/test_functional.py @@ -532,7 +532,8 @@ class EventTest(LiveServerTestCase): self.assertFalse(hasattr(newEvent, 'authorised')) self.assertNotIn("N%05d" % testEvent.pk, self.browser.find_element_by_xpath('//h1').text) - self.assertNotIn("Event data duplicated but not yet saved", self.browser.find_element_by_id('content').text) # Check info message not visible + self.assertNotIn("Event data duplicated but not yet saved", + self.browser.find_element_by_id('content').text) # Check info message not visible # Check the new items are visible table = self.browser.find_element_by_id('item-table') # ID number is known, see above @@ -546,7 +547,8 @@ class EventTest(LiveServerTestCase): # Check the PO hasn't carried through self.assertNotIn("TESTPO", infoPanel.find_element_by_xpath('//dt[text()="PO"]/following-sibling::dd[1]').text) - self.assertIn("N%05d" % testEvent.pk, infoPanel.find_element_by_xpath('//dt[text()="Based On"]/following-sibling::dd[1]').text) + self.assertIn("N%05d" % testEvent.pk, + infoPanel.find_element_by_xpath('//dt[text()="Based On"]/following-sibling::dd[1]').text) self.browser.get(self.live_server_url + '/event/' + str(testEvent.pk)) # Go back to the old event @@ -557,7 +559,8 @@ class EventTest(LiveServerTestCase): # Check the PO remains on the old event self.assertIn("TESTPO", infoPanel.find_element_by_xpath('//dt[text()="PO"]/following-sibling::dd[1]').text) - self.assertNotIn("N%05d" % testEvent.pk, infoPanel.find_element_by_xpath('//dt[text()="Based On"]/following-sibling::dd[1]').text) + self.assertNotIn("N%05d" % testEvent.pk, + infoPanel.find_element_by_xpath('//dt[text()="Based On"]/following-sibling::dd[1]').text) # Check the items are as they were table = self.browser.find_element_by_id('item-table') # ID number is known, see above @@ -587,7 +590,7 @@ class EventTest(LiveServerTestCase): # Set person person = models.Person.objects.create(name='Date Validation Person', email='datevalidation@functional.test') person_select = form.find_element_by_xpath( - '//button[@data-id="id_person"]') + '//button[@data-id="id_person"]') person_select.send_keys(person.name) person_dropped = form.find_element_by_xpath( '//ul[contains(@class, "dropdown-menu")]//span[contains(text(), "%s")]' % person.name) @@ -701,7 +704,7 @@ class EventTest(LiveServerTestCase): # Set person person = models.Person.objects.create(name='Rig Non-Rig Person', email='rignonrig@functional.test') person_select = form.find_element_by_xpath( - '//button[@data-id="id_person"]') + '//button[@data-id="id_person"]') person_select.send_keys(person.name) person_dropped = form.find_element_by_xpath( '//ul[contains(@class, "dropdown-menu")]//span[contains(text(), "%s")]' % person.name) @@ -768,8 +771,10 @@ class EventTest(LiveServerTestCase): organisationPanel = self.browser.find_element_by_xpath('//div[contains(text(), "Contact Details")]/..') def testEventEdit(self): - person = models.Person.objects.create(name="Event Edit Person", email="eventdetail@person.tests.rigs", phone="123 123") - organisation = models.Organisation.objects.create(name="Event Edit Organisation", email="eventdetail@organisation.tests.rigs", phone="123 456") + person = models.Person.objects.create(name="Event Edit Person", email="eventdetail@person.tests.rigs", + phone="123 123") + organisation = models.Organisation.objects.create(name="Event Edit Organisation", + email="eventdetail@organisation.tests.rigs", phone="123 456") venue = models.Venue.objects.create(name="Event Detail Venue") eventData = { @@ -979,8 +984,11 @@ class IcalTest(LiveServerTestCase): self.assertNotContains(response, "TE E" + str(test) + " ") # Check that times have been included correctly - self.assertContains(response, specialEvent.start_date.strftime('%Y%m%d') + 'T' + specialEvent.start_time.strftime('%H%M%S')) - self.assertContains(response, specialEvent.end_date.strftime('%Y%m%d') + 'T' + specialEvent.end_time.strftime('%H%M%S')) + self.assertContains(response, + specialEvent.start_date.strftime('%Y%m%d') + 'T' + specialEvent.start_time.strftime( + '%H%M%S')) + self.assertContains(response, + specialEvent.end_date.strftime('%Y%m%d') + 'T' + specialEvent.end_time.strftime('%H%M%S')) # Only dry hires self.browser.find_element_by_xpath("//input[@value='rig']").click() @@ -1242,7 +1250,8 @@ class SearchTest(LiveServerTestCase): os.environ['RECAPTCHA_TESTING'] = 'True' models.Event.objects.create(name="Right Event", status=models.Event.PROVISIONAL, - start_date=date.today(), description="This event is searched for endlessly over and over") + start_date=date.today(), + description="This event is searched for endlessly over and over") models.Event.objects.create(name="Wrong Event", status=models.Event.PROVISIONAL, start_date=date.today(), description="This one should never be found.") @@ -1266,6 +1275,7 @@ class SearchTest(LiveServerTestCase): search_box.send_keys('Right') search_box.send_keys(Keys.ENTER) - event_name = self.browser.find_element_by_xpath('//*[@id="content"]/div[1]/div[4]/div/div/table/tbody/tr[1]/td[3]/h4').text + event_name = self.browser.find_element_by_xpath( + '//*[@id="content"]/div[1]/div[4]/div/div/table/tbody/tr[1]/td[3]/h4').text self.assertIn('Right', event_name) self.assertNotIn('Wrong', event_name) diff --git a/RIGS/test_models.py b/RIGS/test_models.py index 1f97e9cd..5eb39de0 100644 --- a/RIGS/test_models.py +++ b/RIGS/test_models.py @@ -278,14 +278,17 @@ class EventTestCase(TestCase): # basic checks manager.create(name='TE IB2', start_date='2016-01-02', end_date='2016-01-04'), manager.create(name='TE IB3', start_date='2015-12-31', end_date='2016-01-03'), - manager.create(name='TE IB4', start_date='2016-01-04', access_at=self.create_datetime(2016, 0o1, 0o3, 00, 00)), - manager.create(name='TE IB5', start_date='2016-01-04', meet_at=self.create_datetime(2016, 0o1, 0o2, 00, 00)), + manager.create(name='TE IB4', start_date='2016-01-04', + access_at=self.create_datetime(2016, 0o1, 0o3, 00, 00)), + manager.create(name='TE IB5', start_date='2016-01-04', + meet_at=self.create_datetime(2016, 0o1, 0o2, 00, 00)), # negative check manager.create(name='TE IB6', start_date='2015-12-31', end_date='2016-01-01'), ] - in_bounds = manager.events_in_bounds(self.create_datetime(2016, 1, 2, 0, 0), self.create_datetime(2016, 1, 3, 0, 0)) + in_bounds = manager.events_in_bounds(self.create_datetime(2016, 1, 2, 0, 0), + self.create_datetime(2016, 1, 3, 0, 0)) self.assertIn(events[0], in_bounds) self.assertIn(events[1], in_bounds) self.assertIn(events[2], in_bounds) @@ -389,7 +392,8 @@ class EventAuthorisationTestCase(TestCase): def test_last_edited(self): with reversion.create_revision(): auth = models.EventAuthorisation.objects.create(event=self.event, email="authroisation@model.test.case", - name="Test Auth", amount=self.event.total, sent_by=self.profile) + name="Test Auth", amount=self.event.total, + sent_by=self.profile) self.assertIsNotNone(auth.last_edited_at) @@ -442,7 +446,8 @@ class RIGSVersionTestCase(TestCase): self.assertEqual(len(changes.field_changes), 1) def test_manager(self): - objs = versioning.RIGSVersion.objects.get_for_multiple_models([models.Event, models.Person, models.Organisation]) + objs = versioning.RIGSVersion.objects.get_for_multiple_models( + [models.Event, models.Person, models.Organisation]) self.assertEqual(len(objs), 4) def test_text_field_types(self): diff --git a/RIGS/test_unit.py b/RIGS/test_unit.py index 5d5d79cb..985accd4 100644 --- a/RIGS/test_unit.py +++ b/RIGS/test_unit.py @@ -164,7 +164,8 @@ class TestAdminMergeObjects(TestCase): class TestInvoiceDelete(TestCase): @classmethod def setUpTestData(cls): - cls.profile = models.Profile.objects.create(username="testuser1", email="1@test.com", is_superuser=True, is_active=True, is_staff=True) + cls.profile = models.Profile.objects.create(username="testuser1", email="1@test.com", is_superuser=True, + is_active=True, is_staff=True) cls.vatrate = models.VatRate.objects.create(start_at='2014-03-05', rate=0.20, comment='test1') @@ -179,7 +180,8 @@ class TestInvoiceDelete(TestCase): } cls.payments = { - 1: models.Payment.objects.create(invoice=cls.invoices[1], date=date.today(), amount=12.34, method=models.Payment.CASH) + 1: models.Payment.objects.create(invoice=cls.invoices[1], date=date.today(), amount=12.34, + method=models.Payment.CASH) } def setUp(self): @@ -221,12 +223,14 @@ class TestInvoiceDelete(TestCase): class TestPrintPaperwork(TestCase): @classmethod def setUpTestData(cls): - cls.profile = models.Profile.objects.create(username="testuser1", email="1@test.com", is_superuser=True, is_active=True, is_staff=True) + cls.profile = models.Profile.objects.create(username="testuser1", email="1@test.com", is_superuser=True, + is_active=True, is_staff=True) cls.vatrate = models.VatRate.objects.create(start_at='2014-03-05', rate=0.20, comment='test1') cls.events = { - 1: models.Event.objects.create(name="TE E1", start_date=date.today(), description="This is an event description\nthat for a very specific reason spans two lines."), + 1: models.Event.objects.create(name="TE E1", start_date=date.today(), + description="This is an event description\nthat for a very specific reason spans two lines."), } cls.invoices = { @@ -254,7 +258,8 @@ class TestPrintPaperwork(TestCase): class TestVersioningViews(TestCase): @classmethod def setUpTestData(cls): - cls.profile = models.Profile.objects.create(username="testuser1", email="1@test.com", is_superuser=True, is_active=True, is_staff=True) + cls.profile = models.Profile.objects.create(username="testuser1", email="1@test.com", is_superuser=True, + is_active=True, is_staff=True) cls.vatrate = models.VatRate.objects.create(start_at='2014-03-05', rate=0.20, comment='test1') @@ -332,7 +337,8 @@ class TestVersioningViews(TestCase): class TestEmbeddedViews(TestCase): @classmethod def setUpTestData(cls): - cls.profile = models.Profile.objects.create(username="testuser1", email="1@test.com", is_superuser=True, is_active=True, is_staff=True) + cls.profile = models.Profile.objects.create(username="testuser1", email="1@test.com", is_superuser=True, + is_active=True, is_staff=True) cls.events = { 1: models.Event.objects.create(name="TE E1", start_date=date.today()), @@ -345,7 +351,8 @@ class TestEmbeddedViews(TestCase): } cls.payments = { - 1: models.Payment.objects.create(invoice=cls.invoices[1], date=date.today(), amount=12.34, method=models.Payment.CASH) + 1: models.Payment.objects.create(invoice=cls.invoices[1], date=date.today(), amount=12.34, + method=models.Payment.CASH) } def setUp(self): diff --git a/RIGS/urls.py b/RIGS/urls.py index 10ade55b..3976ddca 100644 --- a/RIGS/urls.py +++ b/RIGS/urls.py @@ -21,7 +21,8 @@ urlpatterns = [ name='person_create'), path('people//', permission_required_with_403('RIGS.view_person')(views.PersonDetail.as_view()), name='person_detail'), - path('people//history/', permission_required_with_403('RIGS.view_person')(versioning.VersionHistory.as_view()), + path('people//history/', + permission_required_with_403('RIGS.view_person')(versioning.VersionHistory.as_view()), name='person_history', kwargs={'model': models.Person}), path('people//edit/', permission_required_with_403('RIGS.change_person')(views.PersonUpdate.as_view()), name='person_update'), @@ -29,13 +30,17 @@ urlpatterns = [ # Organisations path('organisations/', permission_required_with_403('RIGS.view_organisation')(views.OrganisationList.as_view()), name='organisation_list'), - path('organisations/add/', permission_required_with_403('RIGS.add_organisation')(views.OrganisationCreate.as_view()), + path('organisations/add/', + permission_required_with_403('RIGS.add_organisation')(views.OrganisationCreate.as_view()), name='organisation_create'), - path('organisations//', permission_required_with_403('RIGS.view_organisation')(views.OrganisationDetail.as_view()), + path('organisations//', + permission_required_with_403('RIGS.view_organisation')(views.OrganisationDetail.as_view()), name='organisation_detail'), - path('organisations//history/', permission_required_with_403('RIGS.view_organisation')(versioning.VersionHistory.as_view()), + path('organisations//history/', + permission_required_with_403('RIGS.view_organisation')(versioning.VersionHistory.as_view()), name='organisation_history', kwargs={'model': models.Organisation}), - path('organisations//edit/', permission_required_with_403('RIGS.change_organisation')(views.OrganisationUpdate.as_view()), + path('organisations//edit/', + permission_required_with_403('RIGS.change_organisation')(views.OrganisationUpdate.as_view()), name='organisation_update'), # Venues @@ -45,7 +50,8 @@ urlpatterns = [ name='venue_create'), path('venues//', permission_required_with_403('RIGS.view_venue')(views.VenueDetail.as_view()), name='venue_detail'), - path('venues//history/', permission_required_with_403('RIGS.view_venue')(versioning.VersionHistory.as_view()), + path('venues//history/', + permission_required_with_403('RIGS.view_venue')(versioning.VersionHistory.as_view()), name='venue_history', kwargs={'model': models.Venue}), path('venues//edit/', permission_required_with_403('RIGS.change_venue')(views.VenueUpdate.as_view()), name='venue_update'), @@ -71,7 +77,8 @@ urlpatterns = [ name='event_create'), path('event/archive/', login_required()(rigboard.EventArchive.as_view()), name='event_archive'), - path('event//embed/', xframe_options_exempt(login_required(login_url='/user/login/embed/')(rigboard.EventEmbed.as_view())), + path('event//embed/', + xframe_options_exempt(login_required(login_url='/user/login/embed/')(rigboard.EventEmbed.as_view())), name='event_embed'), path('event//oembed_json/', rigboard.EventOembed.as_view(), name='event_oembed'), @@ -83,7 +90,8 @@ urlpatterns = [ name='event_update'), path('event//duplicate/', permission_required_with_403('RIGS.add_event')(rigboard.EventDuplicate.as_view()), name='event_duplicate'), - path('event//history/', permission_required_with_403('RIGS.view_event')(versioning.VersionHistory.as_view()), + path('event//history/', + permission_required_with_403('RIGS.view_event')(versioning.VersionHistory.as_view()), name='event_history', kwargs={'model': models.Event}), # Finance @@ -103,9 +111,11 @@ urlpatterns = [ name='invoice_print'), path('invoice//void/', permission_required_with_403('RIGS.change_invoice')(finance.InvoiceVoid.as_view()), name='invoice_void'), - path('invoice//delete/', permission_required_with_403('RIGS.change_invoice')(finance.InvoiceDelete.as_view()), + path('invoice//delete/', + permission_required_with_403('RIGS.change_invoice')(finance.InvoiceDelete.as_view()), name='invoice_delete'), - path('invoice/(/history/', permission_required_with_403('RIGS.view_invoice')(versioning.VersionHistory.as_view()), + path('invoice/(/history/', + permission_required_with_403('RIGS.view_invoice')(versioning.VersionHistory.as_view()), name='invoice_history', kwargs={'model': models.Invoice}), path('payment/create/', permission_required_with_403('RIGS.add_payment')(finance.PaymentCreate.as_view()), @@ -114,9 +124,11 @@ urlpatterns = [ name='payment_delete'), # Client event authorisation - path('event//auth/', permission_required_with_403('RIGS.change_event')(rigboard.EventAuthorisationRequest.as_view()), + path('event//auth/', + permission_required_with_403('RIGS.change_event')(rigboard.EventAuthorisationRequest.as_view()), name='event_authorise_request'), - path('event//auth/preview/', permission_required_with_403('RIGS.change_event')(rigboard.EventAuthoriseRequestEmailPreview.as_view()), + path('event//auth/preview/', + permission_required_with_403('RIGS.change_event')(rigboard.EventAuthoriseRequestEmailPreview.as_view()), name='event_authorise_preview'), url(r'^event/(?P\d+)/(?P[-:\w]+)/$', rigboard.EventAuthorise.as_view(), name='event_authorise'), diff --git a/RIGS/views.py b/RIGS/views.py index 18f0c25b..fa4315ce 100644 --- a/RIGS/views.py +++ b/RIGS/views.py @@ -16,7 +16,6 @@ import operator from registration.views import RegistrationView from django.views.decorators.csrf import csrf_exempt - from RIGS import models, forms from assets import models as asset_models from functools import reduce @@ -38,6 +37,7 @@ class Index(generic.TemplateView): class SearchHelp(generic.TemplateView): template_name = 'search_help.html' + """ Called from a modal window (e.g. when an item is submitted to an event/invoice). May optionally also include some javascript in a success message to cause a load of @@ -60,7 +60,8 @@ class PersonList(generic.ListView): def get_queryset(self): q = self.request.GET.get('query', "") - filter = Q(name__icontains=q) | Q(email__icontains=q) | Q(address__icontains=q) | Q(notes__icontains=q) | Q(phone__startswith=q) | Q(phone__endswith=q) + filter = Q(name__icontains=q) | Q(email__icontains=q) | Q(address__icontains=q) | Q(notes__icontains=q) | Q( + phone__startswith=q) | Q(phone__endswith=q) # try and parse an int try: @@ -127,7 +128,8 @@ class OrganisationList(generic.ListView): def get_queryset(self): q = self.request.GET.get('query', "") - filter = Q(name__icontains=q) | Q(email__icontains=q) | Q(address__icontains=q) | Q(notes__icontains=q) | Q(phone__startswith=q) | Q(phone__endswith=q) + filter = Q(name__icontains=q) | Q(email__icontains=q) | Q(address__icontains=q) | Q(notes__icontains=q) | Q( + phone__startswith=q) | Q(phone__endswith=q) # try and parse an int try: @@ -194,7 +196,8 @@ class VenueList(generic.ListView): def get_queryset(self): q = self.request.GET.get('query', "") - filter = Q(name__icontains=q) | Q(email__icontains=q) | Q(address__icontains=q) | Q(notes__icontains=q) | Q(phone__startswith=q) | Q(phone__endswith=q) + filter = Q(name__icontains=q) | Q(email__icontains=q) | Q(address__icontains=q) | Q(notes__icontains=q) | Q( + phone__startswith=q) | Q(phone__endswith=q) # try and parse an int try: diff --git a/users/forms.py b/users/forms.py index 79b22be8..a89889cf 100644 --- a/users/forms.py +++ b/users/forms.py @@ -33,7 +33,8 @@ class CheckApprovedForm(AuthenticationForm): if user.is_approved or user.is_superuser: return AuthenticationForm.confirm_login_allowed(self, user) else: - raise forms.ValidationError("Your account hasn't been approved by an administrator yet. Please check back in a few minutes!") + raise forms.ValidationError( + "Your account hasn't been approved by an administrator yet. Please check back in a few minutes!") # Embedded Login form - remove the autofocus diff --git a/users/views.py b/users/views.py index 2be14a61..067ab594 100644 --- a/users/views.py +++ b/users/views.py @@ -16,11 +16,11 @@ import operator from registration.views import RegistrationView from django.views.decorators.csrf import csrf_exempt - from RIGS import models, forms from assets import models as asset_models from functools import reduce + # This view should be exempt from requiring CSRF token. # Then we can check for it and show a nice error # Don't worry, django.contrib.auth.views.login will diff --git a/versioning/versioning.py b/versioning/versioning.py index 41c5bc5d..a7d569e3 100644 --- a/versioning/versioning.py +++ b/versioning/versioning.py @@ -164,7 +164,8 @@ class RIGSVersionManager(VersionQuerySet): for model in model_array: content_types.append(ContentType.objects.get_for_model(model)) - return self.filter(content_type__in=content_types).select_related("revision").order_by("-revision__date_created") + return self.filter(content_type__in=content_types).select_related("revision").order_by( + "-revision__date_created") class RIGSVersion(Version): @@ -177,7 +178,8 @@ class RIGSVersion(Version): def parent(self): thisId = self.object_id - versions = RIGSVersion.objects.get_for_object_reference(self.content_type.model_class(), thisId).select_related("revision", "revision__user").all() + versions = RIGSVersion.objects.get_for_object_reference(self.content_type.model_class(), thisId).select_related( + "revision", "revision__user").all() try: previousVersion = versions.filter(revision_id__lt=self.revision_id).latest('revision__date_created') @@ -201,7 +203,9 @@ class VersionHistory(generic.ListView): paginate_by = 25 def get_queryset(self, **kwargs): - return RIGSVersion.objects.get_for_object(self.get_object()).select_related("revision", "revision__user").all().order_by("-revision__date_created") + return RIGSVersion.objects.get_for_object(self.get_object()).select_related("revision", + "revision__user").all().order_by( + "-revision__date_created") def get_object(self, **kwargs): return get_object_or_404(self.kwargs['model'], pk=self.kwargs['pk']) @@ -220,7 +224,8 @@ class ActivityTable(generic.ListView): paginate_by = 25 def get_queryset(self): - versions = RIGSVersion.objects.get_for_multiple_models([models.Event, models.Venue, models.Person, models.Organisation, models.EventAuthorisation]) + versions = RIGSVersion.objects.get_for_multiple_models( + [models.Event, models.Venue, models.Person, models.Organisation, models.EventAuthorisation]) return versions.order_by("-revision__date_created") def get_context_data(self, **kwargs): @@ -236,7 +241,8 @@ class ActivityFeed(generic.ListView): paginate_by = 25 def get_queryset(self): - versions = RIGSVersion.objects.get_for_multiple_models([models.Event, models.Venue, models.Person, models.Organisation, models.EventAuthorisation]) + versions = RIGSVersion.objects.get_for_multiple_models( + [models.Event, models.Venue, models.Person, models.Organisation, models.EventAuthorisation]) return versions.order_by("-revision__date_created") def get_context_data(self, **kwargs):