Toolchain/Dependency Upgrade (#418)

* Upgrade to heroku-20 stack * Move some gulp deps to dev rather than prod * npm upgrade * Fix audit time check in asset audit test * Attempt at parallelising tests where possible * Add basic calendar button test Mainly to pickup on FullCalendar loading errors * Upgrade python deps * Tends to help if I push valid yaml * You valid now? * Fix whoops in requirements.txt * Change python ver * Define service in coveralls task * Run parallelised RIGS tests as one matrix job * Update python version in tests * Cache python dependencies Should majorly speedup parallelillelelised testing * Purge old vagrant config * No Ruby compass bodge, no need for rubocop! * Purge old .idea config * Switch to gh-a artifact uploading instead of imgur 'hack' For test failure screenshots. Happy now @mattysmith22? ;p * Oops, remove unused import * Exclude tests from the coverage stats Seems to be artifically deflating our stats * Refactor asset audit tests with better selectors Also fixed a silly title error with the modal * Add title checking to the slightly insane assets test * Fix unauth test to not just immediately pass out * Upload failure screenshots as individual artifacts not a zip Turns out I can't unzip things from my phone, which is a pain * Should fix asset test on CI * What about this? * What about this? Swear I spend my life jiggerypokerying the damn test suite... * Does this help the coverage be less weird? * Revert "Does this help the coverage be less weird?" This reverts commit 39ab9df836. * Use pytest as our test runner for better parallelism Also rewrote some asset tests to be in the pytest style. May do some more. Some warnings cleaned up in the process. * Bah, codestyle * Oops, remove obsolete if check * Fix screenshot uploading on CI (again) * Try this way of parallel coverage * Add codeclimate maintainability badge * Remove some unused gulp dependencies * Run asset building serverside * Still helps if I commit valid YAML * See below * Different approach to CI dependencies * Exclude node_modules from codestyle * Does this work? * Parallel parallel builds were giving me a headache, try this * Update codeclimate settings, purge some config files * Well the YAML was *syntactically* valid.... * Switch back to old coveralls method * Fix codeclimate config, mark 2 * Attempt to bodge asset test * Oops, again Probably bedtime.. * Might fix heroku building * Attempt #2 at fixing heroku * Belt and braces approach to coverage * Github, you need a Actions YAML validator! * Might fix actions? * Try ignoring some third party deprecation warnings * Another go at making coverage show up * Some template cleanup * Minor python cleanup * Import optimisation * Revert "Minor python cleanup" This reverts commit 6a4620a2e5. * Add format arg to coverage command * Ignore test directories from Heroku slug * Maybe this works to purge deps postbuild * Bunch of test refactoring * Restore signals import, screw you import optimisation * Further template refactoring * Add support for running tests with geckodriver, do this on CI * Screw you codestyle * Disable firefox tests for now That was way more errors than I expected * Run cleanup script from the right location * Plausibly fix tests * Helps if I don't delete the pipeline folder prior to collectstatic * Enable whitenoise * Can I delete pipeline here? * Allow seconds difference in assert_times_equal * Disable codeclimate * Remove not working rm command * Maybe this fixes coverage? * Try different coverage reporter * Fix search_help to need login * Made versioning magic a bit less expansive We have more apps than I thought... * Fix IDI0T error in Assets URLS * Refactor 'no access to unauthed' test to cover all of PyRIGS * Add RAs/Checklists to sample data generator * Fix some HTML errors in templates Which apparently only Django's HTML parser cares about, browsers DGAF... * Port title test to project level * Fix more HTML * Fix cable type detail
2026-04-20 17:01:46 +00:00 · 2021-01-31 04:05:33 +00:00
parent 8ad629a47e
commit 2bf0175786
157 changed files with 9507 additions and 44028 deletions
--- a/RIGS/admin.py
+++ b/RIGS/admin.py
@@ -1,19 +1,18 @@
 from django.contrib import admin
-from RIGS import models, forms
-from users import forms as user_forms
-from django.contrib.auth.admin import UserAdmin
-from django.utils.translation import gettext_lazy as _
-from reversion.admin import VersionAdmin
-
-from django.contrib.admin import helpers
-from django.template.response import TemplateResponse
 from django.contrib import messages
-from django.db import transaction
+from django.contrib.admin import helpers
+from django.contrib.auth.admin import UserAdmin
 from django.core.exceptions import ObjectDoesNotExist
+from django.db import transaction
 from django.db.models import Count
 from django.forms import ModelForm
-
+from django.template.response import TemplateResponse
+from django.utils.translation import gettext_lazy as _
 from reversion import revisions as reversion
+from reversion.admin import VersionAdmin
+
+from RIGS import models
+from users import forms as user_forms

 # Register your models here.
 admin.site.register(models.VatRate, VersionAdmin)
--- a/RIGS/finance.py
+++ b/RIGS/finance.py
@@ -1,25 +1,21 @@
 import datetime
 import re

+import reversion
+from django import forms
 from django.contrib import messages
-from django.urls import reverse_lazy
+from django.db import transaction
+from django.db.models import Q
 from django.http import Http404, HttpResponseRedirect
 from django.http import HttpResponse
 from django.shortcuts import get_object_or_404
-from django.template import RequestContext
 from django.template.loader import get_template
+from django.urls import reverse_lazy
 from django.views import generic
-from django.db.models import Q
 from z3c.rml import rml2pdf
-from django.db.models import Q
-
-from django.db import transaction
-import reversion

 from RIGS import models

-from django import forms
-
 forms.DateField.widget = forms.DateInput(attrs={'type': 'date'})


--- a/RIGS/forms.py
+++ b/RIGS/forms.py
@@ -1,17 +1,11 @@
+from datetime import datetime
+
+import simplejson
 from django import forms
-from django.utils import formats
 from django.conf import settings
 from django.core import serializers
-from django.core.mail import EmailMessage, EmailMultiAlternatives
-from django.contrib.auth.forms import UserCreationForm, UserChangeForm, AuthenticationForm, PasswordResetForm
-from django.db import transaction
-from registration.forms import RegistrationFormUniqueEmail
-from django.contrib.auth.forms import AuthenticationForm
-from captcha.fields import ReCaptchaField
-from reversion import revisions as reversion
-import simplejson
-from datetime import datetime
 from django.utils import timezone
+from reversion import revisions as reversion

 from RIGS import models

--- a/RIGS/hs.py
+++ b/RIGS/hs.py
@@ -1,11 +1,11 @@
-from RIGS import models, forms
-from django.views import generic
-from django.utils import timezone
+from django.contrib import messages
 from django.http import HttpResponseRedirect
 from django.urls import reverse_lazy
+from django.utils import timezone
+from django.views import generic
 from reversion import revisions as reversion
-from django.db.models import AutoField, ManyToOneRel
-from django.contrib import messages
+
+from RIGS import models, forms


 class EventRiskAssessmentCreate(generic.CreateView):
--- a/RIGS/ical.py
+++ b/RIGS/ical.py
@@ -1,12 +1,11 @@
-from RIGS import models, forms
-from django_ical.views import ICalFeed
-from django.db.models import Q
-from django.urls import reverse_lazy, reverse, NoReverseMatch
-from django.utils import timezone
-from django.conf import settings
-
 import datetime
+
 import pytz
+from django.conf import settings
+from django.db.models import Q
+from django_ical.views import ICalFeed
+
+from RIGS import models


 class CalendarICS(ICalFeed):
--- a/RIGS/management/commands/generateSampleData.py
+++ b/RIGS/management/commands/generateSampleData.py
@@ -1,5 +1,5 @@
-from django.core.management.base import BaseCommand, CommandError
 from django.core.management import call_command
+from django.core.management.base import BaseCommand


 class Command(BaseCommand):
--- a/RIGS/management/commands/generateSampleRIGSData.py
+++ b/RIGS/management/commands/generateSampleRIGSData.py
@@ -1,11 +1,12 @@
-from django.core.management.base import BaseCommand, CommandError
-from django.contrib.auth.models import Group, Permission
-from django.db import transaction
-from reversion import revisions as reversion
-
 import datetime
 import random

+from django.contrib.auth.models import Group, Permission
+from django.core.management.base import BaseCommand, CommandError
+from django.db import transaction
+from django.utils import timezone
+from reversion import revisions as reversion
+
 from RIGS import models


@@ -343,3 +344,30 @@ class Command(BaseCommand):
                        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())
+            if i == 1 or random.randint(0, 5) > 0:  # Event 1 and 1 in 5 have a RA
+                models.RiskAssessment.objects.create(event=newEvent, supervisor_consulted=bool(random.getrandbits(1)), nonstandard_equipment=bool(random.getrandbits(1)),
+                                                     nonstandard_use=bool(random.getrandbits(1)),
+                                                     contractors=bool(random.getrandbits(1)),
+                                                     other_companies=bool(random.getrandbits(1)),
+                                                     crew_fatigue=bool(random.getrandbits(1)),
+                                                     big_power=bool(random.getrandbits(1)),
+                                                     generators=bool(random.getrandbits(1)),
+                                                     other_companies_power=bool(random.getrandbits(1)),
+                                                     nonstandard_equipment_power=bool(random.getrandbits(1)),
+                                                     multiple_electrical_environments=bool(random.getrandbits(1)),
+                                                     noise_monitoring=bool(random.getrandbits(1)),
+                                                     known_venue=bool(random.getrandbits(1)),
+                                                     safe_loading=bool(random.getrandbits(1)),
+                                                     safe_storage=bool(random.getrandbits(1)),
+                                                     area_outside_of_control=bool(random.getrandbits(1)),
+                                                     barrier_required=bool(random.getrandbits(1)),
+                                                     nonstandard_emergency_procedure=bool(random.getrandbits(1)),
+                                                     special_structures=bool(random.getrandbits(1)),
+                                                     suspended_structures=bool(random.getrandbits(1)),
+                                                     outside=bool(random.getrandbits(1)))
+                if i == 0 or random.randint(0, 1) > 0:  # Event 1 and 1 in 10 have a Checklist
+                    models.EventChecklist.objects.create(event=newEvent, power_mic=random.choice(self.profiles), safe_parking=bool(random.getrandbits(1)),
+                                                         safe_packing=bool(random.getrandbits(1)), exits=bool(random.getrandbits(1)), trip_hazard=bool(random.getrandbits(1)), warning_signs=bool(random.getrandbits(1)),
+                                                         ear_plugs=bool(random.getrandbits(1)), hs_location="Locked away safely",
+                                                         extinguishers_location="Somewhere, I forgot", earthing=bool(random.getrandbits(1)), pat=bool(random.getrandbits(1)),
+                                                         date=timezone.now(), venue=random.choice(self.venues))
--- a/RIGS/models.py
+++ b/RIGS/models.py
@@ -1,25 +1,22 @@
 import datetime
 import hashlib
-import pytz
+import random
+import string
+from collections import Counter
+from decimal import Decimal
+from urllib.parse import urlparse

+import pytz
 from django import forms
-from django.db import models
-from django.contrib.auth.models import AbstractUser
 from django.conf import settings
+from django.contrib.auth.models import AbstractUser
+from django.core.exceptions import ValidationError
+from django.db import models
+from django.urls import reverse_lazy
 from django.utils import timezone
 from django.utils.functional import cached_property
 from reversion import revisions as reversion
 from reversion.models import Version
-import string
-
-import random
-from collections import Counter
-from decimal import Decimal
-
-from django.core.exceptions import ValidationError
-from django.urls import reverse_lazy
-
-from urllib.parse import urlparse


 class Profile(AbstractUser):
--- a/RIGS/rigboard.py
+++ b/RIGS/rigboard.py
@@ -1,36 +1,33 @@
-from io import BytesIO
-import urllib.request
-import urllib.error
-import urllib.parse
-
-from django.contrib.staticfiles.storage import staticfiles_storage
-from django.core.mail import EmailMessage, EmailMultiAlternatives
-from django.views import generic
-from django.shortcuts import get_object_or_404
-from django.http import HttpResponseRedirect
-from django.template import RequestContext
-from django.template.loader import get_template
-from django.conf import settings
-from django.urls import reverse
-from django.urls import reverse_lazy
-from django.core import signing
-from django.http import HttpResponse
-from django.core.exceptions import SuspiciousOperation
-from django.db.models import Q
-from django.contrib import messages
-from django.utils.decorators import method_decorator
-from django.views.decorators.csrf import csrf_exempt
-from django.utils import timezone
-from z3c.rml import rml2pdf
-from PyPDF2 import PdfFileMerger, PdfFileReader
-import simplejson
-import premailer
-
-from RIGS import models, forms
-from PyRIGS import decorators
+import copy
 import datetime
 import re
-import copy
+import urllib.error
+import urllib.parse
+import urllib.request
+from io import BytesIO
+
+import premailer
+import simplejson
+from PyPDF2 import PdfFileMerger, PdfFileReader
+from django.conf import settings
+from django.contrib import messages
+from django.contrib.staticfiles.storage import staticfiles_storage
+from django.core import signing
+from django.core.exceptions import SuspiciousOperation
+from django.core.mail import EmailMultiAlternatives
+from django.db.models import Q
+from django.http import HttpResponse
+from django.shortcuts import get_object_or_404
+from django.template.loader import get_template
+from django.urls import reverse
+from django.urls import reverse_lazy
+from django.utils import timezone
+from django.utils.decorators import method_decorator
+from django.views import generic
+from z3c.rml import rml2pdf
+
+from PyRIGS import decorators
+from RIGS import models, forms

 __author__ = 'ghost'

@@ -294,7 +291,7 @@ class EventAuthorise(generic.UpdateView):
        self.template_name = self.success_template
        messages.add_message(self.request, messages.SUCCESS,
                             'Success! Your event has been authorised. ' +
-                             'You will also receive email confirmation to %s.' % (self.object.email))
+                             'You will also receive email confirmation to %s.' % self.object.email)
        return self.render_to_response(self.get_context_data())

    @property
--- a/RIGS/signals.py
+++ b/RIGS/signals.py
@@ -1,25 +1,24 @@
-import datetime
 import re
-import urllib.request
 import urllib.error
 import urllib.parse
+import urllib.request
 from io import BytesIO

-from django.db.models.signals import post_save
 from PyPDF2 import PdfFileReader, PdfFileMerger
 from django.conf import settings
 from django.contrib.staticfiles.storage import staticfiles_storage
-from django.core.mail import EmailMessage, EmailMultiAlternatives
 from django.core.cache import cache
+from django.core.mail import EmailMessage, EmailMultiAlternatives
+from django.db.models.signals import post_save
 from django.template.loader import get_template
 from django.urls import reverse
 from django.utils import timezone
-from registration.signals import user_activated
 from premailer import Premailer
+from registration.signals import user_activated
+from reversion import revisions as reversion
 from z3c.rml import rml2pdf

 from RIGS import models
-from reversion import revisions as reversion


 def send_eventauthorisation_success_email(instance):
