arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-03-03 10:38:23 +00:00
Code Issues Projects Releases Wiki Activity

PEP8 all the things

Browse Source
This commit is contained in:
David Taylor
2017-09-22 14:57:14 +01:00
parent 131ff3e612
commit f9389e3996
19 changed files with 409 additions and 378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PyRIGS/formats/en/formats.py
View File

@@ -2,4 +2,4 @@
DATETIME_FORMAT = ('d/m/Y H:i') DATETIME_FORMAT = ('d/m/Y H:i')
DATE_FORMAT = ('d/m/Y') DATE_FORMAT = ('d/m/Y')
TIME_FORMAT = ('H:i') TIME_FORMAT = ('H:i')

7
PyRIGS/settings.py
View File

@@ -10,6 +10,7 @@ https://docs.djangoproject.com/en/1.7/ref/settings/
# Build paths inside the project like this: os.path.join(BASE_DIR, ...) # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
import os import os
import raven
BASE_DIR = os.path.dirname(os.path.dirname(__file__)) BASE_DIR = os.path.dirname(os.path.dirname(__file__))
@@ -37,7 +38,7 @@ if DEBUG:
SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https') SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
if not DEBUG: if not DEBUG:
SECURE_SSL_REDIRECT = True # Redirect all http requests to https SECURE_SSL_REDIRECT = True # Redirect all http requests to https
INTERNAL_IPS = ['127.0.0.1'] INTERNAL_IPS = ['127.0.0.1']
@@ -96,7 +97,7 @@ if not DEBUG:
DATABASES['default'] = dj_database_url.config() DATABASES['default'] = dj_database_url.config()
# Logging # Logging
LOGGING = { LOGGING = {
'version': 1, 'version': 1,
'disable_existing_loggers': False, 'disable_existing_loggers': False,
@@ -144,8 +145,6 @@ LOGGING = {
} }
} }
import raven
RAVEN_CONFIG = { RAVEN_CONFIG = {
'dsn': os.environ.get('RAVEN_DSN'), 'dsn': os.environ.get('RAVEN_DSN'),
# If you are using git, you can also automatically configure the # If you are using git, you can also automatically configure the

4
PyRIGS/wsgi.py
View File

@@ -9,7 +9,7 @@ https://docs.djangoproject.com/en/1.7/howto/deployment/wsgi/
import os import os
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "PyRIGS.settings") os.environ.setdefault("DJANGO_SETTINGS_MODULE", "PyRIGS.settings")
from django.core.wsgi import get_wsgi_application from django.core.wsgi import get_wsgi_application # noqa
from dj_static import Cling from dj_static import Cling # noqa
application = Cling(get_wsgi_application()) application = Cling(get_wsgi_application())

14
RIGS/finance.py
View File

@@ -95,6 +95,7 @@ class InvoiceVoid(generic.View):
return HttpResponseRedirect(reverse_lazy('invoice_list')) return HttpResponseRedirect(reverse_lazy('invoice_list'))
return HttpResponseRedirect(reverse_lazy('invoice_detail', kwargs={'pk': object.pk})) return HttpResponseRedirect(reverse_lazy('invoice_detail', kwargs={'pk': object.pk}))
class InvoiceDelete(generic.DeleteView): class InvoiceDelete(generic.DeleteView):
model = models.Invoice model = models.Invoice
@@ -115,6 +116,7 @@ class InvoiceDelete(generic.DeleteView):
def get_success_url(self): def get_success_url(self):
return self.request.POST.get('next') return self.request.POST.get('next')
class InvoiceArchive(generic.ListView): class InvoiceArchive(generic.ListView):
model = models.Invoice model = models.Invoice
template_name = 'RIGS/invoice_list_archive.html' template_name = 'RIGS/invoice_list_archive.html'
@@ -143,11 +145,11 @@ class InvoiceWaiting(generic.ListView):
events = self.model.objects.filter( events = self.model.objects.filter(
( (
Q(start_date__lte=datetime.date.today(), end_date__isnull=True) | # Starts before with no end 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(end_date__lte=datetime.date.today()) # Has end date, finishes before
) & Q(invoice__isnull=True) # Has not already been invoiced ) & Q(invoice__isnull=True) & # Has not already been invoiced
& Q(is_rig=True) # Is a rig (not non-rig) Q(is_rig=True) # Is a rig (not non-rig)
).order_by('start_date') \ ).order_by('start_date') \
.select_related('person', .select_related('person',
'organisation', 'organisation',
'venue', 'mic') \ 'venue', 'mic') \
@@ -176,7 +178,7 @@ class PaymentCreate(generic.CreateView):
def get_initial(self): def get_initial(self):
initial = super(generic.CreateView, self).get_initial() initial = super(generic.CreateView, self).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 == None: if invoicepk is None:
raise Http404() raise Http404()
invoice = get_object_or_404(models.Invoice, pk=invoicepk) invoice = get_object_or_404(models.Invoice, pk=invoicepk)
initial.update({'invoice': invoice}) initial.update({'invoice': invoice})

3
RIGS/forms.py
View File

@@ -1,4 +1,3 @@
__author__ = 'Ghost'
from django import forms from django import forms
from django.utils import formats from django.utils import formats
from django.conf import settings from django.conf import settings
@@ -16,6 +15,8 @@ forms.TimeField.widget = forms.TextInput(attrs={'type': 'time'})
forms.DateTimeField.widget = forms.DateTimeInput(attrs={'type': 'datetime-local'}) forms.DateTimeField.widget = forms.DateTimeInput(attrs={'type': 'datetime-local'})
# Registration # Registration
class ProfileRegistrationFormUniqueEmail(RegistrationFormUniqueEmail): class ProfileRegistrationFormUniqueEmail(RegistrationFormUniqueEmail):
captcha = ReCaptchaField() captcha = ReCaptchaField()

63
RIGS/ical.py
View File

@@ -5,13 +5,15 @@ from django.core.urlresolvers import reverse_lazy, reverse, NoReverseMatch
from django.utils import timezone from django.utils import timezone
from django.conf import settings from django.conf import settings
import datetime, pytz import datetime
import pytz
class CalendarICS(ICalFeed): class CalendarICS(ICalFeed):
""" """
A simple event calender A simple event calender
""" """
#Metadata which is passed on to clients # Metadata which is passed on to clients
product_id = 'RIGS' product_id = 'RIGS'
title = 'RIGS Calendar' title = 'RIGS Calendar'
timezone = settings.TIME_ZONE timezone = settings.TIME_ZONE
@@ -27,39 +29,39 @@ class CalendarICS(ICalFeed):
def get_object(self, request, *args, **kwargs): def get_object(self, request, *args, **kwargs):
params = {} params = {}
params['dry-hire'] = request.GET.get('dry-hire','true') == 'true' params['dry-hire'] = request.GET.get('dry-hire', 'true') == 'true'
params['non-rig'] = request.GET.get('non-rig','true') == 'true' params['non-rig'] = request.GET.get('non-rig', 'true') == 'true'
params['rig'] = request.GET.get('rig','true') == 'true' params['rig'] = request.GET.get('rig', 'true') == 'true'
params['cancelled'] = request.GET.get('cancelled','false') == 'true' params['cancelled'] = request.GET.get('cancelled', 'false') == 'true'
params['provisional'] = request.GET.get('provisional','true') == 'true' params['provisional'] = request.GET.get('provisional', 'true') == 'true'
params['confirmed'] = request.GET.get('confirmed','true') == 'true' params['confirmed'] = request.GET.get('confirmed', 'true') == 'true'
return params return params
def description(self,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 = "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 = desc + "Includes events with status: " + ('Cancelled, ' if params['cancelled'] else '') + ('Provisional, ' if params['provisional'] else '') + ('Confirmed/Booked, ' if params['confirmed'] else '')
return desc return desc
def items(self, params): def items(self, params):
#include events from up to 1 year ago # include events from up to 1 year ago
start = datetime.datetime.now() - datetime.timedelta(days=365) start = datetime.datetime.now() - datetime.timedelta(days=365)
filter = Q(start_date__gte=start) filter = Q(start_date__gte=start)
typeFilters = Q(pk=None) #Need something that is false for every entry typeFilters = Q(pk=None) # Need something that is false for every entry
if params['dry-hire']: if params['dry-hire']:
typeFilters = typeFilters | Q(dry_hire=True, is_rig=True) typeFilters = typeFilters | Q(dry_hire=True, is_rig=True)
if params['non-rig']: if params['non-rig']:
typeFilters = typeFilters | Q(is_rig=False) typeFilters = typeFilters | Q(is_rig=False)
if params['rig']: if params['rig']:
typeFilters = typeFilters | Q(is_rig=True, dry_hire=False) typeFilters = typeFilters | Q(is_rig=True, dry_hire=False)
statusFilters = Q(pk=None) #Need something that is false for every entry statusFilters = Q(pk=None) # Need something that is false for every entry
if params['cancelled']: if params['cancelled']:
statusFilters = statusFilters | Q(status=models.Event.CANCELLED) statusFilters = statusFilters | Q(status=models.Event.CANCELLED)
@@ -87,9 +89,9 @@ class CalendarICS(ICalFeed):
# Add the rig name # Add the rig name
title += item.name title += item.name
# Add the status # Add the status
title += ' ('+str(item.get_status_display())+')' title += ' (' + str(item.get_status_display()) + ')'
return title return title
@@ -97,12 +99,12 @@ class CalendarICS(ICalFeed):
return item.earliest_time return item.earliest_time
def item_end_datetime(self, item): def item_end_datetime(self, item):
if type(item.latest_time) is datetime.date: # Ical end_datetime is non-inclusive, so add a day if isinstance(item.latest_time, datetime.date): # Ical end_datetime is non-inclusive, so add a day
return item.latest_time + datetime.timedelta(days=1) return item.latest_time + datetime.timedelta(days=1)
return item.latest_time return item.latest_time
def item_location(self,item): def item_location(self, item):
return item.venue return item.venue
def item_description(self, item): def item_description(self, item):
@@ -111,34 +113,33 @@ class CalendarICS(ICalFeed):
tz = pytz.timezone(self.timezone) tz = pytz.timezone(self.timezone)
desc = 'Rig ID = '+str(item.pk)+'\n' desc = 'Rig ID = ' + str(item.pk) + '\n'
desc += 'Event = ' + item.name + '\n' desc += 'Event = ' + item.name + '\n'
desc += 'Venue = ' + (item.venue.name if item.venue else '---') + '\n' desc += 'Venue = ' + (item.venue.name if item.venue else '---') + '\n'
if item.is_rig and item.person: 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 += 'Status = ' + str(item.get_status_display()) + '\n'
desc += 'MIC = ' + (item.mic.name if item.mic else '---') + '\n' desc += 'MIC = ' + (item.mic.name if item.mic else '---') + '\n'
desc += '\n' desc += '\n'
if item.meet_at: 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: 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: 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: 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' desc += '\n'
if item.description: if item.description:
desc += 'Event Description:\n'+item.description+'\n\n' desc += 'Event Description:\n' + item.description + '\n\n'
# if item.notes: // Need to add proper keyholder checks before this gets put back # if item.notes: // Need to add proper keyholder checks before this gets put back
# desc += 'Notes:\n'+item.notes+'\n\n' # desc += 'Notes:\n'+item.notes+'\n\n'
base_url = "http://rigs.nottinghamtec.co.uk" base_url = "http://rigs.nottinghamtec.co.uk"
desc += 'URL = '+base_url+str(item.get_absolute_url()) desc += 'URL = ' + base_url + str(item.get_absolute_url())
return desc return desc
def item_link(self, item): def item_link(self, item):
@@ -149,8 +150,8 @@ class CalendarICS(ICalFeed):
# def item_created(self, item): #TODO - Implement created date-time (using django-reversion?) - not really necessary though # def item_created(self, item): #TODO - Implement created date-time (using django-reversion?) - not really necessary though
# return '' # return ''
def item_updated(self, item): # some ical clients will display this def item_updated(self, item): # some ical clients will display this
return item.last_edited_at return item.last_edited_at
def item_guid(self, item): # use the rig-id as the ical unique event identifier def item_guid(self, item): # use the rig-id as the ical unique event identifier
return item.pk return item.pk

126
RIGS/management/commands/generateSampleData.py
View File

@@ -7,6 +7,8 @@ import datetime
import random import random
from RIGS import models from RIGS import models
class Command(BaseCommand): class Command(BaseCommand):
help = 'Adds sample data to use for testing' help = 'Adds sample data to use for testing'
can_import_settings = True can_import_settings = True
@@ -19,32 +21,32 @@ class Command(BaseCommand):
keyholder_group = None keyholder_group = None
finance_group = None finance_group = None
def handle(self, *args, **options): def handle(self, *args, **options):
from django.conf import settings from django.conf import settings
if not (settings.DEBUG or settings.STAGING): if not (settings.DEBUG or settings.STAGING):
raise CommandError('You cannot run this command in production') 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(): with transaction.atomic():
models.VatRate.objects.create(start_at='2014-03-05',rate=0.20,comment='test1') models.VatRate.objects.create(start_at='2014-03-05', rate=0.20, comment='test1')
self.setupGenericProfiles() self.setupGenericProfiles()
self.setupPeople() self.setupPeople()
self.setupOrganisations() self.setupOrganisations()
self.setupVenues() self.setupVenues()
self.setupGroups() self.setupGroups()
self.setupEvents() self.setupEvents()
self.setupUsefulProfiles() self.setupUsefulProfiles()
def setupPeople(self): 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","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"] 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): for i, name in enumerate(names):
with reversion.create_revision(): with reversion.create_revision():
reversion.set_user(random.choice(self.profiles)) reversion.set_user(random.choice(self.profiles))
@@ -66,7 +68,8 @@ class Command(BaseCommand):
self.people.append(newPerson) self.people.append(newPerson)
def setupOrganisations(self): 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","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"] 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): for i, name in enumerate(names):
with reversion.create_revision(): with reversion.create_revision():
reversion.set_user(random.choice(self.profiles)) reversion.set_user(random.choice(self.profiles))
@@ -90,7 +93,8 @@ class Command(BaseCommand):
self.organisations.append(newOrganisation) self.organisations.append(newOrganisation)
def setupVenues(self): 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","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"] 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): for i, name in enumerate(names):
with reversion.create_revision(): with reversion.create_revision():
reversion.set_user(random.choice(self.profiles)) reversion.set_user(random.choice(self.profiles))
@@ -117,8 +121,8 @@ class Command(BaseCommand):
self.keyholder_group = Group.objects.create(name='Keyholders') self.keyholder_group = Group.objects.create(name='Keyholders')
self.finance_group = Group.objects.create(name='Finance') self.finance_group = Group.objects.create(name='Finance')
keyholderPerms = ["add_event","change_event","view_event","add_eventitem","change_eventitem","delete_eventitem","add_organisation","change_organisation","view_organisation","add_person","change_person","view_person","view_profile","add_venue","change_venue","view_venue"] keyholderPerms = ["add_event", "change_event", "view_event", "add_eventitem", "change_eventitem", "delete_eventitem", "add_organisation", "change_organisation", "view_organisation", "add_person", "change_person", "view_person", "view_profile", "add_venue", "change_venue", "view_venue"]
financePerms = ["change_event","view_event","add_eventitem","change_eventitem","add_invoice","change_invoice","view_invoice","add_organisation","change_organisation","view_organisation","add_payment","change_payment","delete_payment","add_person","change_person","view_person"] financePerms = ["change_event", "view_event", "add_eventitem", "change_eventitem", "add_invoice", "change_invoice", "view_invoice", "add_organisation", "change_organisation", "view_organisation", "add_payment", "change_payment", "delete_payment", "add_person", "change_person", "view_person"]
for permId in keyholderPerms: for permId in keyholderPerms:
self.keyholder_group.permissions.add(Permission.objects.get(codename=permId)) self.keyholder_group.permissions.add(Permission.objects.get(codename=permId))
@@ -127,11 +131,11 @@ class Command(BaseCommand):
self.finance_group.permissions.add(Permission.objects.get(codename=permId)) self.finance_group.permissions.add(Permission.objects.get(codename=permId))
def setupGenericProfiles(self): 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): 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", email=name.replace(" ", "") + "@example.com",
initials="".join([ j[0].upper() for j in name.split() ])) initials="".join([j[0].upper() for j in name.split()]))
if i % 2 == 0: if i % 2 == 0:
newProfile.phone = "01234 567894" newProfile.phone = "01234 567894"
@@ -139,110 +143,110 @@ class Command(BaseCommand):
self.profiles.append(newProfile) self.profiles.append(newProfile)
def setupUsefulProfiles(self): def setupUsefulProfiles(self):
superUser = models.Profile.objects.create(username="superuser", first_name="Super", last_name="User", initials="SU", 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) email="superuser@example.com", is_superuser=True, is_active=True, is_staff=True)
superUser.set_password('superuser') superUser.set_password('superuser')
superUser.save() 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) email="financeuser@example.com", is_active=True)
financeUser.groups.add(self.finance_group) financeUser.groups.add(self.finance_group)
financeUser.groups.add(self.keyholder_group) financeUser.groups.add(self.keyholder_group)
financeUser.set_password('finance') financeUser.set_password('finance')
financeUser.save() 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) email="keyholderuser@example.com", is_active=True)
keyholderUser.groups.add(self.keyholder_group) keyholderUser.groups.add(self.keyholder_group)
keyholderUser.set_password('keyholder') keyholderUser.set_password('keyholder')
keyholderUser.save() keyholderUser.save()
basicUser = models.Profile.objects.create(username="basic", first_name="Basic", last_name="User", initials="BU", basicUser = models.Profile.objects.create(username="basic", first_name="Basic", last_name="User", initials="BU",
email="basicuser@example.com", is_active=True) email="basicuser@example.com", is_active=True)
basicUser.set_password('basic') basicUser.set_password('basic')
basicUser.save() basicUser.save()
def setupEvents(self): 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"] 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",
descriptions = ["A brief desciption of the event","This event is boring","Probably wont happen","Warning: this has lots of kit"] "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"]
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!"] descriptions = ["A brief desciption 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}, 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': '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': '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': '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': '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': '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': 'Electricity', 'description': 'You need this', 'quantity': 1, 'cost': 200.00},
{'name': 'Crew', 'description': 'Costs nothing, because reasons', 'quantity': 1, 'cost': 0.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}] {'name': 'Loyalty Discount', 'description': 'Have some negative moneys', 'quantity': 1, 'cost': -50.00}]
dayDelta = -120 # start adding events from 4 months ago dayDelta = -120 # start adding events from 4 months ago
for i in range(150): # Let's add 100 events for i in range(150): # Let's add 100 events
with reversion.create_revision(): with reversion.create_revision():
reversion.set_user(random.choice(self.profiles)) reversion.set_user(random.choice(self.profiles))
name = names[i%len(names)] name = names[i % len(names)]
startDate = datetime.date.today() + datetime.timedelta(days=dayDelta) startDate = datetime.date.today() + datetime.timedelta(days=dayDelta)
dayDelta = dayDelta + random.randint(0,3) dayDelta = dayDelta + random.randint(0, 3)
newEvent = models.Event.objects.create(name=name, start_date=startDate) newEvent = models.Event.objects.create(name=name, start_date=startDate)
if random.randint(0,2) > 1: # 1 in 3 have a start time if random.randint(0, 2) > 1: # 1 in 3 have a start time
newEvent.start_time = datetime.time(random.randint(15,20)) newEvent.start_time = datetime.time(random.randint(15, 20))
if random.randint(0,2) > 1: # of those, 1 in 3 have an end time on the same day if random.randint(0, 2) > 1: # of those, 1 in 3 have an end time on the same day
newEvent.end_time = datetime.time(random.randint(21,23)) newEvent.end_time = datetime.time(random.randint(21, 23))
elif random.randint(0,1)>0: # half of the others finish early the next day elif random.randint(0, 1) > 0: # half of the others finish early the next day
newEvent.end_date = newEvent.start_date + datetime.timedelta(days=1) newEvent.end_date = newEvent.start_date + datetime.timedelta(days=1)
newEvent.end_time = datetime.time(random.randint(0,5)) newEvent.end_time = datetime.time(random.randint(0, 5))
elif random.randint(0,2)>1: # 1 in 3 of the others finish a few days ahead elif random.randint(0, 2) > 1: # 1 in 3 of the others finish a few days ahead
newEvent.end_date = newEvent.start_date + datetime.timedelta(days=random.randint(1,4)) newEvent.end_date = newEvent.start_date + datetime.timedelta(days=random.randint(1, 4))
if random.randint(0, 6) > 0: # 5 in 6 have MIC
if random.randint(0,6) > 0: # 5 in 6 have MIC
newEvent.mic = random.choice(self.profiles) newEvent.mic = random.choice(self.profiles)
if random.randint(0,6) > 0: # 5 in 6 have organisation if random.randint(0, 6) > 0: # 5 in 6 have organisation
newEvent.organisation = random.choice(self.organisations) newEvent.organisation = random.choice(self.organisations)
if random.randint(0,6) > 0: # 5 in 6 have person if random.randint(0, 6) > 0: # 5 in 6 have person
newEvent.person = random.choice(self.people) newEvent.person = random.choice(self.people)
if random.randint(0,6) > 0: # 5 in 6 have venue if random.randint(0, 6) > 0: # 5 in 6 have venue
newEvent.venue = random.choice(self.venues) newEvent.venue = random.choice(self.venues)
# Could have any status, equally weighted # 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 newEvent.dry_hire = (random.randint(0, 7) == 0) # 1 in 7 are dry hire
if random.randint(0,1) > 0: # 1 in 2 have description if random.randint(0, 1) > 0: # 1 in 2 have description
newEvent.description = random.choice(descriptions) newEvent.description = random.choice(descriptions)
if random.randint(0,1) > 0: # 1 in 2 have notes if random.randint(0, 1) > 0: # 1 in 2 have notes
newEvent.notes = random.choice(notes) newEvent.notes = random.choice(notes)
newEvent.save() newEvent.save()
# Now add some items # Now add some items
for j in range(random.randint(1,5)): for j in range(random.randint(1, 5)):
itemData = itemOptions[random.randint(0,len(itemOptions)-1)] itemData = itemOptions[random.randint(0, len(itemOptions) - 1)]
newItem = models.EventItem.objects.create(event=newEvent, order=j, **itemData) newItem = models.EventItem.objects.create(event=newEvent, order=j, **itemData)
newItem.save() newItem.save()
while newEvent.sum_total < 0: while newEvent.sum_total < 0:
itemData = itemOptions[random.randint(0,len(itemOptions)-1)] itemData = itemOptions[random.randint(0, len(itemOptions) - 1)]
newItem = models.EventItem.objects.create(event=newEvent, order=j, **itemData) newItem = models.EventItem.objects.create(event=newEvent, order=j, **itemData)
newItem.save() newItem.save()
with reversion.create_revision(): with reversion.create_revision():
reversion.set_user(random.choice(self.profiles)) reversion.set_user(random.choice(self.profiles))
if newEvent.start_date < datetime.date.today(): # think about adding an invoice if newEvent.start_date < datetime.date.today(): # think about adding an invoice
if random.randint(0,2) > 0: # 2 in 3 have had paperwork sent to treasury if random.randint(0, 2) > 0: # 2 in 3 have had paperwork sent to treasury
newInvoice = models.Invoice.objects.create(event=newEvent) newInvoice = models.Invoice.objects.create(event=newEvent)
if newEvent.status is models.Event.CANCELLED: # void cancelled events if newEvent.status is models.Event.CANCELLED: # void cancelled events
newInvoice.void = True newInvoice.void = True
elif random.randint(0,2)>1: # 1 in 3 have been paid 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())