--- a/RIGS/static/css/ajax-bootstrap-select.css
+++ b/RIGS/static/css/ajax-bootstrap-select.css
@@ -1,28 +0,0 @@
-/*!
- * Ajax Bootstrap Select
- *
- * Extends existing [Bootstrap Select] implementations by adding the ability to search via AJAX requests as you type. Originally for CROSCON.
- *
- * @version 1.4.5
- * @author Adam Heim - https://github.com/truckingsim
- * @link https://github.com/truckingsim/Ajax-Bootstrap-Select
- * @copyright 2019 Adam Heim
- * @license Released under the MIT license.
- *
- * Contributors:
- *   Mark Carver - https://github.com/markcarver
- *
- * Last build: 2019-04-23 12:18:56 PM EDT
- */
-.bootstrap-select .status {
-  background: #f0f0f0;
-  clear: both;
-  color: #999;
-  font-size: 11px;
-  font-style: italic;
-  font-weight: 500;
-  line-height: 1;
-  margin-bottom: -5px;
-  padding: 10px 20px; }
-
-/*# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImFqYXgtYm9vdHN0cmFwLXNlbGVjdC5jc3MiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7Ozs7Ozs7OztFQWVFO0FBQ0Y7RUFDRSxtQkFBbUI7RUFDbkIsV0FBVztFQUNYLFdBQVc7RUFDWCxlQUFlO0VBQ2Ysa0JBQWtCO0VBQ2xCLGdCQUFnQjtFQUNoQixjQUFjO0VBQ2QsbUJBQW1CO0VBQ25CLGtCQUFrQixFQUFBIiwiZmlsZSI6ImFqYXgtYm9vdHN0cmFwLXNlbGVjdC5jc3MiLCJzb3VyY2VzQ29udGVudCI6WyIvKiFcbiAqIEFqYXggQm9vdHN0cmFwIFNlbGVjdFxuICpcbiAqIEV4dGVuZHMgZXhpc3RpbmcgW0Jvb3RzdHJhcCBTZWxlY3RdIGltcGxlbWVudGF0aW9ucyBieSBhZGRpbmcgdGhlIGFiaWxpdHkgdG8gc2VhcmNoIHZpYSBBSkFYIHJlcXVlc3RzIGFzIHlvdSB0eXBlLiBPcmlnaW5hbGx5IGZvciBDUk9TQ09OLlxuICpcbiAqIEB2ZXJzaW9uIDEuNC41XG4gKiBAYXV0aG9yIEFkYW0gSGVpbSAtIGh0dHBzOi8vZ2l0aHViLmNvbS90cnVja2luZ3NpbVxuICogQGxpbmsgaHR0cHM6Ly9naXRodWIuY29tL3RydWNraW5nc2ltL0FqYXgtQm9vdHN0cmFwLVNlbGVjdFxuICogQGNvcHlyaWdodCAyMDE5IEFkYW0gSGVpbVxuICogQGxpY2Vuc2UgUmVsZWFzZWQgdW5kZXIgdGhlIE1JVCBsaWNlbnNlLlxuICpcbiAqIENvbnRyaWJ1dG9yczpcbiAqICAgTWFyayBDYXJ2ZXIgLSBodHRwczovL2dpdGh1Yi5jb20vbWFya2NhcnZlclxuICpcbiAqIExhc3QgYnVpbGQ6IDIwMTktMDQtMjMgMTI6MTg6NTYgUE0gRURUXG4gKi9cbi5ib290c3RyYXAtc2VsZWN0IC5zdGF0dXMge1xuICBiYWNrZ3JvdW5kOiAjZjBmMGYwO1xuICBjbGVhcjogYm90aDtcbiAgY29sb3I6ICM5OTk7XG4gIGZvbnQtc2l6ZTogMTFweDtcbiAgZm9udC1zdHlsZTogaXRhbGljO1xuICBmb250LXdlaWdodDogNTAwO1xuICBsaW5lLWhlaWdodDogMTtcbiAgbWFyZ2luLWJvdHRvbTogLTVweDtcbiAgcGFkZGluZzogMTBweCAyMHB4O1xufVxuIl19 */
--- a/RIGS/static/css/ajax-bootstrap-select.min.css
+++ b/RIGS/static/css/ajax-bootstrap-select.min.css
@@ -1,28 +0,0 @@
-/*!
- * Ajax Bootstrap Select
- *
- * Extends existing [Bootstrap Select] implementations by adding the ability to search via AJAX requests as you type. Originally for CROSCON.
- *
- * @version 1.4.5
- * @author Adam Heim - https://github.com/truckingsim
- * @link https://github.com/truckingsim/Ajax-Bootstrap-Select
- * @copyright 2019 Adam Heim
- * @license Released under the MIT license.
- *
- * Contributors:
- *   Mark Carver - https://github.com/markcarver
- *
- * Last build: 2019-04-23 12:18:56 PM EDT
- */
-.bootstrap-select .status {
-  background: #f0f0f0;
-  clear: both;
-  color: #999;
-  font-size: 11px;
-  font-style: italic;
-  font-weight: 500;
-  line-height: 1;
-  margin-bottom: -5px;
-  padding: 10px 20px; }
-
-/*# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImFqYXgtYm9vdHN0cmFwLXNlbGVjdC5taW4uY3NzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7Ozs7Ozs7Ozs7RUFlRTtBQUFDO0VBQTBCLG1CQUFrQjtFQUFDLFdBQVU7RUFBQyxXQUFVO0VBQUMsZUFBYztFQUFDLGtCQUFpQjtFQUFDLGdCQUFlO0VBQUMsY0FBYTtFQUFDLG1CQUFrQjtFQUFDLGtCQUFpQixFQUFBIiwiZmlsZSI6ImFqYXgtYm9vdHN0cmFwLXNlbGVjdC5taW4uY3NzIiwic291cmNlc0NvbnRlbnQiOlsiLyohXG4gKiBBamF4IEJvb3RzdHJhcCBTZWxlY3RcbiAqXG4gKiBFeHRlbmRzIGV4aXN0aW5nIFtCb290c3RyYXAgU2VsZWN0XSBpbXBsZW1lbnRhdGlvbnMgYnkgYWRkaW5nIHRoZSBhYmlsaXR5IHRvIHNlYXJjaCB2aWEgQUpBWCByZXF1ZXN0cyBhcyB5b3UgdHlwZS4gT3JpZ2luYWxseSBmb3IgQ1JPU0NPTi5cbiAqXG4gKiBAdmVyc2lvbiAxLjQuNVxuICogQGF1dGhvciBBZGFtIEhlaW0gLSBodHRwczovL2dpdGh1Yi5jb20vdHJ1Y2tpbmdzaW1cbiAqIEBsaW5rIGh0dHBzOi8vZ2l0aHViLmNvbS90cnVja2luZ3NpbS9BamF4LUJvb3RzdHJhcC1TZWxlY3RcbiAqIEBjb3B5cmlnaHQgMjAxOSBBZGFtIEhlaW1cbiAqIEBsaWNlbnNlIFJlbGVhc2VkIHVuZGVyIHRoZSBNSVQgbGljZW5zZS5cbiAqXG4gKiBDb250cmlidXRvcnM6XG4gKiAgIE1hcmsgQ2FydmVyIC0gaHR0cHM6Ly9naXRodWIuY29tL21hcmtjYXJ2ZXJcbiAqXG4gKiBMYXN0IGJ1aWxkOiAyMDE5LTA0LTIzIDEyOjE4OjU2IFBNIEVEVFxuICovLmJvb3RzdHJhcC1zZWxlY3QgLnN0YXR1c3tiYWNrZ3JvdW5kOiNmMGYwZjA7Y2xlYXI6Ym90aDtjb2xvcjojOTk5O2ZvbnQtc2l6ZToxMXB4O2ZvbnQtc3R5bGU6aXRhbGljO2ZvbnQtd2VpZ2h0OjUwMDtsaW5lLWhlaWdodDoxO21hcmdpbi1ib3R0b206LTVweDtwYWRkaW5nOjEwcHggMjBweH0iXX0= */
--- a/RIGS/static/css/autocomplete.css
+++ b/RIGS/static/css/autocomplete.css
@@ -1,23 +0,0 @@
-.autocomplete {
-  background: white;
-  z-index: 1000;
-  font: 14px/22px "-apple-system", BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
-  overflow: auto;
-  box-sizing: border-box;
-  border: 1px solid rgba(50, 50, 50, 0.6); }
-
-.autocomplete * {
-  font: inherit; }
-
-.autocomplete > div {
-  padding: 0 4px; }
-
-.autocomplete .group {
-  background: #eee; }
-
-.autocomplete > div:hover:not(.group),
-.autocomplete > div.selected {
-  background: #81ca91;
-  cursor: pointer; }
-
-/*# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImF1dG9jb21wbGV0ZS5jc3MiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0E7RUFDSSxpQkFBaUI7RUFDakIsYUFBYTtFQUNiLDRHQUE0RztFQUM1RyxjQUFjO0VBQ2Qsc0JBQXNCO0VBQ3RCLHVDQUF1QyxFQUFBOztBQUczQztFQUNJLGFBQWEsRUFBQTs7QUFHakI7RUFDSSxjQUFjLEVBQUE7O0FBR2xCO0VBQ0ksZ0JBQWdCLEVBQUE7O0FBR3BCOztFQUVJLG1CQUFtQjtFQUNuQixlQUFlLEVBQUEiLCJmaWxlIjoiYXV0b2NvbXBsZXRlLmNzcyIsInNvdXJjZXNDb250ZW50IjpbIlxyXG4uYXV0b2NvbXBsZXRlIHtcclxuICAgIGJhY2tncm91bmQ6IHdoaXRlO1xyXG4gICAgei1pbmRleDogMTAwMDtcclxuICAgIGZvbnQ6IDE0cHgvMjJweCBcIi1hcHBsZS1zeXN0ZW1cIiwgQmxpbmtNYWNTeXN0ZW1Gb250LCBcIlNlZ29lIFVJXCIsIFJvYm90bywgXCJIZWx2ZXRpY2EgTmV1ZVwiLCBBcmlhbCwgc2Fucy1zZXJpZjtcclxuICAgIG92ZXJmbG93OiBhdXRvO1xyXG4gICAgYm94LXNpemluZzogYm9yZGVyLWJveDtcclxuICAgIGJvcmRlcjogMXB4IHNvbGlkIHJnYmEoNTAsIDUwLCA1MCwgMC42KTtcclxufVxyXG5cclxuLmF1dG9jb21wbGV0ZSAqIHtcclxuICAgIGZvbnQ6IGluaGVyaXQ7XHJcbn1cclxuXHJcbi5hdXRvY29tcGxldGUgPiBkaXYge1xyXG4gICAgcGFkZGluZzogMCA0cHg7XHJcbn1cclxuXHJcbi5hdXRvY29tcGxldGUgLmdyb3VwIHtcclxuICAgIGJhY2tncm91bmQ6ICNlZWU7XHJcbn1cclxuXHJcbi5hdXRvY29tcGxldGUgPiBkaXY6aG92ZXI6bm90KC5ncm91cCksXHJcbi5hdXRvY29tcGxldGUgPiBkaXYuc2VsZWN0ZWQge1xyXG4gICAgYmFja2dyb3VuZDogIzgxY2E5MTtcclxuICAgIGN1cnNvcjogcG9pbnRlcjtcclxufVxyXG5cclxuIl19 */
--- a/RIGS/static/css/bootstrap-datetimepicker.min.css
+++ b/RIGS/static/css/bootstrap-datetimepicker.min.css
--- a/RIGS/static/css/bootstrap-select.css
+++ b/RIGS/static/css/bootstrap-select.css
--- a/RIGS/static/css/dark_screen.css
+++ b/RIGS/static/css/dark_screen.css
--- a/RIGS/static/css/email.css
+++ b/RIGS/static/css/email.css
@@ -1,39 +0,0 @@
-body {
-  margin: 0px; }
-
-.main-table {
-  width: 100%;
-  border-collapse: collapse; }
-
-.client-header {
-  background-image: url("https://www.nottinghamtec.co.uk/imgs/wof2014-1.jpg");
-  background-color: #222;
-  background-repeat: no-repeat;
-  background-position: center;
-  width: 100%;
-  margin-bottom: 28px; }
-  .client-header .logos {
-    width: 100%;
-    max-width: 640px; }
-  .client-header img {
-    height: 110px; }
-
-.content-container {
-  width: 100%; }
-  .content-container .content {
-    font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
-    width: 100%;
-    max-width: 600px;
-    padding: 10px;
-    text-align: left; }
-    .content-container .content .button-container {
-      width: 100%; }
-      .content-container .content .button-container .button {
-        padding: 6px 12px;
-        background-color: #357ebf;
-        border-radius: 4px; }
-        .content-container .content .button-container .button a {
-          color: #fff;
-          text-decoration: none; }
-
-/*# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImVtYWlsLnNjc3MiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUE7RUFDRSxXQUFXLEVBQUE7O0FBR2I7RUFDRSxXQUFXO0VBQ1gseUJBQXlCLEVBQUE7O0FBSTNCO0VBQ0UsMkVBQTJFO0VBQzNFLHNCQUFzQjtFQUN0Qiw0QkFBNEI7RUFDNUIsMkJBQTJCO0VBRTNCLFdBQVc7RUFFWCxtQkFBbUIsRUFBQTtFQVJyQjtJQVdJLFdBQVc7SUFDWCxnQkFBZ0IsRUFBQTtFQVpwQjtJQWdCSSxhQUFhLEVBQUE7O0FBSWpCO0VBQ0UsV0FBVyxFQUFBO0VBRGI7SUFJSSx3RUFBd0U7SUFFeEUsV0FBVztJQUNYLGdCQUFnQjtJQUNoQixhQUFhO0lBQ2IsZ0JBQWdCLEVBQUE7SUFUcEI7TUFZTSxXQUFXLEVBQUE7TUFaakI7UUFlUSxpQkFBaUI7UUFDakIseUJBaERjO1FBaURkLGtCQUFrQixFQUFBO1FBakIxQjtVQW9CVSxXQUFXO1VBQ1gscUJBQXFCLEVBQUEiLCJmaWxlIjoiZW1haWwuY3NzIiwic291cmNlc0NvbnRlbnQiOlsiJGJ1dHRvbl9jb2xvcjogIzM1N2ViZjtcblxuYm9keXtcbiAgbWFyZ2luOiAwcHg7XG59XG5cbi5tYWluLXRhYmxle1xuICB3aWR0aDogMTAwJTtcbiAgYm9yZGVyLWNvbGxhcHNlOiBjb2xsYXBzZTtcblxufVxuXG4uY2xpZW50LWhlYWRlciB7XG4gIGJhY2tncm91bmQtaW1hZ2U6IHVybChcImh0dHBzOi8vd3d3Lm5vdHRpbmdoYW10ZWMuY28udWsvaW1ncy93b2YyMDE0LTEuanBnXCIpO1xuICBiYWNrZ3JvdW5kLWNvbG9yOiAjMjIyO1xuICBiYWNrZ3JvdW5kLXJlcGVhdDogbm8tcmVwZWF0O1xuICBiYWNrZ3JvdW5kLXBvc2l0aW9uOiBjZW50ZXI7XG5cbiAgd2lkdGg6IDEwMCU7XG5cbiAgbWFyZ2luLWJvdHRvbTogMjhweDtcblxuICAubG9nb3N7XG4gICAgd2lkdGg6IDEwMCU7XG4gICAgbWF4LXdpZHRoOiA2NDBweDtcbiAgfVxuXG4gIGltZyB7XG4gICAgaGVpZ2h0OiAxMTBweDtcbiAgfVxufVxuXG4uY29udGVudC1jb250YWluZXJ7XG4gIHdpZHRoOiAxMDAlO1xuXG4gIC5jb250ZW50IHtcbiAgICBmb250LWZhbWlseTogXCJPcGVuIFNhbnNcIiwgXCJIZWx2ZXRpY2EgTmV1ZVwiLCBIZWx2ZXRpY2EsIEFyaWFsLCBzYW5zLXNlcmlmO1xuXG4gICAgd2lkdGg6IDEwMCU7XG4gICAgbWF4LXdpZHRoOiA2MDBweDtcbiAgICBwYWRkaW5nOiAxMHB4O1xuICAgIHRleHQtYWxpZ246IGxlZnQ7XG5cbiAgICAuYnV0dG9uLWNvbnRhaW5lcntcbiAgICAgIHdpZHRoOiAxMDAlO1xuXG4gICAgICAuYnV0dG9uIHtcbiAgICAgICAgcGFkZGluZzogNnB4IDEycHg7XG4gICAgICAgIGJhY2tncm91bmQtY29sb3I6ICRidXR0b25fY29sb3I7XG4gICAgICAgIGJvcmRlci1yYWRpdXM6IDRweDtcblxuICAgICAgICBhIHtcbiAgICAgICAgICBjb2xvcjogI2ZmZjtcbiAgICAgICAgICB0ZXh0LWRlY29yYXRpb246IG5vbmU7XG4gICAgICAgIH1cblxuICAgICAgfVxuXG4gICAgfVxuXG4gIH1cbn1cblxuIl19 */
--- a/RIGS/static/css/flatpickr.css
+++ b/RIGS/static/css/flatpickr.css
--- a/RIGS/static/css/fullcalendar.css
+++ b/RIGS/static/css/fullcalendar.css
--- a/RIGS/static/css/fullcalendar.print.css
+++ b/RIGS/static/css/fullcalendar.print.css
--- a/RIGS/static/css/ie.css
+++ b/RIGS/static/css/ie.css
@@ -1,2 +0,0 @@
-
-/*# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiIsImZpbGUiOiJpZS5jc3MiLCJzb3VyY2VzQ29udGVudCI6W119 */
--- a/RIGS/static/css/main.css
+++ b/RIGS/static/css/main.css
--- a/RIGS/static/css/main.min.css
+++ b/RIGS/static/css/main.min.css
--- a/RIGS/static/css/print.css
+++ b/RIGS/static/css/print.css
--- a/RIGS/static/css/screen.css
+++ b/RIGS/static/css/screen.css
--- a/RIGS/static/js/ajax-bootstrap-select.js
+++ b/RIGS/static/js/ajax-bootstrap-select.js
--- a/RIGS/static/js/alert.js
+++ b/RIGS/static/js/alert.js
@@ -1,6 +0,0 @@
-/*!
-  * Bootstrap alert.js v4.5.2 (https://getbootstrap.com/)
-  * Copyright 2011-2020 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
-  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
-  */
-!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t(require("jquery"),require("./util.js")):"function"==typeof define&&define.amd?define(["jquery","./util.js"],t):(e="undefined"!=typeof globalThis?globalThis:e||self).Alert=t(e.jQuery,e.Util)}(this,(function(e,t){"use strict";function n(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}e=e&&Object.prototype.hasOwnProperty.call(e,"default")?e.default:e,t=t&&Object.prototype.hasOwnProperty.call(t,"default")?t.default:t;var r=e.fn.alert,o=function(){function r(e){this._element=e}var o,l,i,a=r.prototype;return a.close=function(e){var t=this._element;e&&(t=this._getRootElement(e)),this._triggerCloseEvent(t).isDefaultPrevented()||this._removeElement(t)},a.dispose=function(){e.removeData(this._element,"bs.alert"),this._element=null},a._getRootElement=function(n){var r=t.getSelectorFromElement(n),o=!1;return r&&(o=document.querySelector(r)),o||(o=e(n).closest(".alert")[0]),o},a._triggerCloseEvent=function(t){var n=e.Event("close.bs.alert");return e(t).trigger(n),n},a._removeElement=function(n){var r=this;if(e(n).removeClass("show"),e(n).hasClass("fade")){var o=t.getTransitionDurationFromElement(n);e(n).one(t.TRANSITION_END,(function(e){return r._destroyElement(n,e)})).emulateTransitionEnd(o)}else this._destroyElement(n)},a._destroyElement=function(t){e(t).detach().trigger("closed.bs.alert").remove()},r._jQueryInterface=function(t){return this.each((function(){var n=e(this),o=n.data("bs.alert");o||(o=new r(this),n.data("bs.alert",o)),"close"===t&&o[t](this)}))},r._handleDismiss=function(e){return function(t){t&&t.preventDefault(),e.close(this)}},o=r,i=[{key:"VERSION",get:function(){return"4.5.2"}}],(l=null)&&n(o.prototype,l),i&&n(o,i),r}();return e(document).on("click.bs.alert.data-api",'[data-dismiss="alert"]',o._handleDismiss(new o)),e.fn.alert=o._jQueryInterface,e.fn.alert.Constructor=o,e.fn.alert.noConflict=function(){return e.fn.alert=r,o._jQueryInterface},o}));
--- a/RIGS/static/js/all.js
+++ b/RIGS/static/js/all.js
--- a/RIGS/static/js/asteroids.min.js
+++ b/RIGS/static/js/asteroids.min.js
--- a/RIGS/static/js/autocompleter.js
+++ b/RIGS/static/js/autocompleter.js
@@ -1 +0,0 @@
-function changeSelectedValue(e,t,a,r){e.find("option").remove(),e.append($("<option></option>").attr("value",t).text(a).data("update_url",r)),e.selectpicker("render"),e.selectpicker("refresh"),e.selectpicker("val",t),e.change()}function refreshUpdateHref(e){targetObject=$("#"+e.attr("id")+"-update"),update_url=$("option:selected",e).data("update_url"),""==update_url?(targetObject.removeAttr("href"),targetObject.addClass("disabled")):(targetObject.prop("href",update_url),targetObject.removeClass("disabled"))}function initPicker(e){var t={ajax:{url:e.data("sourceurl"),type:"GET",dataType:"json",data:{term:"{{{q}}}"}},locale:{emptyTitle:""},clearOnEmpty:!1,preprocessData:function(e){var t,a=e.length,r=[];if(r.push({text:clearSelectionLabel,value:"",data:{update_url:"",subtext:""}}),a)for(t=0;t<a;t++)r.push($.extend(!0,e[t],{text:e[t].label,value:e[t].pk,data:{update_url:e[t].update,subtext:""}}));return r}};e.prepend($("<option></option>").attr("value","").text(clearSelectionLabel).data("update_url","")),e.selectpicker().ajaxSelectPicker(t),e.change((function(){refreshUpdateHref(e)})),refreshUpdateHref(e)}$(document).ready((function(){clearSelectionLabel="(no selection)",$(".selectpicker").each((function(){initPicker($(this))})),$("#modal").on("hide.bs.modal",(function(e){null!=modaltarget&&""!=modalobject&&changeSelectedValue($(modaltarget),modalobject[0].pk,modalobject[0].fields.name,modalobject[0].update_url)}))}));
--- a/RIGS/static/js/bootstrap-datetimepicker.js
+++ b/RIGS/static/js/bootstrap-datetimepicker.js
--- a/RIGS/static/js/bootstrap-select.js
+++ b/RIGS/static/js/bootstrap-select.js
--- a/RIGS/static/js/clipboard.min.js
+++ b/RIGS/static/js/clipboard.min.js
--- a/RIGS/static/js/collapse.js
+++ b/RIGS/static/js/collapse.js
--- a/RIGS/static/js/dark-mode-switch.min.js
+++ b/RIGS/static/js/dark-mode-switch.min.js
@@ -1 +0,0 @@
-!function(){var t,e=document.getElementById("darkSwitch");e&&(t=null!==localStorage.getItem("darkSwitch")&&"dark"===localStorage.getItem("darkSwitch"),(e.checked=t)?document.body.setAttribute("data-theme","dark"):document.body.removeAttribute("data-theme"),e.addEventListener("change",(function(t){e.checked?(document.body.setAttribute("data-theme","dark"),localStorage.setItem("darkSwitch","dark")):(document.body.removeAttribute("data-theme"),localStorage.removeItem("darkSwitch"))})))}();
--- a/RIGS/static/js/datetime-fix.js
+++ b/RIGS/static/js/datetime-fix.js
@@ -1 +0,0 @@
-$(document).ready((function(){var t;(t=document.createElement("input")).setAttribute("type","datetime-local"),("text"===t.type||navigator.userAgent.toLowerCase().indexOf("firefox")>-1)&&($("<link>").appendTo("head").attr({type:"text/css",rel:"stylesheet"}).attr("href",'{% static "css/flatpickr.css" %}'),$.when($.getScript('{% static "js/flatpickr.min.js" %}'),$.Deferred((function(t){$(t.resolve)}))).done((function(){$("input[type=datetime-local]").attr("type","text").flatpickr({dateFormat:"Y-m-dTH:m",enableTime:!0,altInput:!0,altFormat:"d/m/y H:m"})})))}));
--- a/RIGS/static/js/dropdown.js
+++ b/RIGS/static/js/dropdown.js
--- a/RIGS/static/js/flatpickr.min.js
+++ b/RIGS/static/js/flatpickr.min.js
--- a/RIGS/static/js/fullcalendar.js
+++ b/RIGS/static/js/fullcalendar.js
--- a/RIGS/static/js/interaction.js
+++ b/RIGS/static/js/interaction.js
@@ -1 +0,0 @@
-function setupItemTable(t){objectitems=JSON.parse(t),$.each(objectitems,(function(t,e){objectitems[t]=JSON.parse(e)})),newitem=-1}function nl2br(t,e){return(t+"").replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g,"$1"+(e||void 0===e?"<br />":"<br>")+"$2")}function escapeHtml(t){return $("<div/>").text(t).html()}function updatePrices(){var t=0;for(var e in objectitems){var i=objectitems[e].fields,a=i.cost*i.quantity;$("#item-"+e+" .sub-total").html(parseFloat(a).toFixed(2)).data("subtotal",a),t+=Number(a)}$("#sumtotal").text(parseFloat(t).toFixed(2));var o=t*Number($("#vat-rate").data("rate"));$("#vat").text(parseFloat(o).toFixed(2)),$("#total").text(parseFloat(t+o).toFixed(2))}$("#item-table").on("click",".item-delete",(function(){delete objectitems[$(this).data("pk")],$("#item-"+$(this).data("pk")).remove(),updatePrices()})),$("#item-table").on("click",".item-add",(function(){$("#item-form").data("pk",newitem),$("#item_name").val(""),$("#item_description").val(""),$("#item_quantity").val(""),$("#item_cost").val(""),$($(this).data("target")).modal("show")})),$("#item-table").on("click",".item-edit",(function(){var t=$(this).data("pk");$("#item-form").data("pk",t);var e=objectitems[t].fields;$("#item_name").val(e.name),$("#item_description").val(e.description),$("#item_quantity").val(e.quantity),$("#item_cost").val(e.cost),$($(this).data("target")).modal("show")})),$("body").on("submit","#item-form",(function(t){t.preventDefault();var e,i=$(this).data("pk");if($("#itemModal").modal("hide"),i==newitem--){(e=new Object).name=$("#item_name").val(),e.description=$("#item_description").val(),e.cost=$("#item_cost").val(),e.quantity=$("#item_quantity").val();var a=0;for(item in objectitems)a++;e.order=a,objectitems[i]=new Object,objectitems[i].fields=e,$("#new-item-row").clone().attr("id","item-"+i).data("pk",i).appendTo("#item-table-body"),$("#item-"+i+" .item-delete, #item-"+i+" .item-edit").data("pk",i)}else(e=objectitems[i].fields).name=$("#item_name").val(),e.description=$("#item_description").val(),e.cost=$("#item_cost").val(),e.quantity=$("#item_quantity").val(),objectitems[i].fields=e;$row=$("#item-"+i),$row.find(".name").html(escapeHtml(e.name)),$row.find(".description").html(nl2br(escapeHtml(e.description))),$row.find(".cost").html(parseFloat(e.cost).toFixed(2)),$row.find(".quantity").html(e.quantity),updatePrices()})),$("body").on("submit",".itemised_form",(function(t){$("#id_items_json").val(JSON.stringify(objectitems))}));var fixHelper=function(t,e){return e.children().each((function(){$(this).width($(this).width())})),e};$("#item-table tbody").sortable({helper:fixHelper,update:function(t,e){info=$(this).sortable("toArray"),itemorder=new Array,$.each(info,(function(t,e){pk=$("#"+e).data("pk"),objectitems[pk].fields.order=t}))}});
--- a/RIGS/static/js/jquery-ui.js
+++ b/RIGS/static/js/jquery-ui.js
--- a/RIGS/static/js/jquery.js
+++ b/RIGS/static/js/jquery.js
--- a/RIGS/static/js/konami.js
+++ b/RIGS/static/js/konami.js
@@ -1 +0,0 @@
-var Konami=function(t){var e={addEvent:function(t,e,n,o){t.addEventListener?t.addEventListener(e,n,!1):t.attachEvent&&(t["e"+e+n]=n,t[e+n]=function(){t["e"+e+n](window.event,o)},t.attachEvent("on"+e,t[e+n]))},removeEvent:function(t,e,n){t.removeEventListener?t.removeEventListener(e,n):t.attachEvent&&t.detachEvent(e)},input:"",pattern:"38384040373937396665",keydownHandler:function(t,n){if(n&&(e=n),e.input+=t?t.keyCode:event.keyCode,e.input.length>e.pattern.length&&(e.input=e.input.substr(e.input.length-e.pattern.length)),e.input===e.pattern)return e.code(e._currentLink),e.input="",t.preventDefault(),!1},load:function(t){this._currentLink=t,this.addEvent(document,"keydown",this.keydownHandler,this),this.iphone.load(t)},unload:function(){this.removeEvent(document,"keydown",this.keydownHandler),this.iphone.unload()},code:function(t){window.location=t},iphone:{start_x:0,start_y:0,stop_x:0,stop_y:0,tap:!1,capture:!1,orig_keys:"",keys:["UP","UP","DOWN","DOWN","LEFT","RIGHT","LEFT","RIGHT","TAP","TAP"],input:[],code:function(t){e.code(t)},touchmoveHandler:function(t){if(1===t.touches.length&&!0===e.iphone.capture){var n=t.touches[0];e.iphone.stop_x=n.pageX,e.iphone.stop_y=n.pageY,e.iphone.tap=!1,e.iphone.capture=!1,e.iphone.check_direction()}},touchendHandler:function(){if(e.iphone.input.push(e.iphone.check_direction()),e.iphone.input.length>e.iphone.keys.length&&e.iphone.input.shift(),e.iphone.input.length===e.iphone.keys.length){for(var t=!0,n=0;n<e.iphone.keys.length;n++)e.iphone.input[n]!==e.iphone.keys[n]&&(t=!1);t&&e.iphone.code(e._currentLink)}},touchstartHandler:function(t){e.iphone.start_x=t.changedTouches[0].pageX,e.iphone.start_y=t.changedTouches[0].pageY,e.iphone.tap=!0,e.iphone.capture=!0},load:function(t){this.orig_keys=this.keys,e.addEvent(document,"touchmove",this.touchmoveHandler),e.addEvent(document,"touchend",this.touchendHandler,!1),e.addEvent(document,"touchstart",this.touchstartHandler)},unload:function(){e.removeEvent(document,"touchmove",this.touchmoveHandler),e.removeEvent(document,"touchend",this.touchendHandler),e.removeEvent(document,"touchstart",this.touchstartHandler)},check_direction:function(){return x_magnitude=Math.abs(this.start_x-this.stop_x),y_magnitude=Math.abs(this.start_y-this.stop_y),x=this.start_x-this.stop_x<0?"RIGHT":"LEFT",y=this.start_y-this.stop_y<0?"DOWN":"UP",result=x_magnitude>y_magnitude?x:y,result=!0===this.tap?"TAP":result,result}}};return"string"==typeof t&&e.load(t),"function"==typeof t&&(e.code=t,e.load()),e};"undefined"!=typeof module&&void 0!==module.exports?module.exports=Konami:"function"==typeof define&&define.amd?define([],(function(){return Konami})):window.Konami=Konami;
--- a/RIGS/static/js/main.js
+++ b/RIGS/static/js/main.js
--- a/RIGS/static/js/main.min.js
+++ b/RIGS/static/js/main.min.js
--- a/RIGS/static/js/modal.js
+++ b/RIGS/static/js/modal.js
--- a/RIGS/static/js/moment.js
+++ b/RIGS/static/js/moment.js
--- a/RIGS/static/js/popover.js
+++ b/RIGS/static/js/popover.js
@@ -1,6 +0,0 @@
-/*!
-  * Bootstrap popover.js v4.5.2 (https://getbootstrap.com/)
-  * Copyright 2011-2020 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
-  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
-  */
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("jquery"),require("./tooltip.js")):"function"==typeof define&&define.amd?define(["jquery","./tooltip.js"],e):(t="undefined"!=typeof globalThis?globalThis:t||self).Popover=e(t.jQuery,t.Tooltip)}(this,(function(t,e){"use strict";function n(t,e){for(var n=0;n<e.length;n++){var o=e[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(t,o.key,o)}}function o(){return(o=Object.assign||function(t){for(var e=1;e<arguments.length;e++){var n=arguments[e];for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(t[o]=n[o])}return t}).apply(this,arguments)}t=t&&Object.prototype.hasOwnProperty.call(t,"default")?t.default:t,e=e&&Object.prototype.hasOwnProperty.call(e,"default")?e.default:e;var r="popover",i=".bs.popover",s=t.fn[r],p=new RegExp("(^|\\s)bs-popover\\S+","g"),u=o({},e.Default,{placement:"right",trigger:"click",content:"",template:'<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-header"></h3><div class="popover-body"></div></div>'}),a=o({},e.DefaultType,{content:"(string|element|function)"}),l={HIDE:"hide"+i,HIDDEN:"hidden"+i,SHOW:"show"+i,SHOWN:"shown"+i,INSERTED:"inserted"+i,CLICK:"click"+i,FOCUSIN:"focusin"+i,FOCUSOUT:"focusout"+i,MOUSEENTER:"mouseenter"+i,MOUSELEAVE:"mouseleave"+i},c=function(e){var o,s;function c(){return e.apply(this,arguments)||this}s=e,(o=c).prototype=Object.create(s.prototype),o.prototype.constructor=o,o.__proto__=s;var f,h,d,y=c.prototype;return y.isWithContent=function(){return this.getTitle()||this._getContent()},y.addAttachmentClass=function(e){t(this.getTipElement()).addClass("bs-popover-"+e)},y.getTipElement=function(){return this.tip=this.tip||t(this.config.template)[0],this.tip},y.setContent=function(){var e=t(this.getTipElement());this.setElementContent(e.find(".popover-header"),this.getTitle());var n=this._getContent();"function"==typeof n&&(n=n.call(this.element)),this.setElementContent(e.find(".popover-body"),n),e.removeClass("fade show")},y._getContent=function(){return this.element.getAttribute("data-content")||this.config.content},y._cleanTipClass=function(){var e=t(this.getTipElement()),n=e.attr("class").match(p);null!==n&&n.length>0&&e.removeClass(n.join(""))},c._jQueryInterface=function(e){return this.each((function(){var n=t(this).data("bs.popover"),o="object"==typeof e?e:null;if((n||!/dispose|hide/.test(e))&&(n||(n=new c(this,o),t(this).data("bs.popover",n)),"string"==typeof e)){if(void 0===n[e])throw new TypeError('No method named "'+e+'"');n[e]()}}))},f=c,d=[{key:"VERSION",get:function(){return"4.5.2"}},{key:"Default",get:function(){return u}},{key:"NAME",get:function(){return r}},{key:"DATA_KEY",get:function(){return"bs.popover"}},{key:"Event",get:function(){return l}},{key:"EVENT_KEY",get:function(){return i}},{key:"DefaultType",get:function(){return a}}],(h=null)&&n(f.prototype,h),d&&n(f,d),c}(e);return t.fn[r]=c._jQueryInterface,t.fn[r].Constructor=c,t.fn[r].noConflict=function(){return t.fn[r]=s,c._jQueryInterface},c}));
--- a/RIGS/static/js/popper.js
+++ b/RIGS/static/js/popper.js
--- a/RIGS/static/js/raven.js
+++ b/RIGS/static/js/raven.js
--- a/RIGS/static/js/src/asteroids.min.js
+++ b/RIGS/static/js/src/asteroids.min.js
--- a/RIGS/static/js/src/autocompleter.js
+++ b/RIGS/static/js/src/autocompleter.js
@@ -1,102 +0,0 @@
-function changeSelectedValue(obj,pk,text,update_url) { //Pass in JQuery object and new parameters
-    //console.log('Changing selected value');
-    obj.find('option').remove();  //Remove all the available options
-    obj.append(  //Add the new option
-    	$("<option></option>")
-	    .attr("value",pk)
-	    .text(text)
-	    .data('update_url',update_url)
-	    );
-    obj.selectpicker('render'); //Re-render the UI
-    obj.selectpicker('refresh'); //Re-render the UI
-    obj.selectpicker('val', pk); //Set the new value to be selected
-    obj.change(); //Trigger the change function manually
-}
-
-function refreshUpdateHref(obj) {
-    //console.log('Refreshing Update URL');
-    targetObject = $('#'+obj.attr('id')+'-update');
-    update_url = $('option:selected', obj).data('update_url');
-
-    if (update_url=="") {  //Probably "clear selection" has been chosen
-        //console.log('Trying to disable');
-        targetObject.removeAttr('href');
-	    targetObject.addClass('disabled');
-    } else {
-	    targetObject.prop('href', update_url);
-	    targetObject.removeClass('disabled');
-    }
-}
-
-function initPicker(obj) {
-	var options = {
-        ajax: {
-            url: obj.data('sourceurl'),
-            type: 'GET',
-            dataType: 'json',
-            // Use "{{{q}}}" as a placeholder and Ajax Bootstrap Select will
-            // automatically replace it with the value of the search query.
-            data: {
-                term: '{{{q}}}'
-            }
-        },
-        locale: {
-            emptyTitle: ''
-        },
-        clearOnEmpty:false,
-        //log: 3,
-        preprocessData: function (data) {
-            var i, l = data.length, array = [];
-            array.push({
-                        text: clearSelectionLabel,
-                        value: '',
-                        data:{
-                        	update_url: '',
-                        	subtext:''
-                        }
-                    });
-
-            if (l) {
-                for(i = 0; i < l; i++){
-                    array.push($.extend(true, data[i], {
-                        text: data[i]['label'],
-                        value: data[i]['pk'],
-                        data:{
-                        	update_url: data[i]['update'],
-                        	subtext:''
-                        }
-                    }));
-                }
-            }
-            return array;
-        }
-    };
-
-    obj.prepend($("<option></option>")
-		.attr("value",'')
-		.text(clearSelectionLabel)
-		.data('update_url',''));  //Add "clear selection" option
-
-
-	obj.selectpicker().ajaxSelectPicker(options); //Initiaise selectPicker
-	obj.change(function(){ //on change, update the edit button href
-		//console.log('Selectbox Changed');
-		refreshUpdateHref(obj);
-	});
-
-	refreshUpdateHref(obj); //Ensure href is correct at the beginning
-}
-
-$(document).ready(function() {
-    clearSelectionLabel = '(no selection)';
-
-    $(".selectpicker").each(function(){initPicker($(this))});
-
-    //When update/edit modal box submitted
-   $('#modal').on('hide.bs.modal', function (e) {
-        if (modaltarget != undefined && modalobject != "") {
-        	//Update the selector with new values
-        	changeSelectedValue($(modaltarget),modalobject[0]['pk'],modalobject[0]['fields']['name'],modalobject[0]['update_url']);
-        }
-    });
-});
--- a/RIGS/static/js/src/interaction.js
+++ b/RIGS/static/js/src/interaction.js
@@ -1,139 +0,0 @@
-function setupItemTable(items_json) {
-    objectitems = JSON.parse(items_json)
-    $.each(objectitems, function (key, val) {
-        objectitems[key] = JSON.parse(val);
-    })
-    newitem = -1;
-}
-
-function nl2br (str, is_xhtml) {
-    var breakTag = (is_xhtml || typeof is_xhtml === 'undefined') ? '<br />' : '<br>';
-    return (str + '').replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1'+ breakTag +'$2');
-}
-
-function escapeHtml (str) {
-    return $('<div/>').text(str).html();
-}
-
-function updatePrices() {
-    // individual rows
-    var sum = 0;
-    for (var pk in objectitems) {
-        var fields = objectitems[pk].fields;
-        var sub = fields.cost * fields.quantity;
-        $('#item-' + pk + ' .sub-total').html(parseFloat(sub).toFixed(2)).data('subtotal', sub);
-
-        sum += Number(sub);
-    }
-
-    $('#sumtotal').text(parseFloat(sum).toFixed(2));
-    var vat = sum * Number($('#vat-rate').data('rate'));
-    $('#vat').text(parseFloat(vat).toFixed(2));
-    $('#total').text(parseFloat(sum + vat).toFixed(2));
-}
-
-$('#item-table').on('click', '.item-delete', function () {
-    delete objectitems[$(this).data('pk')]
-    $('#item-' + $(this).data('pk')).remove();
-    updatePrices();
-});
-
-$('#item-table').on('click', '.item-add', function () {
-    $('#item-form').data('pk', newitem);
-
-    // Set the form values
-    $('#item_name').val('');
-    $('#item_description').val('');
-    $('#item_quantity').val('');
-    $('#item_cost').val('');
-
-    $($(this).data('target')).modal('show');
-});
-
-$('#item-table').on('click', '.item-edit', function () {
-    // set the pk as we will need this later
-    var pk = $(this).data('pk');
-    $('#item-form').data('pk', pk);
-
-    // Set the form values
-    var fields = objectitems[pk].fields;
-    $('#item_name').val(fields.name);
-    $('#item_description').val(fields.description);
-    $('#item_quantity').val(fields.quantity);
-    $('#item_cost').val(fields.cost);
-
-    $($(this).data('target')).modal('show');
-});
-
-$('body').on('submit', '#item-form', function (e) {
-    e.preventDefault();
-    var pk = $(this).data('pk');
-    $('#itemModal').modal('hide');
-
-    var fields;
-    if (pk == newitem--) {
-        // Create the new data structure and add it on.
-        fields = new Object();
-        fields['name'] = $('#item_name').val()
-        fields['description'] = $('#item_description').val();
-        fields['cost'] = $('#item_cost').val();
-        fields['quantity'] = $('#item_quantity').val();
-
-        var order = 0;
-        for (item in objectitems) {
-            order++;
-        }
-
-        fields['order'] = order;
-
-        objectitems[pk] = new Object();
-        objectitems[pk]['fields'] = fields;
-
-        // Add the new table
-        $('#new-item-row').clone().attr('id', 'item-' + pk).data('pk', pk).appendTo('#item-table-body');
-        $('#item-'+pk+' .item-delete, #item-'+pk+' .item-edit').data('pk', pk)
-    } else {
-        // Existing item
-        // update data structure
-        fields = objectitems[pk].fields;
-        fields.name = $('#item_name').val()
-        fields.description = $('#item_description').val();
-        fields.cost = $('#item_cost').val();
-        fields.quantity = $('#item_quantity').val();
-        objectitems[pk].fields = fields;
-
-    }
-    // update the table
-    $row = $('#item-' + pk);
-    $row.find('.name').html(escapeHtml(fields.name));
-    $row.find('.description').html(nl2br(escapeHtml(fields.description)));
-    $row.find('.cost').html(parseFloat(fields.cost).toFixed(2));
-    $row.find('.quantity').html(fields.quantity);
-
-    updatePrices();
-});
-
-$('body').on('submit', '.itemised_form', function (e) {
-    $('#id_items_json').val(JSON.stringify(objectitems));
-});
-
-// Return a helper with preserved width of cells
-var fixHelper = function (e, ui) {
-    ui.children().each(function () {
-        $(this).width($(this).width());
-    });
-    return ui;
-};
-
-$("#item-table tbody").sortable({
-    helper: fixHelper,
-    update: function (e, ui) {
-        info = $(this).sortable("toArray");
-        itemorder = new Array();
-        $.each(info, function (key, value) {
-            pk = $('#' + value).data('pk');
-            objectitems[pk].fields.order = key;
-        });
-
-    }
-});
--- a/RIGS/static/js/tooltip.js
+++ b/RIGS/static/js/tooltip.js
--- a/RIGS/static/js/util.js
+++ b/RIGS/static/js/util.js
@@ -1,6 +0,0 @@
-/*!
-  * Bootstrap util.js v4.5.2 (https://getbootstrap.com/)
-  * Copyright 2011-2020 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
-  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
-  */
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],e):(t="undefined"!=typeof globalThis?globalThis:t||self).Util=e(t.jQuery)}(this,(function(t){"use strict";t=t&&Object.prototype.hasOwnProperty.call(t,"default")?t.default:t;function e(e){var r=this,o=!1;return t(this).one(n.TRANSITION_END,(function(){o=!0})),setTimeout((function(){o||n.triggerTransitionEnd(r)}),e),this}var n={TRANSITION_END:"bsTransitionEnd",getUID:function(t){do{t+=~~(1e6*Math.random())}while(document.getElementById(t));return t},getSelectorFromElement:function(t){var e=t.getAttribute("data-target");if(!e||"#"===e){var n=t.getAttribute("href");e=n&&"#"!==n?n.trim():""}try{return document.querySelector(e)?e:null}catch(t){return null}},getTransitionDurationFromElement:function(e){if(!e)return 0;var n=t(e).css("transition-duration"),r=t(e).css("transition-delay"),o=parseFloat(n),i=parseFloat(r);return o||i?(n=n.split(",")[0],r=r.split(",")[0],1e3*(parseFloat(n)+parseFloat(r))):0},reflow:function(t){return t.offsetHeight},triggerTransitionEnd:function(e){t(e).trigger("transitionend")},supportsTransitionEnd:function(){return Boolean("transitionend")},isElement:function(t){return(t[0]||t).nodeType},typeCheckConfig:function(t,e,r){for(var o in r)if(Object.prototype.hasOwnProperty.call(r,o)){var i=r[o],a=e[o],u=a&&n.isElement(a)?"element":null==(s=a)?""+s:{}.toString.call(s).match(/\s([a-z]+)/i)[1].toLowerCase();if(!new RegExp(i).test(u))throw new Error(t.toUpperCase()+': Option "'+o+'" provided type "'+u+'" but expected type "'+i+'".')}var s},findShadowRoot:function(t){if(!document.documentElement.attachShadow)return null;if("function"==typeof t.getRootNode){var e=t.getRootNode();return e instanceof ShadowRoot?e:null}return t instanceof ShadowRoot?t:t.parentNode?n.findShadowRoot(t.parentNode):null},jQueryDetection:function(){if(void 0===t)throw new TypeError("Bootstrap's JavaScript requires jQuery. jQuery must be included before Bootstrap's JavaScript.");var e=t.fn.jquery.split(" ")[0].split(".");if(e[0]<2&&e[1]<9||1===e[0]&&9===e[1]&&e[2]<1||e[0]>=4)throw new Error("Bootstrap's JavaScript requires at least jQuery v1.9.1 but less than v4.0.0")}};return n.jQueryDetection(),t.fn.emulateTransitionEnd=e,t.event.special[n.TRANSITION_END]={bindType:"transitionend",delegateType:"transitionend",handle:function(e){if(t(e.target).is(this))return e.handleObj.handler.apply(this,arguments)}},n}));
--- a/RIGS/static/scss/_custom-variables.scss
+++ b/RIGS/static/scss/_custom-variables.scss
@@ -1,11 +0,0 @@
-$font-family-sans-serif:  "Open Sans", sans-serif;
-//Make it look less primary school
-$font-size-base: 0.85rem;
-$theme-colors: (
-  "success": #5cb85c,
-  "warning": #f0ad4e,
-  "danger": #d9534f,
-  "info": #5bc0de,
-  "primary": #3A52A2
-) !default;
-$enable-shadows: true;
--- a/RIGS/static/scss/dark_screen.scss
+++ b/RIGS/static/scss/dark_screen.scss
@@ -1,114 +0,0 @@
-[data-theme='dark'] {
-    $theme-colors: (
-      "success": #3AB54A,
-      "warning": #FFE89B,
-      "danger": #BF1E2E,
-      "info": #25AAE2,
-      "primary": #3A52A2
-    );
-    @import "custom-variables";
-    @import 'node_modules/@forevolve/bootstrap-dark/scss/bootstrap-dark.scss';
-    background: #222;
-    color: $gray-100;
-    $darktheme: #121416;
-    .navbar {
-        background-color: #111111 !important;
-    }
-    .dropdown-menu {
-        box-shadow: 0 0.5rem 1rem black;
-        color: $gray-100;
-        background: $darktheme;
-    }
-    .form-control:not(.btn) {
-        background-color: $darktheme;
-        color: $gray-100;
-    }
-    .btn-light, .popover, .popover-header, .popover-body, .status {
-        background-color: $darktheme !important;
-        color: $gray-100 !important;
-        border-color: $darktheme;
-    }
-    .bs-popover-right > .arrow::after {
-        border-right-color: $darktheme;
-    }
-    .bs-popover-left > .arrow::after {
-        border-left-color: $darktheme;
-    }
-    .bs-popover-top > .arrow::after {
-        border-top-color: $darktheme;
-    }
-    .bs-popover-bottom > .arrow::after {
-        border-bottom-color: $darktheme;
-    }
-    a {
-        color: $blue;
-    }
-    .badge, .btn-success, .bg-warning {
-        color: black;
-    }
-    .badge-dark, .badge-secondary, .btn-primary {
-        color: $gray-100;
-    }
-    .input-group-text {
-        border-color: $darktheme;
-    }
-    .btn-secondary, .btn-info {
-        color: white;
-    }
-    .page-item.disabled {
-        opacity: 0.5;
-    }
-    .bg-light {
-        color: black;
-        background-color: $gray-200 !important;
-        border-radius: 0.2em;
-    }
-    .fc-day-today {
-        background-color: transparent !important;
-        border: 0.2em solid $info !important;
-    }
-    .fc-daygrid-dot-event {
-        color: white !important;
-    }
-    .table {
-        border-collapse: separate !important;
-        border-spacing: 0;
-    }
-    .table tr th {
-      border-right: 0 !important;
-    }
-    .table tr td {
-      border-left: 0 !important;
-    }
-    .table tr td:not(:last-child) {
-        border-right: 0 !important;
-    }
-    @each $color, $value in $theme-colors {
-        .table-#{$color} {
-            > td,th {
-                border: 0.3em solid theme-color-level($color, -6) !important;
-            }
-            > * {
-                color: white !important;
-                background-color: #222 !important;
-            }
-        }
-    }
-    del {
-      color: black;
-      background-color: $danger;
-      border-radius: 3px;
-    }
-    ins {
-      color: black;
-      background-color: $success;
-      border-radius: 3px;
-    }
-    pre {
-        background: $gray-600;
-        color: white;
-    }
-    .custom-control-input:focus ~ .custom-control-label::before {
-        box-shadow: 0 0 0 $input-focus-width rgba($primary, 0.7) !important;
-    }
-}
--- a/RIGS/static/scss/email.scss
+++ b/RIGS/static/scss/email.scss
@@ -1,63 +0,0 @@
-$button_color: #357ebf;
-
-body{
-  margin: 0px;
-}
-
-.main-table{
-  width: 100%;
-  border-collapse: collapse;
-
-}
-
-.client-header {
-  background-image: url("https://www.nottinghamtec.co.uk/imgs/wof2014-1.jpg");
-  background-color: #222;
-  background-repeat: no-repeat;
-  background-position: center;
-
-  width: 100%;
-
-  margin-bottom: 28px;
-
-  .logos{
-    width: 100%;
-    max-width: 640px;
-  }
-
-  img {
-    height: 110px;
-  }
-}
-
-.content-container{
-  width: 100%;
-
-  .content {
-    font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
-
-    width: 100%;
-    max-width: 600px;
-    padding: 10px;
-    text-align: left;
-
-    .button-container{
-      width: 100%;
-
-      .button {
-        padding: 6px 12px;
-        background-color: $button_color;
-        border-radius: 4px;
-
-        a {
-          color: #fff;
-          text-decoration: none;
-        }
-
-      }
-
-    }
-
-  }
-}
-
--- a/RIGS/static/scss/print.scss
+++ b/RIGS/static/scss/print.scss
@@ -1 +0,0 @@
-@import "node_modules/bootstrap/scss/bootstrap";
--- a/RIGS/static/scss/screen.scss
+++ b/RIGS/static/scss/screen.scss
@@ -1,195 +0,0 @@
-@import "dark_screen";
-@import "custom-variables";
-@import "node_modules/bootstrap/scss/bootstrap";
-
-@media screen and
-  (prefers-reduced-motion: reduce),
-  (update: slow) {
-  * {
-    animation-duration: 0.001ms !important;
-    animation-iteration-count: 1 !important;
-    transition-duration: 0.001ms !important;
-  }
-}
-
-.fc-event-main {
-    color: black !important;
-}
-
-.fc-daygrid-dot-event {
-    color: black !important;
-}
-
-.fc-timeGridDay-view {
-    .fc-event-main {
-        font-size: large !important;
-    }
-}
-
-.fc-timeGridWeek-view {
-    .fc-event-main {
-        font-size: 0.9rem;
-    }
-}
-
-#content {
-  padding: 40px 15px;
-}
-
-#userdropdown > li {
-  padding: 0 0.3em;
-}
-
-#userdropdown > li, #activity {
-  .media-object {
-    max-width: 3em;
-  }
-}
-
-.table tbody > tr > td.vert-align {
-  vertical-align: middle;
-}
-
-.align-right {
-  text-align: right;
-}
-
-textarea {
-  width: 100%;
-  resize: vertical;
-}
-
-.custom-combobox {
-  display: block;
-}
-
-.event-mic-photo {
-  max-width: 2em;
-  border-radius: 0.25em;
-}
-
-.item-description {
-  margin-left: 1em;
-}
-
-.overflow-ellipsis {
-  text-overflow: ellipsis;
-  display: inline-block;
-  max-width: 100%;
-  overflow: hidden;
-}
-
-.dont-break-out {
-  overflow-wrap: break-word;
-  word-wrap: break-word;
-  -webkit-hyphens: auto;
-  -ms-hyphens: auto;
-  -moz-hyphens: auto;
-  hyphens: auto;
-}
-
-.modal-dialog {
-  z-index: inherit; // bug fix introduced in 52682ce
-}
-
-del {
-  background-color: #f2dede;
-  border-radius: 3px;
-  padding: 0.1em;
-}
-
-ins {
-  background-color: #dff0d8;
-  border-radius: 3px;
-  padding: 0.1em;
-}
-
-.nav-link {
-  color: $gray-400 !important;
-}
-
-.btn-light {
-    background-color: $gray-200 !important;
-}
-
-.skip-link {
-  background: $dark;
-  outline: unset;
-  height: 30px;
-  left: 50%;
-  padding: 8px;
-  position: absolute;
-  transform: translateY(-100%);
-  transition: transform 0.3s;
-}
-
-.skip-link:focus {
-  transform: translateY(45px); /* TODO Remove absolute positioning */
-}
-
-.errorlist > li {
-    list-style-type: none;
-}
-
-pre {
-    page-break-inside: avoid;
-    font-family: monospace;
-    font-size: 15px;
-    line-height: 1.6;
-    margin-bottom: 1.6em;
-    max-width: 100%;
-    overflow: auto;
-    padding: 1em 1.5em;
-    display: block;
-    word-wrap: break-word;
-}
-
-svg {
-    display: inline;
-    white-space: no-wrap;
-}
-
-html.embedded {
-  display: flex;
-  flex-direction: column;
-  width: 100%;
-  height: 100%;
-  max-height: 100%;
-  overflow: hidden;
-  justify-content: center;
-
-  body{
-    padding:0;
-    width:100%;
-    background:none;
-    overflow: auto;
-  }
-
-  .embed_container{
-    border:5px solid #e9e9e9;
-    padding:12px 0px;
-    min-height:100%;
-    width:100%;
-  }
-
-  .source{
-    background: url('/static/imgs/pyrigs-avatar.png') no-repeat;
-    background-size: 16px 16px;
-    padding-left: 20px;
-    color: #000;
-  }
-
-  h3{
-    margin-top:10px;
-    margin-bottom:5px;
-  }
-
-  p{
-    margin-bottom:2px;
-    font-size: 11px;
-  }
-
-  .event-mic-photo{
-    max-width: 3em;
-  }
-}
--- a/RIGS/templates/calendar.html
+++ b/RIGS/templates/calendar.html
@@ -11,14 +11,6 @@
    <script src="{% static 'js/moment.js' %}"></script>
    <script src="{% static 'js/main.min.js' %}"></script>
    <script>
-        function getUrlVars() {
-            var vars = {};
-            var parts = window.location.href.replace(/[?&]+([^=&]+)=([^&]*)/gi, function(m,key,value) {
-            vars[key] = value;
-            });
-            return vars;
-        }
-
        viewToUrl = {
            'timeGridWeek':'week',
            'timeGridDay':'day',
@@ -78,7 +70,7 @@
                                    'url': $(this).attr('url')
                                }

-                                if($(this).attr('is_rig')==true || $(this).attr('status') == "Cancelled"){
+                                if($(this).attr('is_rig')===true || $(this).attr('status') === "Cancelled"){
                                    thisEvent['color'] = colours[$(this).attr('status')];
                                }else{
                                    thisEvent['color'] = colours['non-rig'];
@@ -95,31 +87,35 @@
                    $('#calendar-header').text(view.title);

                    // Enable/Disable "Today" button as required
+                    let $today = $('#today-button');
                    if(moment().isBetween(view.currentStart, view.currentEnd)){
                        //Today is within the current view
-                        $('#today-button').prop('disabled', true);
+                        $today.prop('disabled', true);
                    }else{
-                        $('#today-button').prop('disabled', false);
+                        $today.prop('disabled', false);
                    }

                    // Set active view select button
+                    let $month = $('#month-button');
+                    let $week = $('#week-button');
+                    let $day = $('#day-button');
                    switch(view.type){
                        case 'dayGridMonth':
-                            $('#month-button').addClass('active');
-                            $('#week-button').removeClass('active');
-                            $('#day-button').removeClass('active');
+                            $month.addClass('active');
+                            $week.removeClass('active');
+                            $day.removeClass('active');
                            break;

                        case 'timeGridWeek':
-                            $('#month-button').removeClass('active');
-                            $('#week-button').addClass('active');
-                            $('#day-button').removeClass('active');
+                            $month.removeClass('active');
+                            $week.addClass('active');
+                            $day.removeClass('active');
                            break;

                        case 'timeGridDay':
-                            $('#month-button').removeClass('active');
-                            $('#week-button').removeClass('active');
-                            $('#day-button').addClass('active');
+                            $month.removeClass('active');
+                            $week.removeClass('active');
+                            $day.addClass('active');
                            break;
                    }
                    history.replaceState(null,null,"{% url 'web_calendar' %}"+viewToUrl[view.type]+'/'+moment(view.currentStart).format('YYYY-MM-DD')+'/');
--- a/RIGS/templates/event_checklist_detail.html
+++ b/RIGS/templates/event_checklist_detail.html
@@ -235,7 +235,6 @@
    </div>
    {% endif %}
 </div>
-</div>
 <div class="col-12 text-right">
 {% button 'edit' url='ec_edit' pk=object.pk %}
 {% button 'view' url='event_detail' pk=object.pk text="Event" %}
--- a/RIGS/templates/event_checklist_form.html
+++ b/RIGS/templates/event_checklist_form.html
@@ -32,9 +32,9 @@
    $(document).ready(function () {
        $('button[data-action=add]').on('click', function (event) {
            event.preventDefault();
-            var target = $($(this).attr('data-target'));
-            var newID = Number(target.attr('data-pk'));
-            var newRow = $($(this).attr('data-clone'))
+            let target = $($(this).attr('data-target'));
+            let newID = Number(target.attr('data-pk'));
+            let newRow = $($(this).attr('data-clone'))
                    .clone().attr('style', "")
                   .attr('id', function(i, val){
                        return val.split("_")[0] + '_' + newID;
@@ -135,7 +135,7 @@
                                        <tr id="vehicles_new" style="display: none;">
                                            <td><input type="text" class="form-control" name="vehicle_new" disabled="true"/></td>
                                            <td><select class="form-control" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials" name="driver_new" disabled="true"></select></td>
-                                            <td><button type="button" class="btn btn-danger btn-sm mt-1" data-action='delete' data-target='#vehicle'><span class="fas fa-times"></span></button</td>
+                                            <td><button type="button" class="btn btn-danger btn-sm mt-1" data-action='delete' data-target='#vehicle'><span class="fas fa-times"></span></button></td>
                                        </tr>
                                        {% for i in object.vehicles.all %}
                                        <tr id="vehicles_{{i.pk}}">
@@ -147,7 +147,7 @@
                                                    {% endif %}
                                                </select>
                                            </td>
-                                            <td><button type="button" class="btn btn-danger btn-sm mt-1" data-id='{{i.pk}}' data-action='delete' data-target='#vehicle'><span class="fas fa-times"></span></button</td>
+                                            <td><button type="button" class="btn btn-danger btn-sm mt-1" data-id='{{i.pk}}' data-action='delete' data-target='#vehicle'><span class="fas fa-times"></span></button></td>
                                        </tr>
                                        {% endfor %}
                                    </tbody>
@@ -204,10 +204,10 @@
                                            <td>
                                                <select name="crewmember_new" class="form-control" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials" disabled="true"></select>
                                            </td>
-                                            <td style="min-width: 15ch"><input name="start_new" type="datetime-local" class="form-control" value="{{ i.start }}" disabled="true"/></td>
+                                            <td style="min-width: 15ch"><input name="start_new" type="datetime-local" class="form-control" value="{{ i.start }}" disabled=""/></td>
                                            <td style="min-width: 15ch"><input name="role_new" type="text" class="form-control" value="{{ i.role }}" disabled="true"/></td>
                                            <td style="min-width: 15ch"><input name="end_new" type="datetime-local" class="form-control" value="{{ i.end }}" disabled="true" /></td>
-                                            <td><button type="button" class="btn btn-danger btn-sm mt-1" data-id='{{crew.pk}}' data-action='delete' data-target='#crewmember'><span class="fas fa-times"></span></button</td>
+                                            <td><button type="button" class="btn btn-danger btn-sm mt-1" data-id='{{crew.pk}}' data-action='delete' data-target='#crewmember'><span class="fas fa-times"></span></button></td>
                                        </tr>
                                        {% for crew in object.crew.all %}
                                        <tr id="crew_{{crew.pk}}">
@@ -221,7 +221,7 @@
                                            <td><input name="start_{{crew.pk}}" type="datetime-local" class="form-control" value="{{ crew.start|date:'Y-m-d' }}T{{ crew.start|date:'H:i:s' }}"/></td>
                                            <td><input name="role_{{crew.pk}}" type="text" class="form-control" value="{{ crew.role }}"/></td>
                                            <td><input name="end_{{crew.pk}}" type="datetime-local" class="form-control" value="{{ crew.end|date:'Y-m-d' }}T{{ crew.end|date:'H:i:s' }}"/></td>
-                                            <td><button type="button" class="btn btn-danger btn-sm mt-1" data-id='{{crew.pk}}' data-action='delete' data-target='#crewmember'><span class="fas fa-times"></span></button</td>
+                                            <td><button type="button" class="btn btn-danger btn-sm mt-1" data-id='{{crew.pk}}' data-action='delete' data-target='#crewmember'><span class="fas fa-times"></span></button></td>
                                        </tr>
                                        {% endfor %}
                                    </tbody>
@@ -240,7 +240,7 @@
            <div class="row my-3" id="size-0">
                <div class="col-12">
                    <div class="card border-success">
-                        <div class="card-header">Electrical Checks <small>for ‘Small’ TEC Events <6kVA (aprox. 26A)</small></div>
+                        <div class="card-header">Electrical Checks <small>for ‘Small’ TEC Events <6kVA (approx. 26A)</small></div>
                        <div class="card-body">
                            {% include 'partials/checklist_checkbox.html' with formitem=form.rcds %}
                            {% include 'partials/checklist_checkbox.html' with formitem=form.supply_test %}
@@ -337,7 +337,7 @@
                                    </tbody>
                                </table>
                            </div>
-                            <hr>
+                            <hr/>
                            {% include 'partials/checklist_checkbox.html' with formitem=form.all_rcds_tested %}
                            {% include 'partials/checklist_checkbox.html' with formitem=form.public_sockets_tested %}
                            {% include 'partials/ec_power_info.html' %}
--- a/RIGS/templates/event_detail.html
+++ b/RIGS/templates/event_detail.html
@@ -38,7 +38,7 @@
                        <dt class="col-sm-6">Email</dt>
                        <dd class="col-sm-6">{{ object.person.email|linkornone:'mailto' }}</dd>
                        <dt class="col-sm-6">Phone Number</dt>
-                        <dd class="col-sm-6">{{ object.person.phone|linkornone:'tel' }}</a></dd>
+                        <dd class="col-sm-6">{{ object.person.phone|linkornone:'tel' }}</dd>
                    </dl>
                </div>
            </div>
@@ -59,7 +59,7 @@
                            <dt class="col-sm-6">Email</dt>
                            <dd class="col-sm-6">{{ object.organisation.email|linkornone:'mailto' }}</dd>
                            <dt class="col-sm-6">Phone Number</dt>
-                            <dd class="col-sm-6">{{ object.organisation.phone|linkornone:'tel' }}</a></dd>
+                            <dd class="col-sm-6">{{ object.organisation.phone|linkornone:'tel' }}</dd>
                            <dt class="col-sm-6">Has SU Account</dt>
                            <dd class="col-sm-6">{{ event.organisation.union_account|yesno|capfirst }}</dd>
                        </dl>
--- a/RIGS/templates/event_embed.html
+++ b/RIGS/templates/event_embed.html
@@ -2,14 +2,14 @@
 {% load static %}

 {% block content %}
-<div class="row">
-    <div class="col-sm-12">
-        <a href="/">
-            <span class="source"> R<small>ig</small> I<small>nformation</small> G<small>athering</small> S<small>ystem</small></span>
-        </a>
-    </div>
+    <div class="row">
+        <div class="col-sm-12">
+            <a href="/">
+                <span class="source"> R<small>ig</small> I<small>nformation</small> G<small>athering</small> S<small>ystem</small></span>
+            </a>
+        </div>

-    <div class="col-sm-12">
+        <div class="col-sm-12">
       <span class="pull-right">
            {% if object.mic %}
                <div class="text-center">
@@ -20,82 +20,81 @@
            {% endif %}
        </span>

-        <h3>
-            <a href="{% url 'event_detail' object.pk %}">
-                {% if object.is_rig %}N{{ object.pk|stringformat:"05d" }}{% else %}{{ object.pk }}{% endif %}
-                | {{ object.name }} </a>
+            <h3>
+                <a href="{% url 'event_detail' object.pk %}">
+                    {% if object.is_rig %}N{{ object.pk|stringformat:"05d" }}{% else %}{{ object.pk }}{% endif %}
+                    | {{ object.name }} </a>
                {% if object.venue %}
-                <small>at {{ object.venue }}</small>
+                    <small>at {{ object.venue }}</small>
+                {% endif %}
+                <br/><small>
+                {{ object.start_date|date:"D d/m/Y" }}
+                {% if object.has_start_time %}
+                    {{ object.start_time|date:"H:i" }}
+                {% endif %}
+                {% if object.end_date or object.has_end_time %}
+                    &ndash;
+                {% endif %}
+                {% if object.end_date and object.end_date != object.start_date %}
+                    {{ object.end_date|date:"D d/m/Y"  }}
+                {% endif %}
+                {% if object.has_end_time %}
+                    {{ object.end_time|date:"H:i" }}
                {% endif %}
-        <br/><small>
-            {{ object.start_date|date:"D d/m/Y" }}
-            {% if object.has_start_time %}
-                {{ object.start_time|date:"H:i" }}
-            {% endif %}
-            {% if object.end_date or object.has_end_time %}
-                &ndash;
-            {% endif %}
-            {% if object.end_date and object.end_date != object.start_date %}
-                 {{ object.end_date|date:"D d/m/Y"  }}
-            {% endif %}
-            {% if object.has_end_time %}
-                {{ object.end_time|date:"H:i" }}
-            {% endif %}
            </small>
-        </h3>
+            </h3>

-        <div class="row">
-            <div class="col-xs-6">
-                <p>
-                    <strong>Status:</strong>
-                    {{ object.get_status_display }}
-                </p>
-                <p>
-                    {% if object.is_rig %}
-                        <strong>Client:</strong> {{ object.person.name }}
-                        {% if object.organisation %}
-                        for {{ object.organisation.name }}
+            <div class="row">
+                <div class="col-xs-6">
+                    <p>
+                        <strong>Status:</strong>
+                        {{ object.get_status_display }}
+                    </p>
+                    <p>
+                        {% if object.is_rig %}
+                            <strong>Client:</strong> {{ object.person.name }}
+                            {% if object.organisation %}
+                                for {{ object.organisation.name }}
+                            {% endif %}
+                            {% if object.dry_hire %}(Dry Hire){% endif %}
+                        {% else %}
+                            <strong>Non-Rig</strong>
                        {% endif %}
-                        {% if object.dry_hire %}(Dry Hire){% endif %}
-                    {% else %}
-                        <strong>Non-Rig</strong>
-                    {% endif %}
-                </p>
-                <p>
-                    <strong>MIC:</strong>
-                    {% if object.mic %}
-                        {{object.mic.name}}
-                    {% else %}
-                        None
-                    {% endif %}
-                </p>
-            </div>
-            <div class="col-xs-6">
-                {% if object.meet_at %}
-                    <p>
-                        <strong>Crew meet:</strong>
-                        {{ object.meet_at|date:"H:i" }} {{ object.meet_at|date:"(Y-m-d)" }}
                    </p>
-                {% endif %}
-                {% if object.access_at %}
                    <p>
-                        <strong>Access at:</strong>
-                        {{ object.access_at|date:"H:i" }} {{ object.access_at|date:"(Y-m-d)" }}
+                        <strong>MIC:</strong>
+                        {% if object.mic %}
+                            {{object.mic.name}}
+                        {% else %}
+                            None
+                        {% endif %}
                    </p>
-                {% endif %}
-                <p>
-                    <strong>Last updated:</strong>
-                    {{ object.last_edited_at }} by "{{ object.last_edited_by.initials }}"
-                </p>
+                </div>
+                <div class="col-xs-6">
+                    {% if object.meet_at %}
+                        <p>
+                            <strong>Crew meet:</strong>
+                            {{ object.meet_at|date:"H:i" }} {{ object.meet_at|date:"(Y-m-d)" }}
+                        </p>
+                    {% endif %}
+                    {% if object.access_at %}
+                        <p>
+                            <strong>Access at:</strong>
+                            {{ object.access_at|date:"H:i" }} {{ object.access_at|date:"(Y-m-d)" }}
+                        </p>
+                    {% endif %}
+                    <p>
+                        <strong>Last updated:</strong>
+                        {{ object.last_edited_at }} by "{{ object.last_edited_by.initials }}"
+                    </p>
+                </div>
            </div>
+            {% if object.description %}
+                <p>
+                    <strong>Description: </strong>
+                    {{ object.description|linebreaksbr }}
+                </p>
+            {% endif %}
        </div>
-        {% if object.description %}
-            <p>
-            <strong>Description: </strong>
-            {{ object.description|linebreaksbr }}
-            </p>
-        {% endif %}
-        </table>
    </div>
-</div>
 {% endblock %}
--- a/RIGS/templates/event_form.html
+++ b/RIGS/templates/event_form.html
@@ -30,21 +30,6 @@
    {% include 'partials/datetime-fix.html' %}

    <script>
-        function setTime23Hours() {
-            $('#{{ form.end_time.id_for_label }}').val('23:00');
-        }
-
-        function setTime02Hours() {
-            var id_start = "{{ form.start_date.id_for_label }}";
-            var id_end_date = "{{ form.end_date.id_for_label }}";
-            var id_end_time = "{{ form.end_time.id_for_label }}";
-            if ($('#'+id_start).val() == $('#'+id_end_date).val()) {
-                var end_date = new Date($('#'+id_end_date).val());
-                end_date.setDate(end_date.getDate() + 1);
-                $('#'+id_end_date).val(end_date.getISOString());
-            }
-            $('#'+id_end_time).val('02:00');
-        }
        const matches = window.matchMedia("(prefers-reduced-motion: reduce)").matches || window.matchMedia("(update: slow)").matches;
        $(document).ready(function () {
            dur = matches ? 0 : 500;
@@ -53,14 +38,14 @@
                    $('.form-is_rig').slideUp(dur);
                });
            {% elif not object.pk and form.errors %}
-                if ($('#{{form.is_rig.auto_id}}').attr('checked') != 'checked') {
+                if ($('#{{form.is_rig.auto_id}}').attr('checked') !== 'checked') {
                    $('.form-is_rig').hide();
                }
            {% endif %}
            {% if not object.pk %}
                $('#is_rig-selector button').on('click', function () {
                    $('.form-non_rig').slideDown(dur);
-                    if ($(this).data('is_rig') == 1) {
+                    if ($(this).data('is_rig') === 1) {
                        $('#{{form.is_rig.auto_id}}').prop('checked', true);
                        if ($('.form-non_rig').is(':hidden')) {
                            $('.form-is_rig').show();
--- a/RIGS/templates/eventauthorisation_client_request.html
+++ b/RIGS/templates/eventauthorisation_client_request.html
@@ -36,6 +36,7 @@

    <p>Your event will not be booked until you complete this form.</p>

-    <p>TEC PA &amp; Lighting<br/>
+    <p>TEC PA &amp; Lighting</p>
+    <br/>

 {% endblock %}
--- a/RIGS/templates/invoice_detail.html
+++ b/RIGS/templates/invoice_detail.html
@@ -60,10 +60,10 @@
                        <table class="table table-hover">
                            <thead>
                                <tr>
-                                    <th scope="col">Date</td>
-                                    <th scope="col">Amount</td>
-                                    <th scope="col">Method</td>
-                                    <th scope="col"></td>
+                                    <th scope="col">Date</th>
+                                    <th scope="col">Amount</th>
+                                    <th scope="col">Method</th>
+                                    <th scope="col"></th>
                                </tr>
                            </thead>
                            <tbody>
@@ -73,7 +73,7 @@
                                    <td>{{ payment.amount|floatformat:2 }}</td>
                                    <td>{{ payment.get_method_display }}</td>
                                    <td>
-                                        <a href="{% url 'payment_delete' payment.pk %}" class="btn btn-small btn-danger"><span class="fas fa-times"</a>
+                                        <a href="{% url 'payment_delete' payment.pk %}" class="btn btn-small btn-danger"><span class="fas fa-times"></span></a>
                                    </td>
                                </tr>
                            {% endfor %}
--- a/RIGS/templates/invoice_list.html
+++ b/RIGS/templates/invoice_list.html
@@ -27,7 +27,7 @@
                        <span class="text-muted">{% if invoice.void %}(VOID){% elif invoice.is_closed %}(PAID){% else %}(O/S){% endif %}</span></th>
                        <td><a href="{% url 'event_detail' invoice.event.pk %}">N{{ invoice.event.pk|stringformat:"05d" }}</a>: {{ invoice.event.name }} <br>
                            <span class="text-muted">{{ invoice.event.get_status_display }}{% if not invoice.event.mic %}, No MIC{% endif %}
-                            </span></td>
+                            </span>
                        </td>
                        <td>{% if invoice.event.organisation %}
                                {{ invoice.event.organisation.name }}
--- a/RIGS/templates/partials/ec_power_info.html
+++ b/RIGS/templates/partials/ec_power_info.html
@@ -20,6 +20,7 @@
                <tr>
                    <td>300</td>
                    <td>167</td>
+                </tr>
                <tr>
                    <td>500</td>
                    <td>100</td>
--- a/RIGS/templates/risk_assessment_detail.html
+++ b/RIGS/templates/risk_assessment_detail.html
@@ -5,8 +5,8 @@
 {% load linkornone from filters %}

 {% block content %}
-<div class="row py-3">
-    <div class="col-12">
+    <div class="row py-3">
+        <div class="col-12">
            <h3>Risk Assessment for Event N{{ object.event.pk|stringformat:"05d" }} {{ object.event.name }}</h3>
            <div class="card card-default mb-3">
                <div class="card-header">General</div>
@@ -152,13 +152,12 @@
                </div>
            </div>
        </div>
+        <div class="col-12 text-right">
+            <a href="{% url 'ra_edit' object.pk %}" class="btn btn-warning my-3"><span class="fas fa-edit"></span> <span
+                    class="d-none d-sm-inline">Edit</span></a>
+            <a href="{% url 'event_detail' object.event.pk %}" class="btn btn-primary"><span class="fas fa-eye"></span> View Event</a>
+            {{ object.review_string|safe }}
+            {% include 'partials/last_edited.html' with target="riskassessment_history" %}
+        </div>
    </div>
-    <div class="col-12 text-right">
-        <a href="{% url 'ra_edit' object.pk %}" class="btn btn-warning my-3"><span class="fas fa-edit"></span> <span
-            class="d-none d-sm-inline">Edit</span></a>
-        <a href="{% url 'event_detail' object.event.pk %}" class="btn btn-primary"><span class="fas fa-eye"></span> View Event</a>
-        {{ object.review_string|safe }}
-        {% include 'partials/last_edited.html' with target="riskassessment_history" %}
-    </div>
-</div>
 {% endblock %}
--- a/RIGS/templates/risk_assessment_form.html
+++ b/RIGS/templates/risk_assessment_form.html
@@ -27,12 +27,7 @@

    <script>
        function parseBool(str) {
-            if (str.toLowerCase() == 'true') {
-                return true
-            }
-            else {
-                return false
-            }
+            return str.toLowerCase() == 'true';
        }
        $('input[type=radio][name=big_power]').change(function() {
            $('#{{ form.power_mic.id_for_label }}').prop('required', parseBool(this.value));
--- a/RIGS/templatetags/filters.py
+++ b/RIGS/templatetags/filters.py
@@ -1,15 +1,15 @@
-from django import template
 from django import forms
+from django import template
 from django.forms.forms import NON_FIELD_ERRORS
 from django.forms.utils import ErrorDict
-from django.utils.text import normalize_newlines
 from django.template.defaultfilters import stringfilter
-from django.utils.safestring import SafeData, mark_safe
-from django.utils.html import escape
-from RIGS import models
-import json
 from django.template.defaultfilters import yesno, title, truncatewords
 from django.urls import reverse_lazy
+from django.utils.html import escape
+from django.utils.safestring import SafeData, mark_safe
+from django.utils.text import normalize_newlines
+
+from RIGS import models

 register = template.Library()

--- a/RIGS/tests/pages.py
+++ b/RIGS/tests/pages.py
@@ -1,14 +1,12 @@
-from pypom import Page, Region
-from selenium.webdriver.common.by import By
-from selenium.webdriver.support import expected_conditions
-from selenium.webdriver import Chrome
 from django.urls import reverse
-from PyRIGS.tests import regions
-from RIGS.tests import regions as rigs_regions
-from PyRIGS.tests.pages import BasePage, FormPage
-from selenium.common.exceptions import NoSuchElementException
+from pypom import Region
+from selenium.webdriver.common.by import By
 from selenium.webdriver.support import expected_conditions as EC

+from PyRIGS.tests import regions
+from PyRIGS.tests.pages import BasePage, FormPage
+from RIGS.tests import regions as rigs_regions
+

 class Index(BasePage):
    URL_TEMPLATE = reverse('index')
@@ -304,3 +302,43 @@ class UserPage(BasePage):

    def generate_key(self):
        self.find_element(*self._generation_button_selector).click()
+
+
+class CalendarPage(BasePage):
+    URL_TEMPLATE = 'rigboard/calendar'
+
+    _go_locator = (By.ID, 'go-to-date-button')
+
+    _today_selector = (By.ID, 'today-button')
+
+    _prev_selector = (By.ID, 'prev-button')
+    _next_selector = (By.ID, 'next-button')
+
+    _month_selector = (By.ID, 'month-button')
+    _week_selector = (By.ID, 'week-button')
+    _day_selector = (By.ID, 'day-button')
+
+    def go(self):
+        return self.find_element(*self._go_locator).click()
+
+    @property
+    def target_date(self):
+        return regions.DatePicker(self, self.find_element(By.ID, 'go-to-date-input'))
+
+    def today(self):
+        return self.find_element(*self._today_selector).click()
+
+    def prev(self):
+        return self.find_element(*self._prev_selector).click()
+
+    def next(self):
+        return self.find_element(*self._next_selector).click()
+
+    def month(self):
+        return self.find_element(*self._month_selector).click()
+
+    def week(self):
+        return self.find_element(*self._week_selector).click()
+
+    def day(self):
+        return self.find_element(*self._day_selector).click()
--- a/RIGS/tests/regions.py
+++ b/RIGS/tests/regions.py
@@ -1,10 +1,6 @@
 from pypom import Region
 from selenium.webdriver.common.by import By
-from selenium.webdriver.support import expected_conditions
-from selenium.webdriver.remote.webelement import WebElement
-from selenium.webdriver.support.ui import WebDriverWait
-from selenium.webdriver.support.select import Select
-import datetime
+
 from PyRIGS.tests.regions import TextBox, Modal


--- a/RIGS/tests/test_functional.py
+++ b/RIGS/tests/test_functional.py
@@ -1,22 +1,15 @@
 import datetime
-from datetime import date, time, timedelta
-from urllib.parse import urlparse
+from datetime import date

+import pytest
 from django.conf import settings
 from django.core import mail, signing
-from django.core.management import call_command
-from django.db import transaction
 from django.http import HttpResponseBadRequest
 from django.test import TestCase
-from django.test.client import Client
-from django.test.utils import override_settings
 from django.urls import reverse
-from django.utils import timezone
-from reversion import revisions as reversion
-from RIGS import models, urls
-from RIGS.tests import regions

-from . import pages
+from RIGS import models
+from pytest_django.asserts import assertContains, assertNotContains


 class BaseCase(TestCase):
@@ -52,12 +45,32 @@ class TestEventValidation(BaseCase):
    def test_create(self):
        url = reverse('event_create')
        # end time before start access after start
-        response = self.client.post(url, {'start_date': datetime.date(2020, 1, 1), 'start_time': datetime.time(10, 00), 'end_time': datetime.time(9, 00), 'access_at': datetime.datetime(2020, 1, 5, 10)})
-        self.assertFormError(response, 'form', 'end_time', "Unless you've invented time travel, the event can't finish before it has started.")
-        self.assertFormError(response, 'form', 'access_at', "Regardless of what some clients might think, access time cannot be after the event has started.")
+        response = self.client.post(url, {'start_date': datetime.date(2020, 1, 1), 'start_time': datetime.time(10, 00),
+                                          'end_time': datetime.time(9, 00),
+                                          'access_at': datetime.datetime(2020, 1, 5, 10)})
+        self.assertFormError(response, 'form', 'end_time',
+                             "Unless you've invented time travel, the event can't finish before it has started.")
+        self.assertFormError(response, 'form', 'access_at',
+                             "Regardless of what some clients might think, access time cannot be after the event has started.")


-class ClientEventAuthorisationTest(BaseCase):
+def setup_event():
+    models.VatRate.objects.create(start_at='2014-03-05', rate=0.20, comment='test1')
+    venue = models.Venue.objects.create(name='Authorisation Test Venue')
+    client = models.Person.objects.create(name='Authorisation Test Person', email='authorisation@functional.test')
+    organisation = models.Organisation.objects.create(name='Authorisation Test Organisation', union_account=True)
+    return models.Event.objects.create(
+        name='Authorisation Test',
+        start_date=date.today(),
+        venue=venue,
+        person=client,
+        organisation=organisation,
+    )
+
+
+def setup_mail(event, profile):
+    profile.email = "teccie@nottinghamtec.co.uk"
+    profile.save()
    auth_data = {
        'name': 'Test ABC',
        'po': '1234ABCZXY',
@@ -65,72 +78,78 @@ class ClientEventAuthorisationTest(BaseCase):
        'uni_id': 1234567890,
        'tos': True
    }
+    hmac = signing.dumps({'pk': event.pk, 'email': 'authemail@function.test',
+                          'sent_by': profile.pk})
+    url = reverse('event_authorise', kwargs={'pk': event.pk, 'hmac': hmac})
+    return auth_data, hmac, url

-    def setUp(self):
-        super().setUp()
-        self.hmac = signing.dumps({'pk': self.event.pk, 'email': 'authemail@function.test',
-                                   'sent_by': self.profile.pk})
-        self.url = reverse('event_authorise', kwargs={'pk': self.event.pk, 'hmac': self.hmac})

-    def test_requires_valid_hmac(self):
-        bad_hmac = self.hmac[:-1]
-        url = reverse('event_authorise', kwargs={'pk': self.event.pk, 'hmac': bad_hmac})
-        response = self.client.get(url)
-        self.assertIsInstance(response, HttpResponseBadRequest)
-        # TODO: Add some form of sensbile user facing error
-        # self.assertIn(response.content, "new URL")  # check there is some level of sane instruction
+def test_requires_valid_hmac(client, admin_user):
+    event = setup_event()
+    auth_data, hmac, url = setup_mail(event, admin_user)
+    bad_hmac = hmac[:-1]
+    url = reverse('event_authorise', kwargs={'pk': event.pk, 'hmac': bad_hmac})
+    response = client.get(url)
+    assert isinstance(response, HttpResponseBadRequest)
+    # TODO: Add some form of sensible user facing error
+    # self.assertIn(response.content, "new URL")  # check there is some level of sane instruction
+    # response = client.get(url)
+    # assertContains(response, event.organisation.name)

-        response = self.client.get(self.url)
-        self.assertContains(response, self.event.organisation.name)

-    def test_validation(self):
-        response = self.client.get(self.url)
-        self.assertContains(response, "Terms of Hire")
-        self.assertContains(response, "Account code")
-        self.assertContains(response, "University ID")
+def test_validation(client, admin_user):
+    event = setup_event()
+    auth_data, hmac, url = setup_mail(event, admin_user)
+    response = client.get(url)
+    assertContains(response, "Terms of Hire")
+    assertContains(response, "Account code")
+    assertContains(response, "University ID")

-        response = self.client.post(self.url)
-        self.assertContains(response, "This field is required.", 5)
+    response = client.post(url)
+    assertContains(response, "This field is required.", 5)

-        data = self.auth_data
-        data['amount'] = self.event.total + 1
+    auth_data['amount'] = event.total + 1

-        response = self.client.post(self.url, data)
-        self.assertContains(response, "The amount authorised must equal the total for the event")
-        self.assertNotContains(response, "This field is required.")
+    response = client.post(url, auth_data)
+    assertContains(response, "The amount authorised must equal the total for the event")
+    assertNotContains(response, "This field is required.")

-        data['amount'] = self.event.total
-        response = self.client.post(self.url, data)
-        self.assertContains(response, "Your event has been authorised")
+    auth_data['amount'] = event.total
+    response = client.post(url, auth_data)
+    assertContains(response, "Your event has been authorised")

-        self.event.refresh_from_db()
-        self.assertTrue(self.event.authorised)
-        self.assertEqual(self.event.authorisation.email, "authemail@function.test")
+    event.refresh_from_db()
+    assert event.authorised
+    assert str(event.authorisation.email) == "authemail@function.test"

-    def test_duplicate_warning(self):
-        auth = models.EventAuthorisation.objects.create(event=self.event, name='Test ABC', email='dupe@functional.test',
-                                                        amount=self.event.total, sent_by=self.profile)
-        response = self.client.get(self.url)
-        self.assertContains(response, 'This event has already been authorised.')

-        auth.amount += 1
-        auth.save()
+def test_duplicate_warning(client, admin_user):
+    event = setup_event()
+    auth_data, hmac, url = setup_mail(event, admin_user)
+    auth = models.EventAuthorisation.objects.create(event=event, name='Test ABC', email='dupe@functional.test',
+                                                    amount=event.total, sent_by=admin_user)
+    response = client.get(url)
+    assertContains(response, 'This event has already been authorised.')

-        response = self.client.get(self.url)
-        self.assertContains(response, 'amount has changed')
+    auth.amount += 1
+    auth.save()

-    def test_email_sent(self):
-        mail.outbox = []
+    response = client.get(url)
+    assertContains(response, 'amount has changed')

-        data = self.auth_data
-        data['amount'] = self.event.total

-        response = self.client.post(self.url, data)
-        self.assertContains(response, "Your event has been authorised.")
-        self.assertEqual(len(mail.outbox), 2)
+@pytest.mark.django_db(transaction=True)
+def test_email_sent(admin_client, admin_user, mailoutbox):
+    event = setup_event()
+    auth_data, hmac, url = setup_mail(event, admin_user)

-        self.assertEqual(mail.outbox[0].to, ['authemail@function.test'])
-        self.assertEqual(mail.outbox[1].to, [settings.AUTHORISATION_NOTIFICATION_ADDRESS])
+    data = auth_data
+    data['amount'] = event.total
+    response = admin_client.post(url, data)
+    assertContains(response, "Your event has been authorised.")
+    assert len(mailoutbox) == 2
+    assert mailoutbox[0].to == ['authemail@function.test']
+    assert mailoutbox[1].to == [settings.AUTHORISATION_NOTIFICATION_ADDRESS]


 class TECEventAuthorisationTest(BaseCase):
--- a/RIGS/tests/test_interaction.py
+++ b/RIGS/tests/test_interaction.py
@@ -1,31 +1,19 @@
 import datetime
 from datetime import date, time, timedelta
-from urllib.parse import urlparse

-from django.conf import settings
-from django.core import mail, signing
-from django.core.management import call_command
-from django.db import transaction
-from django.http import HttpResponseBadRequest
 from django.test.client import Client
-from django.test.utils import override_settings
-from django.urls import reverse
 from django.utils import timezone
-from PyRIGS.tests import base
-from PyRIGS.tests import regions as base_regions
-from PyRIGS.tests.base import (AutoLoginTest, BaseTest, animation_is_finished,
-                               screenshot_failure_cls)
-from reversion import revisions as reversion
-from RIGS import models, urls
-from RIGS.tests import regions
-from selenium.common.exceptions import NoSuchElementException
 from selenium.webdriver.common.action_chains import ActionChains
 from selenium.webdriver.common.by import By
-from selenium.webdriver.common.keys import Keys
 from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.support.ui import WebDriverWait
-from selenium.webdriver.common.action_chains import ActionChains

+from PyRIGS.tests import base
+from PyRIGS.tests import regions as base_regions
+from PyRIGS.tests.base import (AutoLoginTest, screenshot_failure_cls)
+from PyRIGS.tests.pages import animation_is_finished
+from RIGS import models
+from RIGS.tests import regions
 from . import pages


@@ -251,7 +239,7 @@ class TestEventCreate(BaseRigboardTest):
        # Double-check we don't lose data when swapping
        self.page.select_event_type("Rig")
        self.wait.until(animation_is_finished())
-        self.assertEquals(self.page.name, rig_name)
+        self.assertEqual(self.page.name, rig_name)
        self.wait.until(animation_is_finished())
        self.page.select_event_type("Non-Rig")

@@ -645,7 +633,18 @@ class TestCalendar(BaseRigboardTest):
            else:
                self.assertNotContains(response, "TE E" + str(test) + " ")

-                # Wow - that was a lot of tests
+    def test_calendar_buttons(self):  # If FullCalendar fails to load for whatever reason, the buttons don't work
+        self.page = pages.CalendarPage(self.driver, self.live_server_url).open()
+        self.assertIn(timezone.now().strftime("%Y-%m"), self.driver.current_url)
+
+        target_date = datetime.date(2020, 1, 1)
+        self.page.target_date.set_value(target_date)
+        self.page.go()
+        self.assertIn(self.page.target_date.value.strftime("%Y-%m"), self.driver.current_url)
+
+        self.page.next()
+        target_date += datetime.timedelta(days=32)
+        self.assertIn(target_date.strftime("%m"), self.driver.current_url)


@screenshot_failure_cls
--- a/RIGS/tests/test_models.py
+++ b/RIGS/tests/test_models.py
@@ -1,13 +1,12 @@
-import pytz
-from reversion import revisions as reversion
-from django.conf import settings
-from django.core.exceptions import ValidationError
-from django.test import TestCase
-from RIGS import models
-from versioning import versioning
 from datetime import date, timedelta, datetime, time
 from decimal import *
-from PyRIGS.tests.base import create_browser
+
+import pytz
+from django.conf import settings
+from django.test import TestCase
+from reversion import revisions as reversion
+
+from RIGS import models


 class ProfileTestCase(TestCase):
--- a/RIGS/tests/test_unit.py
+++ b/RIGS/tests/test_unit.py
@@ -2,13 +2,14 @@ from datetime import date

 from django.core.exceptions import ObjectDoesNotExist
 from django.core.management import call_command
-from django.urls import reverse
 from django.test import TestCase
 from django.test.utils import override_settings
+from django.urls import reverse, reverse_lazy
 from django.utils import timezone
+from pytest_django.asserts import assertRedirects, assertNotContains, assertContains

+from PyRIGS.tests.base import assert_times_equal
 from RIGS import models
-from reversion import revisions as reversion


 class TestAdminMergeObjects(TestCase):
@@ -354,203 +355,105 @@ class TestSampleDataGenerator(TestCase):
        self.assertRaisesRegex(CommandError, ".*production", call_command, 'generateSampleRIGSData')


-class TestSearchLogic(TestCase):
-    @classmethod
-    def setUpTestData(cls):
-        cls.profile = models.Profile.objects.create(username="testuser1", email="1@test.com", is_superuser=True,
-                                                    is_active=True, is_staff=True)
-
-        cls.persons = {
-            1: models.Person.objects.create(name="Right Person", phone="1234"),
-            2: models.Person.objects.create(name="Wrong Person", phone="5678"),
-        }
-
-        cls.organisations = {
-            1: models.Organisation.objects.create(name="Right Organisation", email="test@example.com"),
-            2: models.Organisation.objects.create(name="Wrong Organisation", email="check@fake.co.uk"),
-        }
-
-        cls.venues = {
-            1: models.Venue.objects.create(name="Right Venue", address="1 Test Street, EX1"),
-            2: models.Venue.objects.create(name="Wrong Venue", address="2 Check Way, TS2"),
-        }
-
-        cls.events = {
-            1: models.Event.objects.create(name="Right Event", start_date=date.today(), person=cls.persons[1],
-                                           organisation=cls.organisations[1], venue=cls.venues[1]),
-            2: models.Event.objects.create(name="Wrong Event", start_date=date.today(), person=cls.persons[2],
-                                           organisation=cls.organisations[2], venue=cls.venues[2]),
-        }
-
-    def setUp(self):
-        self.profile.set_password('testuser')
-        self.profile.save()
-        self.assertTrue(self.client.login(username=self.profile.username, password='testuser'))
-
-    def test_event_search(self):
-        # Test search by name
-        request_url = "%s?q=%s" % (reverse('event_archive'), self.events[1].name)
-        response = self.client.get(request_url, follow=True)
-        self.assertContains(response, self.events[1].name)
-        self.assertNotContains(response, self.events[2].name)
-
-        # Test search by ID
-        request_url = "%s?q=%s" % (reverse('event_archive'), self.events[1].pk)
-        response = self.client.get(request_url, follow=True)
-        self.assertContains(response, self.events[1].name)
-        self.assertNotContains(response, self.events[2].name)
-
-    def test_people_search(self):
-        # Test search by name
-        request_url = "%s?q=%s" % (reverse('person_list'), self.persons[1].name)
-        response = self.client.get(request_url, follow=True)
-        self.assertContains(response, self.persons[1].name)
-        self.assertNotContains(response, self.persons[2].name)
-
-        # Test search by ID
-        request_url = "%s?q=%s" % (reverse('person_list'), self.persons[1].pk)
-        response = self.client.get(request_url, follow=True)
-        self.assertContains(response, self.persons[1].name)
-        self.assertNotContains(response, self.persons[2].name)
-
-        # Test search by phone
-        request_url = "%s?q=%s" % (reverse('person_list'), self.persons[1].phone)
-        response = self.client.get(request_url, follow=True)
-        self.assertContains(response, self.persons[1].name)
-        self.assertNotContains(response, self.persons[2].name)
-
-    def test_organisation_search(self):
-        # Test search by name
-        request_url = "%s?q=%s" % (reverse('organisation_list'), self.organisations[1].name)
-        response = self.client.get(request_url, follow=True)
-        self.assertContains(response, self.organisations[1].name)
-        self.assertNotContains(response, self.organisations[2].name)
-
-        # Test search by ID
-        request_url = "%s?q=%s" % (reverse('organisation_list'), self.organisations[1].pk)
-        response = self.client.get(request_url, follow=True)
-        self.assertContains(response, self.organisations[1].name)
-        self.assertNotContains(response, self.organisations[2].name)
-
-        # Test search by email
-        request_url = "%s?q=%s" % (reverse('organisation_list'), self.organisations[1].email)
-        response = self.client.get(request_url, follow=True)
-        self.assertContains(response, self.organisations[1].email)
-        self.assertNotContains(response, self.organisations[2].email)
-
-    def test_venue_search(self):
-        # Test search by name
-        request_url = "%s?q=%s" % (reverse('venue_list'), self.venues[1].name)
-        response = self.client.get(request_url, follow=True)
-        self.assertContains(response, self.venues[1].name)
-        self.assertNotContains(response, self.venues[2].name)
-
-        # Test search by ID
-        request_url = "%s?q=%s" % (reverse('venue_list'), self.venues[1].pk)
-        response = self.client.get(request_url, follow=True)
-        self.assertContains(response, self.venues[1].name)
-        self.assertNotContains(response, self.venues[2].name)
-
-        # Test search by address
-        request_url = "%s?q=%s" % (reverse('venue_list'), self.venues[1].address)
-        response = self.client.get(request_url, follow=True)
-        self.assertContains(response, self.venues[1].address)
-        self.assertNotContains(response, self.venues[2].address)
+def search(client, url, found, notfound, arguments):
+    for argument in arguments:
+        query = getattr(found, argument)
+        request_url = "%s?q=%s" % (reverse_lazy(url), query)
+        response = client.get(request_url, follow=True)
+        assertContains(response, getattr(found, 'name'))
+        assertNotContains(response, getattr(notfound, 'name'))


-class TestHSLogic(TestCase):
-    @classmethod
-    def setUpTestData(cls):
-        cls.profile = models.Profile.objects.create(username="testuser1", email="1@test.com", is_superuser=True,
-                                                    is_active=True, is_staff=True)
+def test_search(admin_client):
+    persons = {
+        1: models.Person.objects.create(name="Right Person", phone="1234"),
+        2: models.Person.objects.create(name="Wrong Person", phone="5678"),
+    }
+    organisations = {
+        1: models.Organisation.objects.create(name="Right Organisation", email="test@example.com"),
+        2: models.Organisation.objects.create(name="Wrong Organisation", email="check@fake.co.uk"),
+    }
+    venues = {
+        1: models.Venue.objects.create(name="Right Venue", address="1 Test Street, EX1"),
+        2: models.Venue.objects.create(name="Wrong Venue", address="2 Check Way, TS2"),
+    }
+    events = {
+        1: models.Event.objects.create(name="Right Event", start_date=date.today(), venue=venues[1], person=persons[1],
+                                       organisation=organisations[1]),
+        2: models.Event.objects.create(name="Wrong Event", start_date=date.today(), venue=venues[2], person=persons[2],
+                                       organisation=organisations[2]),
+    }
+    search(admin_client, 'event_archive', events[1], events[2], ['name', 'id'])
+    search(admin_client, 'person_list', persons[1], persons[2], ['name', 'id', 'phone'])
+    search(admin_client, 'organisation_list', organisations[1], organisations[2],
+           ['name', 'id', 'email'])
+    search(admin_client, 'venue_list', venues[1], venues[2],
+           ['name', 'id', 'address'])

-        cls.vatrate = models.VatRate.objects.create(start_at='2014-03-05', rate=0.20, comment='test1')
-        cls.venue = models.Venue.objects.create(name="Venue 1")

-        cls.events = {
-            1: models.Event.objects.create(name="TE E1", start_date=date.today(),
-                                           description="This is an event description\nthat for a very specific reason spans two lines.",
-                                           venue=cls.venue),
-            2: models.Event.objects.create(name="TE E2", start_date=date.today()),
-        }
+def setup_for_hs():
+    models.VatRate.objects.create(start_at='2014-03-05', rate=0.20, comment='test1')
+    venue = models.Venue.objects.create(name="Venue 1")
+    return venue, {
+        1: models.Event.objects.create(name="TE E1", start_date=date.today(),
+                                       description="This is an event description\nthat for a very specific reason spans two lines.",
+                                       venue=venue),
+        2: models.Event.objects.create(name="TE E2", start_date=date.today()),
+    }

-        cls.ras = {
-            1: models.RiskAssessment.objects.create(event=cls.events[1],
-                                                    nonstandard_equipment=False,
-                                                    nonstandard_use=False,
-                                                    contractors=False,
-                                                    other_companies=False,
-                                                    crew_fatigue=False,
-                                                    big_power=False,
-                                                    power_mic=cls.profile,
-                                                    generators=False,
-                                                    other_companies_power=False,
-                                                    nonstandard_equipment_power=False,
-                                                    multiple_electrical_environments=False,
-                                                    noise_monitoring=False,
-                                                    known_venue=True,
-                                                    safe_loading=True,
-                                                    safe_storage=True,
-                                                    area_outside_of_control=True,
-                                                    barrier_required=True,
-                                                    nonstandard_emergency_procedure=True,
-                                                    special_structures=False,
-                                                    suspended_structures=False,
-                                                    outside=False),
-        }

-        cls.checklists = {
-            1: models.EventChecklist.objects.create(event=cls.events[1],
-                                                    power_mic=cls.profile,
-                                                    safe_parking=False,
-                                                    safe_packing=False,
-                                                    exits=False,
-                                                    trip_hazard=False,
-                                                    warning_signs=False,
-                                                    ear_plugs=False,
-                                                    hs_location="Locked away safely",
-                                                    extinguishers_location="Somewhere, I forgot",
-                                                    earthing=False,
-                                                    pat=False,
-                                                    date=timezone.now(),
-                                                    venue=cls.venue),
-        }
+def create_ra(usr):
+    venue, events = setup_for_hs()
+    return models.RiskAssessment.objects.create(event=events[1], nonstandard_equipment=False, nonstandard_use=False,
+                                                contractors=False, other_companies=False, crew_fatigue=False,
+                                                big_power=False, power_mic=usr, generators=False,
+                                                other_companies_power=False, nonstandard_equipment_power=False,
+                                                multiple_electrical_environments=False, noise_monitoring=False,
+                                                known_venue=True, safe_loading=True, safe_storage=True,
+                                                area_outside_of_control=True, barrier_required=True,
+                                                nonstandard_emergency_procedure=True, special_structures=False,
+                                                suspended_structures=False, outside=False)

-    def setUp(self):
-        self.profile.set_password('testuser')
-        self.profile.save()
-        self.assertTrue(self.client.login(username=self.profile.username, password='testuser'))

-    def test_list(self):
-        request_url = reverse('hs_list')
-        response = self.client.get(request_url, follow=True)
-        self.assertContains(response, self.events[1].name)
-        self.assertContains(response, self.events[2].name)
-        self.assertContains(response, 'Create')
+def create_checklist(usr):
+    venue, events = setup_for_hs()
+    return models.EventChecklist.objects.create(event=events[1], power_mic=usr, safe_parking=False,
+                                                safe_packing=False, exits=False, trip_hazard=False, warning_signs=False,
+                                                ear_plugs=False, hs_location="Locked away safely",
+                                                extinguishers_location="Somewhere, I forgot", earthing=False, pat=False,
+                                                date=timezone.now(), venue=venue)

-    def test_ra_review(self):
-        request_url = reverse('ra_review', kwargs={'pk': self.ras[1].pk})
-        response = self.client.get(request_url, follow=True)
-        self.assertContains(response, 'Reviewed by')
-        self.assertContains(response, self.profile.name)
-        ra = models.RiskAssessment.objects.get(event=self.events[1])
-        self.assertEqual(timezone.now().date(), ra.reviewed_at.date())
-        self.assertEqual(timezone.now().hour, ra.reviewed_at.hour)
-        self.assertEqual(timezone.now().minute, ra.reviewed_at.minute)

-    def test_checklist_review(self):
-        request_url = reverse('ec_review', kwargs={'pk': self.checklists[1].pk})
-        response = self.client.get(request_url, follow=True)
-        self.assertContains(response, 'Reviewed by')
-        self.assertContains(response, self.profile.name)
-        checklist = models.EventChecklist.objects.get(event=self.events[1])
-        self.assertEqual(timezone.now().date(), checklist.reviewed_at.date())
-        self.assertEqual(timezone.now().hour, checklist.reviewed_at.hour)
-        self.assertEqual(timezone.now().minute, checklist.reviewed_at.minute)
+def test_list(admin_client):
+    venue, events = setup_for_hs()
+    request_url = reverse('hs_list')
+    response = admin_client.get(request_url, follow=True)
+    assertContains(response, events[1].name)
+    assertContains(response, events[2].name)
+    assertContains(response, 'Create')

-    def test_ra_redirect(self):
-        request_url = reverse('event_ra', kwargs={'pk': self.events[1].pk})
-        expected_url = reverse('ra_edit', kwargs={'pk': self.ras[1].pk})

-        response = self.client.get(request_url, follow=True)
-        self.assertRedirects(response, expected_url, status_code=302, target_status_code=200)
+def review(client, profile, obj, request_url):
+    time = timezone.now()
+    response = client.get(reverse(request_url, kwargs={'pk': obj.pk}), follow=True)
+    obj.refresh_from_db()
+    assertContains(response, 'Reviewed by')
+    assertContains(response, profile.name)
+    assert_times_equal(time, obj.reviewed_at)
+
+
+def test_ra_review(admin_client, admin_user):
+    review(admin_client, admin_user, create_ra(admin_user), 'ra_review')
+
+
+def test_checklist_review(admin_client, admin_user):
+    review(admin_client, admin_user, create_checklist(admin_user), 'ec_review')
+
+
+def test_ra_redirect(admin_client, admin_user):
+    ra = create_ra(admin_user)
+    request_url = reverse('event_ra', kwargs={'pk': ra.event.pk})
+    expected_url = reverse('ra_edit', kwargs={'pk': ra.pk})
+
+    response = admin_client.get(request_url, follow=True)
+    assertRedirects(response, expected_url, status_code=302, target_status_code=200)
--- a/RIGS/urls.py
+++ b/RIGS/urls.py
@@ -1,11 +1,12 @@
-from django.conf.urls import url
 from django.contrib.auth.decorators import login_required
-from django.urls import path
+from django.contrib.auth.decorators import login_required
+from django.urls import path, re_path
 from django.views.decorators.clickjacking import xframe_options_exempt
 from django.views.generic import RedirectView
+
 from PyRIGS.decorators import (api_key_required, has_oembed,
                               permission_required_with_403)
-from RIGS import finance, ical, models, rigboard, views, hs
+from RIGS import finance, ical, rigboard, views, hs

 urlpatterns = [
    # People
@@ -45,10 +46,10 @@ urlpatterns = [
    path('rigboard/', login_required(rigboard.RigboardIndex.as_view()), name='rigboard'),
    path('rigboard/calendar/', login_required()(rigboard.WebCalendar.as_view()),
         name='web_calendar'),
-    url(r'^rigboard/calendar/(?P<view>(month|week|day))/$',
-        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}))/$',
-        login_required()(rigboard.WebCalendar.as_view()), name='web_calendar'),
+    re_path(r'^rigboard/calendar/(?P<view>(month|week|day))/$',
+            login_required()(rigboard.WebCalendar.as_view()), name='web_calendar'),
+    re_path(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'),
    path('rigboard/archive/', RedirectView.as_view(permanent=True, pattern_name='event_archive')),


@@ -130,12 +131,12 @@ urlpatterns = [
    path('event/<int:pk>/auth/preview/',
         permission_required_with_403('RIGS.change_event')(rigboard.EventAuthoriseRequestEmailPreview.as_view()),
         name='event_authorise_preview'),
-    url(r'^event/(?P<pk>\d+)/(?P<hmac>[-:\w]+)/$', rigboard.EventAuthorise.as_view(),
-        name='event_authorise'),
+    re_path(r'^event/(?P<pk>\d+)/(?P<hmac>[-:\w]+)/$', rigboard.EventAuthorise.as_view(),
+            name='event_authorise'),

    # ICS Calendar - API key authentication
-    url(r'^ical/(?P<api_pk>\d+)/(?P<api_key>\w+)/rigs.ics$', api_key_required(ical.CalendarICS()),
-        name="ics_calendar"),
+    re_path(r'^ical/(?P<api_pk>\d+)/(?P<api_key>\w+)/rigs.ics$', api_key_required(ical.CalendarICS()),
+            name="ics_calendar"),


    # Legacy URLs
--- a/RIGS/views.py
+++ b/RIGS/views.py
@@ -1,25 +1,5 @@
-from django.core.exceptions import PermissionDenied
-from django.http.response import HttpResponseRedirect
-from django.http import HttpResponse
-from django.urls import reverse_lazy, reverse, NoReverseMatch
-from django.views import generic
-from django.contrib.auth.views import LoginView
-from django.db.models import Q
-from django.shortcuts import get_object_or_404
-from django.core import serializers
-from django.conf import settings
-import simplejson
-import datetime
-import pytz
-import operator
-from registration.views import RegistrationView
-from django.views.decorators.csrf import csrf_exempt
-
-from RIGS import models, forms
-from assets import models as asset_models
-from functools import reduce
-
 from PyRIGS.views import GenericListView, GenericDetailView, GenericUpdateView, GenericCreateView, ModalURLMixin
+from RIGS import models


 class PersonList(GenericListView):
				`@@ -1,2 +0,0 @@`

				`/# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiIsImZpbGUiOiJpZS5jc3MiLCJzb3VyY2VzQ29udGVudCI6W119 /`
				`@@ -1 +0,0 @@`
				function changeSelectedValue(e,t,a,r){e.find("option").remove(),e.append($("<option></option>").attr("value",t).text(a).data("update_url",r)),e.selectpicker("render"),e.selectpicker("refresh"),e.selectpicker("val",t),e.change()}function refreshUpdateHref(e){targetObject=$("#"+e.attr("id")+"-update"),update_url=$("option:selected",e).data("update_url"),""==update_url?(targetObject.removeAttr("href"),targetObject.addClass("disabled")):(targetObject.prop("href",update_url),targetObject.removeClass("disabled"))}function initPicker(e){var t={ajax:{url:e.data("sourceurl"),type:"GET",dataType:"json",data:{term:"{{{q}}}"}},locale:{emptyTitle:""},clearOnEmpty:!1,preprocessData:function(e){var t,a=e.length,r=[];if(r.push({text:clearSelectionLabel,value:"",data:{update_url:"",subtext:""}}),a)for(t=0;t<a;t++)r.push($.extend(!0,e[t],{text:e[t].label,value:e[t].pk,data:{update_url:e[t].update,subtext:""}}));return r}};e.prepend($("<option></option>").attr("value","").text(clearSelectionLabel).data("update_url","")),e.selectpicker().ajaxSelectPicker(t),e.change((function(){refreshUpdateHref(e)})),refreshUpdateHref(e)}$(document).ready((function(){clearSelectionLabel="(no selection)",$(".selectpicker").each((function(){initPicker($(this))})),$("#modal").on("hide.bs.modal",(function(e){null!=modaltarget&&""!=modalobject&&changeSelectedValue($(modaltarget),modalobject[0].pk,modalobject[0].fields.name,modalobject[0].update_url)}))}));
				`@@ -1 +0,0 @@`
				`!function(){var t,e=document.getElementById("darkSwitch");e&&(t=null!==localStorage.getItem("darkSwitch")&&"dark"===localStorage.getItem("darkSwitch"),(e.checked=t)?document.body.setAttribute("data-theme","dark"):document.body.removeAttribute("data-theme"),e.addEventListener("change",(function(t){e.checked?(document.body.setAttribute("data-theme","dark"),localStorage.setItem("darkSwitch","dark")):(document.body.removeAttribute("data-theme"),localStorage.removeItem("darkSwitch"))})))}();`
				`@@ -1 +0,0 @@`
				$(document).ready((function(){var t;(t=document.createElement("input")).setAttribute("type","datetime-local"),("text"===t.type\|\|navigator.userAgent.toLowerCase().indexOf("firefox")>-1)&&($("<link>").appendTo("head").attr({type:"text/css",rel:"stylesheet"}).attr("href",'{% static "css/flatpickr.css" %}'),$.when($.getScript('{% static "js/flatpickr.min.js" %}'),$.Deferred((function(t){$(t.resolve)}))).done((function(){$("input[type=datetime-local]").attr("type","text").flatpickr({dateFormat:"Y-m-dTH:m",enableTime:!0,altInput:!0,altFormat:"d/m/y H:m"})})))}));
				`@@ -1 +0,0 @@`
				function setupItemTable(t){objectitems=JSON.parse(t),$.each(objectitems,(function(t,e){objectitems[t]=JSON.parse(e)})),newitem=-1}function nl2br(t,e){return(t+"").replace(/([^>\r\n]?)(\r\n\|\n\r\|\r\|\n)/g,"$1"+(e\|\|void 0===e?"<br />":"<br>")+"$2")}function escapeHtml(t){return $("<div/>").text(t).html()}function updatePrices(){var t=0;for(var e in objectitems){var i=objectitems[e].fields,a=i.costi.quantity;$("#item-"+e+" .sub-total").html(parseFloat(a).toFixed(2)).data("subtotal",a),t+=Number(a)}$("#sumtotal").text(parseFloat(t).toFixed(2));var o=tNumber($("#vat-rate").data("rate"));$("#vat").text(parseFloat(o).toFixed(2)),$("#total").text(parseFloat(t+o).toFixed(2))}$("#item-table").on("click",".item-delete",(function(){delete objectitems[$(this).data("pk")],$("#item-"+$(this).data("pk")).remove(),updatePrices()})),$("#item-table").on("click",".item-add",(function(){$("#item-form").data("pk",newitem),$("#item_name").val(""),$("#item_description").val(""),$("#item_quantity").val(""),$("#item_cost").val(""),$($(this).data("target")).modal("show")})),$("#item-table").on("click",".item-edit",(function(){var t=$(this).data("pk");$("#item-form").data("pk",t);var e=objectitems[t].fields;$("#item_name").val(e.name),$("#item_description").val(e.description),$("#item_quantity").val(e.quantity),$("#item_cost").val(e.cost),$($(this).data("target")).modal("show")})),$("body").on("submit","#item-form",(function(t){t.preventDefault();var e,i=$(this).data("pk");if($("#itemModal").modal("hide"),i==newitem--){(e=new Object).name=$("#item_name").val(),e.description=$("#item_description").val(),e.cost=$("#item_cost").val(),e.quantity=$("#item_quantity").val();var a=0;for(item in objectitems)a++;e.order=a,objectitems[i]=new Object,objectitems[i].fields=e,$("#new-item-row").clone().attr("id","item-"+i).data("pk",i).appendTo("#item-table-body"),$("#item-"+i+" .item-delete, #item-"+i+" .item-edit").data("pk",i)}else(e=objectitems[i].fields).name=$("#item_name").val(),e.description=$("#item_description").val(),e.cost=$("#item_cost").val(),e.quantity=$("#item_quantity").val(),objectitems[i].fields=e;$row=$("#item-"+i),$row.find(".name").html(escapeHtml(e.name)),$row.find(".description").html(nl2br(escapeHtml(e.description))),$row.find(".cost").html(parseFloat(e.cost).toFixed(2)),$row.find(".quantity").html(e.quantity),updatePrices()})),$("body").on("submit",".itemised_form",(function(t){$("#id_items_json").val(JSON.stringify(objectitems))}));var fixHelper=function(t,e){return e.children().each((function(){$(this).width($(this).width())})),e};$("#item-table tbody").sortable({helper:fixHelper,update:function(t,e){info=$(this).sortable("toArray"),itemorder=new Array,$.each(info,(function(t,e){pk=$("#"+e).data("pk"),objectitems[pk].fields.order=t}))}});
				`@@ -1 +0,0 @@`
				var Konami=function(t){var e={addEvent:function(t,e,n,o){t.addEventListener?t.addEventListener(e,n,!1):t.attachEvent&&(t["e"+e+n]=n,t[e+n]=function(){t["e"+e+n](window.event,o)},t.attachEvent("on"+e,t[e+n]))},removeEvent:function(t,e,n){t.removeEventListener?t.removeEventListener(e,n):t.attachEvent&&t.detachEvent(e)},input:"",pattern:"38384040373937396665",keydownHandler:function(t,n){if(n&&(e=n),e.input+=t?t.keyCode:event.keyCode,e.input.length>e.pattern.length&&(e.input=e.input.substr(e.input.length-e.pattern.length)),e.input===e.pattern)return e.code(e._currentLink),e.input="",t.preventDefault(),!1},load:function(t){this._currentLink=t,this.addEvent(document,"keydown",this.keydownHandler,this),this.iphone.load(t)},unload:function(){this.removeEvent(document,"keydown",this.keydownHandler),this.iphone.unload()},code:function(t){window.location=t},iphone:{start_x:0,start_y:0,stop_x:0,stop_y:0,tap:!1,capture:!1,orig_keys:"",keys:["UP","UP","DOWN","DOWN","LEFT","RIGHT","LEFT","RIGHT","TAP","TAP"],input:[],code:function(t){e.code(t)},touchmoveHandler:function(t){if(1===t.touches.length&&!0===e.iphone.capture){var n=t.touches[0];e.iphone.stop_x=n.pageX,e.iphone.stop_y=n.pageY,e.iphone.tap=!1,e.iphone.capture=!1,e.iphone.check_direction()}},touchendHandler:function(){if(e.iphone.input.push(e.iphone.check_direction()),e.iphone.input.length>e.iphone.keys.length&&e.iphone.input.shift(),e.iphone.input.length===e.iphone.keys.length){for(var t=!0,n=0;n<e.iphone.keys.length;n++)e.iphone.input[n]!==e.iphone.keys[n]&&(t=!1);t&&e.iphone.code(e._currentLink)}},touchstartHandler:function(t){e.iphone.start_x=t.changedTouches[0].pageX,e.iphone.start_y=t.changedTouches[0].pageY,e.iphone.tap=!0,e.iphone.capture=!0},load:function(t){this.orig_keys=this.keys,e.addEvent(document,"touchmove",this.touchmoveHandler),e.addEvent(document,"touchend",this.touchendHandler,!1),e.addEvent(document,"touchstart",this.touchstartHandler)},unload:function(){e.removeEvent(document,"touchmove",this.touchmoveHandler),e.removeEvent(document,"touchend",this.touchendHandler),e.removeEvent(document,"touchstart",this.touchstartHandler)},check_direction:function(){return x_magnitude=Math.abs(this.start_x-this.stop_x),y_magnitude=Math.abs(this.start_y-this.stop_y),x=this.start_x-this.stop_x<0?"RIGHT":"LEFT",y=this.start_y-this.stop_y<0?"DOWN":"UP",result=x_magnitude>y_magnitude?x:y,result=!0===this.tap?"TAP":result,result}}};return"string"==typeof t&&e.load(t),"function"==typeof t&&(e.code=t,e.load()),e};"undefined"!=typeof module&&void 0!==module.exports?module.exports=Konami:"function"==typeof define&&define.amd?define([],(function(){return Konami})):window.Konami=Konami;
				`@@ -1 +0,0 @@`
				`@import "node_modules/bootstrap/scss/bootstrap";`