5
RIGS/models.py
View File

@@ -1,6 +1,7 @@
import datetime import datetime
import hashlib import hashlib
import datetime, pytz import datetime
import pytz
from django.db import models from django.db import models
from django.contrib.auth.models import AbstractUser from django.contrib.auth.models import AbstractUser
@@ -32,7 +33,7 @@ class Profile(AbstractUser):
size = 20 size = 20
chars = string.ascii_letters + string.digits chars = string.ascii_letters + string.digits
new_api_key = ''.join(random.choice(chars) for x in range(size)) new_api_key = ''.join(random.choice(chars) for x in range(size))
return new_api_key; return new_api_key
@property @property
def profile_picture(self): def profile_picture(self):

18
RIGS/regbackend.py
View File

@@ -1,13 +1,15 @@
from RIGS.models import Profile from RIGS.models import Profile
from RIGS.forms import ProfileRegistrationFormUniqueEmail from RIGS.forms import ProfileRegistrationFormUniqueEmail
from registration.signals import user_registered
def user_created(sender, user, request, **kwargs): def user_created(sender, user, request, **kwargs):
form = ProfileRegistrationFormUniqueEmail(request.POST) form = ProfileRegistrationFormUniqueEmail(request.POST)
user.first_name = form.data['first_name'] user.first_name = form.data['first_name']
user.last_name = form.data['last_name'] user.last_name = form.data['last_name']
user.initials = form.data['initials'] user.initials = form.data['initials']
user.phone = form.data['phone'] user.phone = form.data['phone']
user.save() user.save()
from registration.signals import user_registered
user_registered.connect(user_created) user_registered.connect(user_created)

4
RIGS/rigboard.py
View File

@@ -1,5 +1,7 @@
from io import BytesIO from io import BytesIO
import urllib.request, urllib.error, urllib.parse import urllib.request
import urllib.error
import urllib.parse
from django.contrib.staticfiles.storage import staticfiles_storage from django.contrib.staticfiles.storage import staticfiles_storage
from django.core.mail import EmailMessage, EmailMultiAlternatives from django.core.mail import EmailMessage, EmailMultiAlternatives

6
RIGS/signals.py
View File

@@ -1,5 +1,7 @@
import re import re
import urllib.request, urllib.error, urllib.parse import urllib.request
import urllib.error
import urllib.parse
from io import BytesIO from io import BytesIO
from django.db.models.signals import post_save from django.db.models.signals import post_save
@@ -62,7 +64,7 @@ def send_eventauthorisation_success_email(instance):
css = staticfiles_storage.path('css/email.css') css = staticfiles_storage.path('css/email.css')
html = Premailer(get_template("RIGS/eventauthorisation_client_success.html").render(context), html = Premailer(get_template("RIGS/eventauthorisation_client_success.html").render(context),
external_styles=css).transform() external_styles=css).transform()
client_email.attach_alternative(html, 'text/html') client_email.attach_alternative(html, 'text/html')
escapedEventName = re.sub('[^a-zA-Z0-9 \n\.]', '', instance.event.name) escapedEventName = re.sub('[^a-zA-Z0-9 \n\.]', '', instance.event.name)

26
RIGS/templatetags/filters.py
View File

@@ -5,14 +5,17 @@ from django.forms.utils import ErrorDict
register = template.Library() register = template.Library()
@register.filter @register.filter
def multiply(value, arg): def multiply(value, arg):
return value*arg return value * arg
@register.filter @register.filter
def to_class_name(value): def to_class_name(value):
return value.__class__.__name__ return value.__class__.__name__
@register.filter @register.filter
def nice_errors(form, non_field_msg='General form errors'): def nice_errors(form, non_field_msg='General form errors'):
nice_errors = ErrorDict() nice_errors = ErrorDict()
@@ -25,6 +28,7 @@ def nice_errors(form, non_field_msg='General form errors'):
nice_errors[key] = errors nice_errors[key] = errors
return nice_errors return nice_errors
def paginator(context, adjacent_pages=3): def paginator(context, adjacent_pages=3):
""" """
To be used in conjunction with the object_list generic view. To be used in conjunction with the object_list generic view.
@@ -37,11 +41,13 @@ def paginator(context, adjacent_pages=3):
page = context['page_obj'] page = context['page_obj']
paginator = context['paginator'] paginator = context['paginator']
startPage = max(page.number - adjacent_pages, 1) startPage = max(page.number - adjacent_pages, 1)
if startPage <= 3: startPage = 1 if startPage <= 3:
startPage = 1
endPage = page.number + adjacent_pages + 1 endPage = page.number + adjacent_pages + 1
if endPage >= paginator.num_pages - 1: endPage = paginator.num_pages + 1 if endPage >= paginator.num_pages - 1:
page_numbers = [n for n in range(startPage, endPage) \ endPage = paginator.num_pages + 1
if n > 0 and n <= paginator.num_pages] page_numbers = [n for n in range(startPage, endPage)
if n > 0 and n <= paginator.num_pages]
dict = { dict = {
'request': context['request'], 'request': context['request'],
@@ -57,15 +63,18 @@ def paginator(context, adjacent_pages=3):
'has_next': page.has_next(), 'has_next': page.has_next(),
'has_previous': page.has_previous(), 'has_previous': page.has_previous(),
} }
if page.has_next(): if page.has_next():
dict['next'] = page.next_page_number() dict['next'] = page.next_page_number()
if page.has_previous(): if page.has_previous():
dict['previous'] = page.previous_page_number() dict['previous'] = page.previous_page_number()
return dict return dict
register.inclusion_tag('pagination.html', takes_context=True)(paginator) register.inclusion_tag('pagination.html', takes_context=True)(paginator)
@register.simple_tag @register.simple_tag
def url_replace(request, field, value): def url_replace(request, field, value):
@@ -75,6 +84,7 @@ def url_replace(request, field, value):
return dict_.urlencode() return dict_.urlencode()
@register.simple_tag @register.simple_tag
def orderby(request, field, attr): def orderby(request, field, attr):
@@ -88,4 +98,4 @@ def orderby(request, field, attr):
else: else:
dict_[field] = attr dict_[field] = attr
return dict_.urlencode() return dict_.urlencode()

57
RIGS/test_functional.py
View File

@@ -35,6 +35,7 @@ def create_browser():
driver = webdriver.Chrome(chrome_options=options) driver = webdriver.Chrome(chrome_options=options)
return driver return driver
class UserRegistrationTest(LiveServerTestCase): class UserRegistrationTest(LiveServerTestCase):
def setUp(self): def setUp(self):
self.browser = create_browser() self.browser = create_browser()
@@ -166,6 +167,7 @@ class UserRegistrationTest(LiveServerTestCase):
# All is well # All is well
class EventTest(LiveServerTestCase): class EventTest(LiveServerTestCase):
def setUp(self): def setUp(self):
self.profile = models.Profile( self.profile = models.Profile(
@@ -173,11 +175,10 @@ class EventTest(LiveServerTestCase):
self.profile.set_password("EventTestPassword") self.profile.set_password("EventTestPassword")
self.profile.save() self.profile.save()
self.vatrate = models.VatRate.objects.create(start_at='2014-03-05', rate=0.20, comment='test1')
self.vatrate = models.VatRate.objects.create(start_at='2014-03-05',rate=0.20,comment='test1')
self.browser = create_browser() self.browser = create_browser()
self.browser.implicitly_wait(10) # Set implicit wait session wide self.browser.implicitly_wait(10) # Set implicit wait session wide
# self.browser.maximize_window() # self.browser.maximize_window()
os.environ['RECAPTCHA_TESTING'] = 'True' os.environ['RECAPTCHA_TESTING'] = 'True'
@@ -222,7 +223,7 @@ class EventTest(LiveServerTestCase):
# Gets redirected to login and back # Gets redirected to login and back
self.authenticate('/event/create/') self.authenticate('/event/create/')
wait = WebDriverWait(self.browser, 3) #setup WebDriverWait to use later (to wait for animations) wait = WebDriverWait(self.browser, 3) # setup WebDriverWait to use later (to wait for animations)
wait.until(animation_is_finished()) wait.until(animation_is_finished())
@@ -436,7 +437,7 @@ class EventTest(LiveServerTestCase):
self.assertFalse(error.is_displayed()) self.assertFalse(error.is_displayed())
except StaleElementReferenceException: except StaleElementReferenceException:
pass pass
except: except BaseException:
self.assertFail("Element does not appear to have been deleted") self.assertFail("Element does not appear to have been deleted")
# Check at least some data is preserved. Some = all will be there # Check at least some data is preserved. Some = all will be there
@@ -453,7 +454,7 @@ class EventTest(LiveServerTestCase):
successTitle = self.browser.find_element_by_xpath('//h1').text successTitle = self.browser.find_element_by_xpath('//h1').text
event = models.Event.objects.get(name='Test Event Name') event = models.Event.objects.get(name='Test Event Name')
self.assertIn("N%05d | Test Event Name"%event.pk, successTitle) self.assertIn("N%05d | Test Event Name" % event.pk, successTitle)
except WebDriverException: except WebDriverException:
# This is a dirty workaround for wercker being a bit funny and not running it correctly. # This is a dirty workaround for wercker being a bit funny and not running it correctly.
# Waiting for wercker to get back to me about this # Waiting for wercker to get back to me about this
@@ -487,8 +488,7 @@ class EventTest(LiveServerTestCase):
self.browser.get(self.live_server_url + '/event/' + str(testEvent.pk) + '/duplicate/') self.browser.get(self.live_server_url + '/event/' + str(testEvent.pk) + '/duplicate/')
self.authenticate('/event/' + str(testEvent.pk) + '/duplicate/') self.authenticate('/event/' + str(testEvent.pk) + '/duplicate/')
wait = WebDriverWait(self.browser, 3) # setup WebDriverWait to use later (to wait for animations)
wait = WebDriverWait(self.browser, 3) #setup WebDriverWait to use later (to wait for animations)
save = self.browser.find_element_by_xpath( save = self.browser.find_element_by_xpath(
'(//button[@type="submit"])[3]') '(//button[@type="submit"])[3]')
@@ -525,11 +525,11 @@ class EventTest(LiveServerTestCase):
self.assertEqual(newEvent.auth_request_to, None) self.assertEqual(newEvent.auth_request_to, None)
self.assertEqual(newEvent.auth_request_by, None) self.assertEqual(newEvent.auth_request_by, None)
self.assertEqual(newEvent.auth_request_at, None) self.assertEqual(newEvent.auth_request_at, None)
self.assertFalse(hasattr(newEvent, 'authorised')) self.assertFalse(hasattr(newEvent, 'authorised'))
self.assertNotIn("N%05d"%testEvent.pk, self.browser.find_element_by_xpath('//h1').text) 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 # Check the new items are visible
table = self.browser.find_element_by_id('item-table') # ID number is known, see above table = self.browser.find_element_by_id('item-table') # ID number is known, see above
@@ -543,19 +543,18 @@ class EventTest(LiveServerTestCase):
# Check the PO hasn't carried through # Check the PO hasn't carried through
self.assertNotIn("TESTPO", infoPanel.find_element_by_xpath('//dt[text()="PO"]/following-sibling::dd[1]').text) 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
self.browser.get(self.live_server_url + '/event/' + str(testEvent.pk)) #Go back to the old event # Check that based-on hasn't crept into the old event
#Check that based-on hasn't crept into the old event
infoPanel = self.browser.find_element_by_xpath('//div[contains(text(), "Event Info")]/..') infoPanel = self.browser.find_element_by_xpath('//div[contains(text(), "Event Info")]/..')
self.assertNotIn("N0000%d" % testEvent.pk, self.assertNotIn("N0000%d" % testEvent.pk,
infoPanel.find_element_by_xpath('//dt[text()="Based On"]/following-sibling::dd[1]').text) infoPanel.find_element_by_xpath('//dt[text()="Based On"]/following-sibling::dd[1]').text)
# Check the PO remains on the old event # 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.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 # Check the items are as they were
table = self.browser.find_element_by_id('item-table') # ID number is known, see above table = self.browser.find_element_by_id('item-table') # ID number is known, see above
@@ -568,8 +567,7 @@ class EventTest(LiveServerTestCase):
# Gets redirected to login and back # Gets redirected to login and back
self.authenticate('/event/create/') self.authenticate('/event/create/')
wait = WebDriverWait(self.browser, 3) # setup WebDriverWait to use later (to wait for animations)
wait = WebDriverWait(self.browser, 3) #setup WebDriverWait to use later (to wait for animations)
wait.until(animation_is_finished()) wait.until(animation_is_finished())
@@ -631,7 +629,7 @@ class EventTest(LiveServerTestCase):
# No end date, end time before start time # No end date, end time before start time
form = self.browser.find_element_by_tag_name('form') form = self.browser.find_element_by_tag_name('form')
save = self.browser.find_element_by_xpath('(//button[@type="submit"])[3]') save = self.browser.find_element_by_xpath('(//button[@type="submit"])[3]')
self.browser.execute_script("document.getElementById('id_start_date').value='3015-04-24'") self.browser.execute_script("document.getElementById('id_start_date').value='3015-04-24'")
self.browser.execute_script("document.getElementById('id_end_date').value=''") self.browser.execute_script("document.getElementById('id_end_date').value=''")
@@ -653,10 +651,9 @@ class EventTest(LiveServerTestCase):
self.browser.execute_script("document.getElementById('id_start_date').value='3015-04-24'") self.browser.execute_script("document.getElementById('id_start_date').value='3015-04-24'")
self.browser.execute_script("document.getElementById('id_end_date').value='3015-04-26'") self.browser.execute_script("document.getElementById('id_end_date').value='3015-04-26'")
self.browser.execute_script("document.getElementById('id_start_time').value=''") self.browser.execute_script("document.getElementById('id_start_time').value=''")
self.browser.execute_script("document.getElementById('id_end_time').value=''") self.browser.execute_script("document.getElementById('id_end_time').value=''")
# Attempt to save - should succeed # Attempt to save - should succeed
save.click() save.click()
@@ -664,16 +661,15 @@ class EventTest(LiveServerTestCase):
successTitle = self.browser.find_element_by_xpath('//h1').text successTitle = self.browser.find_element_by_xpath('//h1').text
event = models.Event.objects.get(name='Test Event Name') event = models.Event.objects.get(name='Test Event Name')
self.assertIn("N%05d | Test Event Name"%event.pk, successTitle) self.assertIn("N%05d | Test Event Name" % event.pk, successTitle)
def testRigNonRig(self): def testRigNonRig(self):
self.browser.get(self.live_server_url + '/event/create/') self.browser.get(self.live_server_url + '/event/create/')
# Gets redirected to login and back # Gets redirected to login and back
self.authenticate('/event/create/') self.authenticate('/event/create/')
wait = WebDriverWait(self.browser, 3) # setup WebDriverWait to use later (to wait for animations)
wait = WebDriverWait(self.browser, 3) #setup WebDriverWait to use later (to wait for animations) self.browser.implicitly_wait(3) # Set session-long wait (only works for non-existant DOM objects)
self.browser.implicitly_wait(3) #Set session-long wait (only works for non-existant DOM objects)
wait.until(animation_is_finished()) wait.until(animation_is_finished())
@@ -750,7 +746,6 @@ class EventTest(LiveServerTestCase):
organisationPanel = self.browser.find_element_by_xpath('//div[contains(text(), "Contact Details")]/..') organisationPanel = self.browser.find_element_by_xpath('//div[contains(text(), "Contact Details")]/..')
def testEventEdit(self): def testEventEdit(self):
person = models.Person(name="Event Edit Person", email="eventdetail@person.tests.rigs", phone="123 123").save() person = models.Person(name="Event Edit Person", email="eventdetail@person.tests.rigs", phone="123 123").save()
organisation = models.Organisation(name="Event Edit Organisation", email="eventdetail@organisation.tests.rigs", phone="123 456").save() organisation = models.Organisation(name="Event Edit Organisation", email="eventdetail@organisation.tests.rigs", phone="123 456").save()
@@ -810,6 +805,7 @@ class EventTest(LiveServerTestCase):
tz = pytz.timezone(settings.TIME_ZONE) tz = pytz.timezone(settings.TIME_ZONE)
return tz.localize(datetime(year, month, day, hour, min)).astimezone(pytz.utc) return tz.localize(datetime(year, month, day, hour, min)).astimezone(pytz.utc)
class IcalTest(LiveServerTestCase): class IcalTest(LiveServerTestCase):
def setUp(self): def setUp(self):
self.all_events = set(range(1, 18)) self.all_events = set(range(1, 18))
@@ -871,9 +867,8 @@ class IcalTest(LiveServerTestCase):
models.Event.objects.create(name="TE E18", start_date=date.today(), is_rig=False, status=models.Event.CANCELLED, models.Event.objects.create(name="TE E18", start_date=date.today(), is_rig=False, status=models.Event.CANCELLED,
description="non rig today cancelled") description="non rig today cancelled")
self.browser = create_browser() self.browser = create_browser()
self.browser.implicitly_wait(3) # Set implicit wait session wide self.browser.implicitly_wait(3) # Set implicit wait session wide
os.environ['RECAPTCHA_TESTING'] = 'True' os.environ['RECAPTCHA_TESTING'] = 'True'
def tearDown(self): def tearDown(self):
@@ -1068,7 +1063,7 @@ class ClientEventAuthorisationTest(TestCase):
organisation=organisation, organisation=organisation,
) )
self.hmac = signing.dumps({'pk': self.event.pk, 'email': 'authemail@function.test', self.hmac = signing.dumps({'pk': self.event.pk, 'email': 'authemail@function.test',
'sent_by': self.profile.pk}) 'sent_by': self.profile.pk})
self.url = reverse('event_authorise', kwargs={'pk': self.event.pk, 'hmac': self.hmac}) self.url = reverse('event_authorise', kwargs={'pk': self.event.pk, 'hmac': self.hmac})
def test_requires_valid_hmac(self): def test_requires_valid_hmac(self):
@@ -1177,7 +1172,7 @@ class TECEventAuthorisationTest(TestCase):
self.profile.save() self.profile.save()
self.assertTrue(self.client.login(username=self.profile.username, password='eventauthtest123')) self.assertTrue(self.client.login(username=self.profile.username, password='eventauthtest123'))
response = self.client.post(self.url) response = self.client.post(self.url)
self.assertContains(response, 'must have an @nottinghamtec.co.uk email address') self.assertContains(response, 'must have an @nottinghamtec.co.uk email address')

13
RIGS/test_models.py
View File

@@ -373,7 +373,7 @@ class EventAuthorisationTestCase(TestCase):
self.person = models.Person.objects.create(name='Authorisation Test Person') self.person = models.Person.objects.create(name='Authorisation Test Person')
self.organisation = models.Organisation.objects.create(name='Authorisation Test Organisation') self.organisation = models.Organisation.objects.create(name='Authorisation Test Organisation')
self.event = models.Event.objects.create(name="AuthorisationTestCase", person=self.person, self.event = models.Event.objects.create(name="AuthorisationTestCase", person=self.person,
start_date=date.today()) start_date=date.today())
# Add some items # Add some items
models.EventItem.objects.create(event=self.event, name="Authorisation test item", quantity=2, cost=123.45, models.EventItem.objects.create(event=self.event, name="Authorisation test item", quantity=2, cost=123.45,
order=1) order=1)
@@ -390,7 +390,7 @@ class EventAuthorisationTestCase(TestCase):
def test_last_edited(self): def test_last_edited(self):
with reversion.create_revision(): with reversion.create_revision():
auth = models.EventAuthorisation.objects.create(event=self.event, email="authroisation@model.test.case", 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) self.assertIsNotNone(auth.last_edited_at)
@@ -494,9 +494,9 @@ class RIGSVersionTestCase(TestCase):
# Check the diff is correct # Check the diff is correct
self.assertEqual(currentVersion.changes.field_changes[0].diff, self.assertEqual(currentVersion.changes.field_changes[0].diff,
[{'type': 'equal', 'text': "A"}, [{'type': 'equal', 'text': "A"},
{'type': 'delete', 'text': " new"}, {'type': 'delete', 'text': " new"},
{'type': 'insert', 'text': "n old"}, {'type': 'insert', 'text': "n old"},
{'type': 'equal', 'text': " note on the event"} {'type': 'equal', 'text': " note on the event"}
]) ])
def test_choice_field(self): def test_choice_field(self):
@@ -554,7 +554,7 @@ class RIGSVersionTestCase(TestCase):
# Check the diff # Check the diff
self.assertEqual(currentVersion.changes.item_changes[0].field_changes[0].diff, self.assertEqual(currentVersion.changes.item_changes[0].field_changes[0].diff,
[{'type': 'delete', 'text': "TI I1"}, [{'type': 'delete', 'text': "TI I1"},
{'type': 'insert', 'text': "New Name"}, {'type': 'insert', 'text': "New Name"},
]) ])
# Delete the item # Delete the item
@@ -575,4 +575,3 @@ class RIGSVersionTestCase(TestCase):
self.assertEqual(diffs[0].old.name, "New Name") self.assertEqual(diffs[0].old.name, "New Name")
self.assertTrue(diffs[0].new is None) self.assertTrue(diffs[0].new is None)

7
RIGS/test_unit.py
View File

@@ -9,6 +9,7 @@ from django.test.utils import override_settings
from RIGS import models from RIGS import models
from reversion import revisions as reversion from reversion import revisions as reversion
class TestAdminMergeObjects(TestCase): class TestAdminMergeObjects(TestCase):
@classmethod @classmethod
def setUpTestData(cls): def setUpTestData(cls):
@@ -159,6 +160,7 @@ class TestAdminMergeObjects(TestCase):
continue continue
self.assertEqual(updatedEvent.organisation, self.organisations[1]) self.assertEqual(updatedEvent.organisation, self.organisations[1])
class TestInvoiceDelete(TestCase): class TestInvoiceDelete(TestCase):
@classmethod @classmethod
def setUpTestData(cls): def setUpTestData(cls):
@@ -186,7 +188,7 @@ class TestInvoiceDelete(TestCase):
self.assertTrue(self.client.login(username=self.profile.username, password='testuser')) self.assertTrue(self.client.login(username=self.profile.username, password='testuser'))
def test_invoice_delete_allowed(self): def test_invoice_delete_allowed(self):
request_url = reverse('invoice_delete', kwargs={'pk':self.invoices[2].pk}) request_url = reverse('invoice_delete', kwargs={'pk': self.invoices[2].pk})
response = self.client.get(request_url, follow=True) response = self.client.get(request_url, follow=True)
self.assertContains(response, "Are you sure") self.assertContains(response, "Are you sure")
@@ -201,7 +203,7 @@ class TestInvoiceDelete(TestCase):
self.assertRaises(ObjectDoesNotExist, models.Invoice.objects.get, pk=self.invoices[2].pk) self.assertRaises(ObjectDoesNotExist, models.Invoice.objects.get, pk=self.invoices[2].pk)
def test_invoice_delete_not_allowed(self): def test_invoice_delete_not_allowed(self):
request_url = reverse('invoice_delete', kwargs={'pk':self.invoices[1].pk}) request_url = reverse('invoice_delete', kwargs={'pk': self.invoices[1].pk})
response = self.client.get(request_url, follow=True) response = self.client.get(request_url, follow=True)
self.assertContains(response, "To delete an invoice, delete the payments first.") self.assertContains(response, "To delete an invoice, delete the payments first.")
@@ -327,7 +329,6 @@ class TestVersioningViews(TestCase):
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
class TestEmbeddedViews(TestCase): class TestEmbeddedViews(TestCase):
@classmethod @classmethod
def setUpTestData(cls): def setUpTestData(cls):

330
RIGS/urls.py
View File

@@ -10,184 +10,184 @@ from PyRIGS.decorators import permission_required_with_403
from PyRIGS.decorators import api_key_required from PyRIGS.decorators import api_key_required
urlpatterns = [ urlpatterns = [
# Examples: # Examples:
# url(r'^$', 'PyRIGS.views.home', name='home'), # url(r'^$', 'PyRIGS.views.home', name='home'),
# url(r'^blog/', include('blog.urls')), # url(r'^blog/', include('blog.urls')),
url('^$', login_required(views.Index.as_view()), name='index'), url('^$', login_required(views.Index.as_view()), name='index'),
url(r'^closemodal/$', views.CloseModal.as_view(), name='closemodal'), url(r'^closemodal/$', views.CloseModal.as_view(), name='closemodal'),
url('^user/login/$', views.login, name='login'), url('^user/login/$', views.login, name='login'),
url('^user/login/embed/$', xframe_options_exempt(views.login_embed), name='login_embed'), url('^user/login/embed/$', xframe_options_exempt(views.login_embed), name='login_embed'),
url(r'^user/password_reset/$', password_reset, {'password_reset_form': forms.PasswordReset}), url(r'^user/password_reset/$', password_reset, {'password_reset_form': forms.PasswordReset}),
# People # People
url(r'^people/$', permission_required_with_403('RIGS.view_person')(views.PersonList.as_view()), url(r'^people/$', permission_required_with_403('RIGS.view_person')(views.PersonList.as_view()),
name='person_list'), name='person_list'),
url(r'^people/add/$', url(r'^people/add/$',
permission_required_with_403('RIGS.add_person')(views.PersonCreate.as_view()), permission_required_with_403('RIGS.add_person')(views.PersonCreate.as_view()),
name='person_create'), name='person_create'),
url(r'^people/(?P<pk>\d+)/$', url(r'^people/(?P<pk>\d+)/$',
permission_required_with_403('RIGS.view_person')(views.PersonDetail.as_view()), permission_required_with_403('RIGS.view_person')(views.PersonDetail.as_view()),
name='person_detail'), name='person_detail'),
url(r'^people/(?P<pk>\d+)/history/$', url(r'^people/(?P<pk>\d+)/history/$',
permission_required_with_403('RIGS.view_person')(versioning.VersionHistory.as_view()), permission_required_with_403('RIGS.view_person')(versioning.VersionHistory.as_view()),
name='person_history', kwargs={'model': models.Person}), name='person_history', kwargs={'model': models.Person}),
url(r'^people/(?P<pk>\d+)/edit/$', url(r'^people/(?P<pk>\d+)/edit/$',
permission_required_with_403('RIGS.change_person')(views.PersonUpdate.as_view()), permission_required_with_403('RIGS.change_person')(views.PersonUpdate.as_view()),
name='person_update'), name='person_update'),
# Organisations # Organisations
url(r'^organisations/$', url(r'^organisations/$',
permission_required_with_403('RIGS.view_organisation')(views.OrganisationList.as_view()), permission_required_with_403('RIGS.view_organisation')(views.OrganisationList.as_view()),
name='organisation_list'), name='organisation_list'),
url(r'^organisations/add/$', url(r'^organisations/add/$',
permission_required_with_403('RIGS.add_organisation')(views.OrganisationCreate.as_view()), permission_required_with_403('RIGS.add_organisation')(views.OrganisationCreate.as_view()),
name='organisation_create'), name='organisation_create'),
url(r'^organisations/(?P<pk>\d+)/$', url(r'^organisations/(?P<pk>\d+)/$',
permission_required_with_403('RIGS.view_organisation')(views.OrganisationDetail.as_view()), permission_required_with_403('RIGS.view_organisation')(views.OrganisationDetail.as_view()),
name='organisation_detail'), name='organisation_detail'),
url(r'^organisations/(?P<pk>\d+)/history/$', url(r'^organisations/(?P<pk>\d+)/history/$',
permission_required_with_403('RIGS.view_organisation')(versioning.VersionHistory.as_view()), permission_required_with_403('RIGS.view_organisation')(versioning.VersionHistory.as_view()),
name='organisation_history', kwargs={'model': models.Organisation}), name='organisation_history', kwargs={'model': models.Organisation}),
url(r'^organisations/(?P<pk>\d+)/edit/$', url(r'^organisations/(?P<pk>\d+)/edit/$',
permission_required_with_403('RIGS.change_organisation')(views.OrganisationUpdate.as_view()), permission_required_with_403('RIGS.change_organisation')(views.OrganisationUpdate.as_view()),
name='organisation_update'), name='organisation_update'),
# Venues # Venues
url(r'^venues/$', url(r'^venues/$',
permission_required_with_403('RIGS.view_venue')(views.VenueList.as_view()), permission_required_with_403('RIGS.view_venue')(views.VenueList.as_view()),
name='venue_list'), name='venue_list'),
url(r'^venues/add/$', url(r'^venues/add/$',
permission_required_with_403('RIGS.add_venue')(views.VenueCreate.as_view()), permission_required_with_403('RIGS.add_venue')(views.VenueCreate.as_view()),
name='venue_create'), name='venue_create'),
url(r'^venues/(?P<pk>\d+)/$', url(r'^venues/(?P<pk>\d+)/$',
permission_required_with_403('RIGS.view_venue')(views.VenueDetail.as_view()), permission_required_with_403('RIGS.view_venue')(views.VenueDetail.as_view()),
name='venue_detail'), name='venue_detail'),
url(r'^venues/(?P<pk>\d+)/history/$', url(r'^venues/(?P<pk>\d+)/history/$',
permission_required_with_403('RIGS.view_venue')(versioning.VersionHistory.as_view()), permission_required_with_403('RIGS.view_venue')(versioning.VersionHistory.as_view()),
name='venue_history', kwargs={'model': models.Venue}), name='venue_history', kwargs={'model': models.Venue}),
url(r'^venues/(?P<pk>\d+)/edit/$', url(r'^venues/(?P<pk>\d+)/edit/$',
permission_required_with_403('RIGS.change_venue')(views.VenueUpdate.as_view()), permission_required_with_403('RIGS.change_venue')(views.VenueUpdate.as_view()),
name='venue_update'), name='venue_update'),
# Rigboard # Rigboard
url(r'^rigboard/$', login_required(rigboard.RigboardIndex.as_view()), name='rigboard'), url(r'^rigboard/$', login_required(rigboard.RigboardIndex.as_view()), name='rigboard'),
url(r'^rigboard/calendar/$', login_required()(rigboard.WebCalendar.as_view()), url(r'^rigboard/calendar/$', login_required()(rigboard.WebCalendar.as_view()),
name='web_calendar'), name='web_calendar'),
url(r'^rigboard/calendar/(?P<view>(month|week|day))/$', url(r'^rigboard/calendar/(?P<view>(month|week|day))/$',
login_required()(rigboard.WebCalendar.as_view()), name='web_calendar'), login_required()(rigboard.WebCalendar.as_view()), name='web_calendar'),
url(r'^rigboard/calendar/(?P<view>(month|week|day))/(?P<date>(\d{4}-\d{2}-\d{2}))/$', url(r'^rigboard/calendar/(?P<view>(month|week|day))/(?P<date>(\d{4}-\d{2}-\d{2}))/$',
login_required()(rigboard.WebCalendar.as_view()), name='web_calendar'), login_required()(rigboard.WebCalendar.as_view()), name='web_calendar'),
url(r'^rigboard/archive/$', RedirectView.as_view(permanent=True, pattern_name='event_archive')), url(r'^rigboard/archive/$', RedirectView.as_view(permanent=True, pattern_name='event_archive')),
url(r'^rigboard/activity/$', url(r'^rigboard/activity/$',
permission_required_with_403('RIGS.view_event')(versioning.ActivityTable.as_view()), permission_required_with_403('RIGS.view_event')(versioning.ActivityTable.as_view()),
name='activity_table'), name='activity_table'),
url(r'^rigboard/activity/feed/$', url(r'^rigboard/activity/feed/$',
permission_required_with_403('RIGS.view_event')(versioning.ActivityFeed.as_view()), permission_required_with_403('RIGS.view_event')(versioning.ActivityFeed.as_view()),
name='activity_feed'), name='activity_feed'),
url(r'^event/(?P<pk>\d+)/$', url(r'^event/(?P<pk>\d+)/$',
permission_required_with_403('RIGS.view_event', oembed_view="event_oembed")( permission_required_with_403('RIGS.view_event', oembed_view="event_oembed")(
rigboard.EventDetail.as_view()), rigboard.EventDetail.as_view()),
name='event_detail'), name='event_detail'),
url(r'^event/(?P<pk>\d+)/embed/$', url(r'^event/(?P<pk>\d+)/embed/$',
xframe_options_exempt( xframe_options_exempt(
login_required(login_url='/user/login/embed/')(rigboard.EventEmbed.as_view())), login_required(login_url='/user/login/embed/')(rigboard.EventEmbed.as_view())),
name='event_embed'), name='event_embed'),
url(r'^event/(?P<pk>\d+)/oembed_json/$', url(r'^event/(?P<pk>\d+)/oembed_json/$',
rigboard.EventOembed.as_view(), rigboard.EventOembed.as_view(),
name='event_oembed'), name='event_oembed'),
url(r'^event/(?P<pk>\d+)/print/$', url(r'^event/(?P<pk>\d+)/print/$',
permission_required_with_403('RIGS.view_event')(rigboard.EventPrint.as_view()), permission_required_with_403('RIGS.view_event')(rigboard.EventPrint.as_view()),
name='event_print'), name='event_print'),
url(r'^event/create/$', url(r'^event/create/$',
permission_required_with_403('RIGS.add_event')(rigboard.EventCreate.as_view()), permission_required_with_403('RIGS.add_event')(rigboard.EventCreate.as_view()),
name='event_create'), name='event_create'),
url(r'^event/(?P<pk>\d+)/edit/$', url(r'^event/(?P<pk>\d+)/edit/$',
permission_required_with_403('RIGS.change_event')(rigboard.EventUpdate.as_view()), permission_required_with_403('RIGS.change_event')(rigboard.EventUpdate.as_view()),
name='event_update'), name='event_update'),
url(r'^event/(?P<pk>\d+)/duplicate/$', url(r'^event/(?P<pk>\d+)/duplicate/$',
permission_required_with_403('RIGS.add_event')(rigboard.EventDuplicate.as_view()), permission_required_with_403('RIGS.add_event')(rigboard.EventDuplicate.as_view()),
name='event_duplicate'), name='event_duplicate'),
url(r'^event/archive/$', login_required()(rigboard.EventArchive.as_view()), url(r'^event/archive/$', login_required()(rigboard.EventArchive.as_view()),
name='event_archive'), name='event_archive'),
url(r'^event/(?P<pk>\d+)/history/$', url(r'^event/(?P<pk>\d+)/history/$',
permission_required_with_403('RIGS.view_event')(versioning.VersionHistory.as_view()), permission_required_with_403('RIGS.view_event')(versioning.VersionHistory.as_view()),
name='event_history', kwargs={'model': models.Event}), name='event_history', kwargs={'model': models.Event}),
# Finance # Finance
url(r'^invoice/$', url(r'^invoice/$',
permission_required_with_403('RIGS.view_invoice')(finance.InvoiceIndex.as_view()), permission_required_with_403('RIGS.view_invoice')(finance.InvoiceIndex.as_view()),
name='invoice_list'), name='invoice_list'),
url(r'^invoice/archive/$', url(r'^invoice/archive/$',
permission_required_with_403('RIGS.view_invoice')(finance.InvoiceArchive.as_view()), permission_required_with_403('RIGS.view_invoice')(finance.InvoiceArchive.as_view()),
name='invoice_archive'), name='invoice_archive'),
url(r'^invoice/waiting/$', url(r'^invoice/waiting/$',
permission_required_with_403('RIGS.add_invoice')(finance.InvoiceWaiting.as_view()), permission_required_with_403('RIGS.add_invoice')(finance.InvoiceWaiting.as_view()),
name='invoice_waiting'), name='invoice_waiting'),
url(r'^event/(?P<pk>\d+)/invoice/$', url(r'^event/(?P<pk>\d+)/invoice/$',
permission_required_with_403('RIGS.add_invoice')(finance.InvoiceEvent.as_view()), permission_required_with_403('RIGS.add_invoice')(finance.InvoiceEvent.as_view()),
name='invoice_event'), name='invoice_event'),
url(r'^invoice/(?P<pk>\d+)/$', url(r'^invoice/(?P<pk>\d+)/$',
permission_required_with_403('RIGS.view_invoice')(finance.InvoiceDetail.as_view()), permission_required_with_403('RIGS.view_invoice')(finance.InvoiceDetail.as_view()),
name='invoice_detail'), name='invoice_detail'),
url(r'^invoice/(?P<pk>\d+)/print/$', url(r'^invoice/(?P<pk>\d+)/print/$',
permission_required_with_403('RIGS.view_invoice')(finance.InvoicePrint.as_view()), permission_required_with_403('RIGS.view_invoice')(finance.InvoicePrint.as_view()),
name='invoice_print'), name='invoice_print'),
url(r'^invoice/(?P<pk>\d+)/void/$', url(r'^invoice/(?P<pk>\d+)/void/$',
permission_required_with_403('RIGS.change_invoice')(finance.InvoiceVoid.as_view()), permission_required_with_403('RIGS.change_invoice')(finance.InvoiceVoid.as_view()),
name='invoice_void'), name='invoice_void'),
url(r'^invoice/(?P<pk>\d+)/delete/$', url(r'^invoice/(?P<pk>\d+)/delete/$',
permission_required_with_403('RIGS.change_invoice')(finance.InvoiceDelete.as_view()), permission_required_with_403('RIGS.change_invoice')(finance.InvoiceDelete.as_view()),
name='invoice_delete'), name='invoice_delete'),
url(r'^payment/create/$', url(r'^payment/create/$',
permission_required_with_403('RIGS.add_payment')(finance.PaymentCreate.as_view()), permission_required_with_403('RIGS.add_payment')(finance.PaymentCreate.as_view()),
name='payment_create'), name='payment_create'),
url(r'^payment/(?P<pk>\d+)/delete/$', url(r'^payment/(?P<pk>\d+)/delete/$',
permission_required_with_403('RIGS.add_payment')(finance.PaymentDelete.as_view()), permission_required_with_403('RIGS.add_payment')(finance.PaymentDelete.as_view()),
name='payment_delete'), name='payment_delete'),
# Client event authorisation # Client event authorisation
url(r'^event/(?P<pk>\d+)/auth/$', url(r'^event/(?P<pk>\d+)/auth/$',
permission_required_with_403('RIGS.change_event')( permission_required_with_403('RIGS.change_event')(
rigboard.EventAuthorisationRequest.as_view() rigboard.EventAuthorisationRequest.as_view()
), ),
name='event_authorise_request'), name='event_authorise_request'),
url(r'^event/(?P<pk>\d+)/auth/preview/$', url(r'^event/(?P<pk>\d+)/auth/preview/$',
permission_required_with_403('RIGS.change_event')( permission_required_with_403('RIGS.change_event')(
rigboard.EventAuthoriseRequestEmailPreview.as_view() rigboard.EventAuthoriseRequestEmailPreview.as_view()
), ),
name='event_authorise_preview'), name='event_authorise_preview'),
url(r'^event/(?P<pk>\d+)/(?P<hmac>[-:\w]+)/$', rigboard.EventAuthorise.as_view(), url(r'^event/(?P<pk>\d+)/(?P<hmac>[-:\w]+)/$', rigboard.EventAuthorise.as_view(),
name='event_authorise'), name='event_authorise'),
# User editing # User editing
url(r'^user/$', login_required(views.ProfileDetail.as_view()), name='profile_detail'), url(r'^user/$', login_required(views.ProfileDetail.as_view()), name='profile_detail'),
url(r'^user/(?P<pk>\d+)/$', url(r'^user/(?P<pk>\d+)/$',
permission_required_with_403('RIGS.view_profile')(views.ProfileDetail.as_view()), permission_required_with_403('RIGS.view_profile')(views.ProfileDetail.as_view()),
name='profile_detail'), name='profile_detail'),
url(r'^user/edit/$', login_required(views.ProfileUpdateSelf.as_view()), url(r'^user/edit/$', login_required(views.ProfileUpdateSelf.as_view()),
name='profile_update_self'), name='profile_update_self'),
url(r'^user/reset_api_key$', login_required(views.ResetApiKey.as_view(permanent=False)), url(r'^user/reset_api_key$', login_required(views.ResetApiKey.as_view(permanent=False)),
name='reset_api_key'), name='reset_api_key'),
# ICS Calendar - API key authentication # ICS Calendar - API key authentication
url(r'^ical/(?P<api_pk>\d+)/(?P<api_key>\w+)/rigs.ics$', api_key_required(ical.CalendarICS()), url(r'^ical/(?P<api_pk>\d+)/(?P<api_key>\w+)/rigs.ics$', api_key_required(ical.CalendarICS()),
name="ics_calendar"), name="ics_calendar"),
# API # API
url(r'^api/(?P<model>\w+)/$', login_required(views.SecureAPIRequest.as_view()), url(r'^api/(?P<model>\w+)/$', login_required(views.SecureAPIRequest.as_view()),
name="api_secure"), name="api_secure"),
url(r'^api/(?P<model>\w+)/(?P<pk>\d+)/$', login_required(views.SecureAPIRequest.as_view()), url(r'^api/(?P<model>\w+)/(?P<pk>\d+)/$', login_required(views.SecureAPIRequest.as_view()),
name="api_secure"), name="api_secure"),
# Legacy URL's # Legacy URL's
url(r'^rig/show/(?P<pk>\d+)/$', url(r'^rig/show/(?P<pk>\d+)/$',
RedirectView.as_view(permanent=True, pattern_name='event_detail')), RedirectView.as_view(permanent=True, pattern_name='event_detail')),
url(r'^bookings/$', RedirectView.as_view(permanent=True, pattern_name='rigboard')), url(r'^bookings/$', RedirectView.as_view(permanent=True, pattern_name='rigboard')),
url(r'^bookings/past/$', RedirectView.as_view(permanent=True, pattern_name='event_archive')), url(r'^bookings/past/$', RedirectView.as_view(permanent=True, pattern_name='event_archive')),
] ]

89
RIGS/views.py
View File

@@ -9,7 +9,8 @@ from django.core import serializers
from django.conf import settings from django.conf import settings
import simplejson import simplejson
from django.contrib import messages from django.contrib import messages
import datetime, pytz import datetime
import pytz
import operator import operator
from registration.views import RegistrationView from registration.views import RegistrationView
from django.views.decorators.csrf import csrf_exempt from django.views.decorators.csrf import csrf_exempt
@@ -21,6 +22,8 @@ from functools import reduce
""" """
Displays the current rig count along with a few other bits and pieces Displays the current rig count along with a few other bits and pieces
""" """
class Index(generic.TemplateView): class Index(generic.TemplateView):
template_name = 'RIGS/index.html' template_name = 'RIGS/index.html'
@@ -29,6 +32,7 @@ class Index(generic.TemplateView):
context['rig_count'] = models.Event.objects.rig_count() context['rig_count'] = models.Event.objects.rig_count()
return context return context
def login(request, **kwargs): def login(request, **kwargs):
if request.user.is_authenticated(): if request.user.is_authenticated():
next = request.GET.get('next', '/') next = request.GET.get('next', '/')
@@ -61,12 +65,13 @@ def login_embed(request, **kwargs):
return login(request, template_name="registration/login_embed.html") return login(request, template_name="registration/login_embed.html")
""" """
Called from a modal window (e.g. when an item is submitted to an event/invoice). 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 May optionally also include some javascript in a success message to cause a load of
the new information onto the page. the new information onto the page.
""" """
class CloseModal(generic.TemplateView): class CloseModal(generic.TemplateView):
template_name = 'closemodal.html' template_name = 'closemodal.html'
@@ -96,16 +101,16 @@ class PersonDetail(generic.DetailView):
class PersonCreate(generic.CreateView): class PersonCreate(generic.CreateView):
model = models.Person model = models.Person
fields = ['name','phone','email','address','notes'] fields = ['name', 'phone', 'email', 'address', 'notes']
def get_success_url(self): def get_success_url(self):
if self.request.is_ajax(): if self.request.is_ajax():
url = reverse_lazy('closemodal') url = reverse_lazy('closemodal')
update_url = str(reverse_lazy('person_update',kwargs={'pk':self.object.pk})) update_url = str(reverse_lazy('person_update', kwargs={'pk': self.object.pk}))
messages.info(self.request, "modalobject="+serializers.serialize("json", [self.object])) messages.info(self.request, "modalobject=" + serializers.serialize("json", [self.object]))
messages.info(self.request, "modalobject[0]['update_url']='"+update_url+"'") messages.info(self.request, "modalobject[0]['update_url']='" + update_url + "'")
else: else:
url = reverse_lazy('person_detail', kwargs={ url = reverse_lazy('person_detail', kwargs={
'pk': self.object.pk, 'pk': self.object.pk,
}) })
return url return url
@@ -113,16 +118,16 @@ class PersonCreate(generic.CreateView):
class PersonUpdate(generic.UpdateView): class PersonUpdate(generic.UpdateView):
model = models.Person model = models.Person
fields = ['name','phone','email','address','notes'] fields = ['name', 'phone', 'email', 'address', 'notes']
def get_success_url(self): def get_success_url(self):
if self.request.is_ajax(): if self.request.is_ajax():
url = reverse_lazy('closemodal') url = reverse_lazy('closemodal')
update_url = str(reverse_lazy('person_update',kwargs={'pk':self.object.pk})) update_url = str(reverse_lazy('person_update', kwargs={'pk': self.object.pk}))
messages.info(self.request, "modalobject="+serializers.serialize("json", [self.object])) messages.info(self.request, "modalobject=" + serializers.serialize("json", [self.object]))
messages.info(self.request, "modalobject[0]['update_url']='"+update_url+"'") messages.info(self.request, "modalobject[0]['update_url']='" + update_url + "'")
else: else:
url = reverse_lazy('person_detail', kwargs={ url = reverse_lazy('person_detail', kwargs={
'pk': self.object.pk, 'pk': self.object.pk,
}) })
return url return url
@@ -150,16 +155,16 @@ class OrganisationDetail(generic.DetailView):
class OrganisationCreate(generic.CreateView): class OrganisationCreate(generic.CreateView):
model = models.Organisation model = models.Organisation
fields = ['name','phone','email','address','notes','union_account'] fields = ['name', 'phone', 'email', 'address', 'notes', 'union_account']
def get_success_url(self): def get_success_url(self):
if self.request.is_ajax(): if self.request.is_ajax():
url = reverse_lazy('closemodal') url = reverse_lazy('closemodal')
update_url = str(reverse_lazy('organisation_update',kwargs={'pk':self.object.pk})) update_url = str(reverse_lazy('organisation_update', kwargs={'pk': self.object.pk}))
messages.info(self.request, "modalobject="+serializers.serialize("json", [self.object])) messages.info(self.request, "modalobject=" + serializers.serialize("json", [self.object]))
messages.info(self.request, "modalobject[0]['update_url']='"+update_url+"'") messages.info(self.request, "modalobject[0]['update_url']='" + update_url + "'")
else: else:
url = reverse_lazy('organisation_detail', kwargs={ url = reverse_lazy('organisation_detail', kwargs={
'pk': self.object.pk, 'pk': self.object.pk,
}) })
return url return url
@@ -167,16 +172,16 @@ class OrganisationCreate(generic.CreateView):
class OrganisationUpdate(generic.UpdateView): class OrganisationUpdate(generic.UpdateView):
model = models.Organisation model = models.Organisation
fields = ['name','phone','email','address','notes','union_account'] fields = ['name', 'phone', 'email', 'address', 'notes', 'union_account']
def get_success_url(self): def get_success_url(self):
if self.request.is_ajax(): if self.request.is_ajax():
url = reverse_lazy('closemodal') url = reverse_lazy('closemodal')
update_url = str(reverse_lazy('organisation_update',kwargs={'pk':self.object.pk})) update_url = str(reverse_lazy('organisation_update', kwargs={'pk': self.object.pk}))
messages.info(self.request, "modalobject="+serializers.serialize("json", [self.object])) messages.info(self.request, "modalobject=" + serializers.serialize("json", [self.object]))
messages.info(self.request, "modalobject[0]['update_url']='"+update_url+"'") messages.info(self.request, "modalobject[0]['update_url']='" + update_url + "'")
else: else:
url = reverse_lazy('organisation_detail', kwargs={ url = reverse_lazy('organisation_detail', kwargs={
'pk': self.object.pk, 'pk': self.object.pk,
}) })
return url return url
@@ -204,16 +209,16 @@ class VenueDetail(generic.DetailView):
class VenueCreate(generic.CreateView): class VenueCreate(generic.CreateView):
model = models.Venue model = models.Venue
fields = ['name','phone','email','address','notes','three_phase_available'] fields = ['name', 'phone', 'email', 'address', 'notes', 'three_phase_available']
def get_success_url(self): def get_success_url(self):
if self.request.is_ajax(): if self.request.is_ajax():
url = reverse_lazy('closemodal') url = reverse_lazy('closemodal')
update_url = str(reverse_lazy('venue_update',kwargs={'pk':self.object.pk})) update_url = str(reverse_lazy('venue_update', kwargs={'pk': self.object.pk}))
messages.info(self.request, "modalobject="+serializers.serialize("json", [self.object])) messages.info(self.request, "modalobject=" + serializers.serialize("json", [self.object]))
messages.info(self.request, "modalobject[0]['update_url']='"+update_url+"'") messages.info(self.request, "modalobject[0]['update_url']='" + update_url + "'")
else: else:
url = reverse_lazy('venue_detail', kwargs={ url = reverse_lazy('venue_detail', kwargs={
'pk': self.object.pk, 'pk': self.object.pk,
}) })
return url return url
@@ -221,16 +226,16 @@ class VenueCreate(generic.CreateView):
class VenueUpdate(generic.UpdateView): class VenueUpdate(generic.UpdateView):
model = models.Venue model = models.Venue
fields = ['name','phone','email','address','notes','three_phase_available'] fields = ['name', 'phone', 'email', 'address', 'notes', 'three_phase_available']
def get_success_url(self): def get_success_url(self):
if self.request.is_ajax(): if self.request.is_ajax():
url = reverse_lazy('closemodal') url = reverse_lazy('closemodal')
update_url = str(reverse_lazy('venue_update',kwargs={'pk':self.object.pk})) update_url = str(reverse_lazy('venue_update', kwargs={'pk': self.object.pk}))
messages.info(self.request, "modalobject="+serializers.serialize("json", [self.object])) messages.info(self.request, "modalobject=" + serializers.serialize("json", [self.object]))
messages.info(self.request, "modalobject[0]['update_url']='"+update_url+"'") messages.info(self.request, "modalobject[0]['update_url']='" + update_url + "'")
else: else:
url = reverse_lazy('venue_detail', kwargs={ url = reverse_lazy('venue_detail', kwargs={
'pk': self.object.pk, 'pk': self.object.pk,
}) })
return url return url
@@ -288,9 +293,9 @@ class SecureAPIRequest(generic.View):
# Supply data for autocomplete ajax request in json form # Supply data for autocomplete ajax request in json form
term = request.GET.get('term', None) term = request.GET.get('term', None)
if term: if term:
if fields is None: # Default to just name if fields is None: # Default to just name
fields = ['name'] fields = ['name']
# Build a list of Q objects for use later # Build a list of Q objects for use later
queries = [] queries = []
for part in term.split(" "): for part in term.split(" "):
@@ -300,7 +305,6 @@ class SecureAPIRequest(generic.View):
qs.append(q) qs.append(q)
queries.append(reduce(operator.or_, qs)) queries.append(reduce(operator.or_, qs))
# Build the data response list # Build the data response list
results = [] results = []
query = reduce(operator.and_, queries) query = reduce(operator.and_, queries)
@@ -311,7 +315,7 @@ class SecureAPIRequest(generic.View):
'value': o.pk, 'value': o.pk,
'label': o.name, 'label': o.name,
} }
try: # See if there is a valid update URL try: # See if there is a valid update URL
data['update'] = reverse("%s_update" % model, kwargs={'pk': o.pk}) data['update'] = reverse("%s_update" % model, kwargs={'pk': o.pk})
except NoReverseMatch: except NoReverseMatch:
pass pass
@@ -326,10 +330,10 @@ class SecureAPIRequest(generic.View):
if model == "event" and start and end: if model == "event" and start and end:
# Probably a calendar request # Probably a calendar request
start_datetime = datetime.datetime.strptime( start, "%Y-%m-%dT%H:%M:%S" ) start_datetime = datetime.datetime.strptime(start, "%Y-%m-%dT%H:%M:%S")
end_datetime = datetime.datetime.strptime( end, "%Y-%m-%dT%H:%M:%S" ) end_datetime = datetime.datetime.strptime(end, "%Y-%m-%dT%H:%M:%S")
objects = self.models[model].objects.events_in_bounds(start_datetime,end_datetime) objects = self.models[model].objects.events_in_bounds(start_datetime, end_datetime)
results = [] results = []
for item in objects: for item in objects:
@@ -349,6 +353,7 @@ class SecureAPIRequest(generic.View):
return HttpResponse(model) return HttpResponse(model)
class ProfileDetail(generic.DetailView): class ProfileDetail(generic.DetailView):
model = models.Profile model = models.Profile
@@ -361,6 +366,7 @@ class ProfileDetail(generic.DetailView):
return self.model.objects.filter(pk=pk) return self.model.objects.filter(pk=pk)
class ProfileUpdateSelf(generic.UpdateView): class ProfileUpdateSelf(generic.UpdateView):
model = models.Profile model = models.Profile
fields = ['first_name', 'last_name', 'email', 'initials', 'phone'] fields = ['first_name', 'last_name', 'email', 'initials', 'phone']
@@ -372,13 +378,14 @@ class ProfileUpdateSelf(generic.UpdateView):
return self.model.objects.filter(pk=pk) return self.model.objects.filter(pk=pk)
def get_success_url(self): def get_success_url(self):
url = reverse_lazy('profile_detail') url = reverse_lazy('profile_detail')
return url return url
class ResetApiKey(generic.RedirectView): class ResetApiKey(generic.RedirectView):
def get_redirect_url(self, *args, **kwargs): def get_redirect_url(self, *args, **kwargs):
self.request.user.api_key = self.request.user.make_api_key() self.request.user.api_key = self.request.user.make_api_key()
self.request.user.save() self.request.user.save()
return reverse_lazy('profile_detail') return reverse_lazy('profile_detail')

11
importer.py
View File

@@ -19,6 +19,7 @@ from multiprocessing import Process
# Slight fix for needing to restablish the connection # Slight fix for needing to restablish the connection
connection.close() connection.close()
def fix_email(email): def fix_email(email):
if not (email is None or email is "") and ("@" not in email): if not (email is None or email is "") and ("@" not in email):
email += "@nottingham.ac.uk" email += "@nottingham.ac.uk"
@@ -258,7 +259,7 @@ def import_nonrigs(delete=False):
if (delete): if (delete):
try: try:
models.Event.objects.filter(is_rig=False).delete() models.Event.objects.filter(is_rig=False).delete()
except: except BaseException:
pass pass
cursor = setup_cursor() cursor = setup_cursor()
if cursor is None: if cursor is None:
@@ -286,7 +287,7 @@ def import_invoices(delete=False):
try: try:
models.Invoice.objects.all().delete() models.Invoice.objects.all().delete()
models.Payment.objects.all().delete() models.Payment.objects.all().delete()
except: except BaseException:
pass pass
cursor = setup_cursor() cursor = setup_cursor()
if cursor is None: if cursor is None:
@@ -332,6 +333,7 @@ def import_invoices(delete=False):
p2.date = datetime.date.today() p2.date = datetime.date.today()
p2.save() p2.save()
@transaction.atomic @transaction.atomic
def main(): def main():
# processs = [] # processs = []
@@ -340,7 +342,7 @@ def main():
# processs.append(Process(target=import_organisations, args=(True,))) # processs.append(Process(target=import_organisations, args=(True,)))
# processs.append(Process(target=import_vat_rates, args=(True,))) # processs.append(Process(target=import_vat_rates, args=(True,)))
# processs.append(Process(target=import_venues, args=(True,))) # processs.append(Process(target=import_venues, args=(True,)))
# # Start all processs # # Start all processs
# [x.start() for x in processs] # [x.start() for x in processs]
# # Wait for all processs to finish # # Wait for all processs to finish
@@ -351,7 +353,7 @@ def main():
import_organisations(True) import_organisations(True)
import_vat_rates(True) import_vat_rates(True)
import_venues(True) import_venues(True)
import_rigs(True) import_rigs(True)
import_eventitem(True) import_eventitem(True)
import_invoices(True) import_invoices(True)
@@ -368,5 +370,6 @@ def main():
cursor = connections['default'].cursor() cursor = connections['default'].cursor()
cursor.execute(sql) cursor.execute(sql)
if __name__ == "__main__": if __name__ == "__main__":
main() main()

2
setup.cfg Normal file
View File

@@ -0,0 +1,2 @@
[pep8]
max-line-length = 320