Fixed random line break

Python code is now formatted to PEP8

All other files are defined in .editorconfig as far as possible.

.coveragerc

@@ -1,9 +1,6 @@
 [run]
 source =
     ./
-plugins =
-    django_coverage_plugin
 
 omit =
     */migrations/*
-    */tests/*

.editorconfig

@@ -0,0 +1,29 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
+root = true
+
+
+[*]
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+
+[*.hbs]
+insert_final_newline = false
+
+[*.{diff,md}]
+trim_trailing_whitespace = false
+
+# Python: PEP8 defines 4 spaces for indentation
+[*.py]
+indent_style = space
+indent_size = 4
+# Salt state files, YAML format, 2 spaces
+[*.sls, *.yaml, *.yml]
+indent_style = space
+indent_size = 2

.github/workflows/django.yml

@@ -1,73 +0,0 @@
-name: Django CI
-
-on:
-  push:
-    branches: [master]
-  pull_request:
-    branches: [master]
-
-jobs:
-  build:
-    env:
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    runs-on: ubuntu-latest
-    if: "!contains(github.event.head_commit.message, '[ci skip]')"
-    strategy:
-      matrix:
-        test-group: ["RIGS", "versioning", "users", "assets"]
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.9
-      - name: Cache python deps
-        uses: actions/cache@v2
-        with:
-            path: ${{ env.pythonLocation }}
-            key: ${{ env.pythonLocation }}-${{ hashFiles('requirements.txt') }}
-      - name: Setup Chromedriver
-        if: \!${{ matrix.parallel }}
-        run: |
-          wget https://chromedriver.storage.googleapis.com/2.36/chromedriver_linux64.zip
-          unzip chromedriver_linux64.zip
-          export PATH=$PATH:$(pwd)
-          chmod +x chromedriver
-          export PATH=$PATH:/usr/lib/chromium-browser/
-      - name: Install Dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install pycodestyle coverage coveralls django_coverage_plugin
-          pip install --upgrade --upgrade-strategy eager -r requirements.txt
-          python manage.py collectstatic --noinput
-      - name: Basic Checks
-        run: |
-          pycodestyle . --exclude=migrations,importer*
-          python manage.py check
-          python manage.py makemigrations --check --dry-run
-      - name: Run Tests
-        run: coverage run -p -m pytest --cov=${{ matrix.test-group }} --cov-append -n 8 ${{ matrix.test-group }}/tests/
-      - uses: actions/upload-artifact@v2
-        if: failure()
-        with:
-            name: failure-screenshots ${{ matrix.test-group }}
-            path: screenshots/
-            retention-days: 5
-      - name: Upload Coverage
-        run: coverage combine && coveralls --service=github
-        env:
-            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-            COVERALLS_FLAG_NAME: ${{ matrix.test-group }}
-            COVERALLS_PARALLEL: true
-  coveralls:
-    name: Indicate completion to coveralls.io
-    needs: build
-    runs-on: ubuntu-latest
-    container: python:3-slim
-    steps:
-    - name: Finished
-      run: |
-        pip3 install --upgrade coveralls
-        coveralls --service=github --finish
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -25,7 +25,6 @@ var/
 *.egg-info/
 .installed.cfg
 *.egg
-node_modules/
 
 # Continer extras
 .vagrant
@@ -45,7 +44,6 @@ htmlcov/
 .tox/
 .coverage
 .cache
-.pytest_cache
 nosetests.xml
 coverage.xml
 
@@ -108,5 +106,3 @@ atlassian-ide-plugin.xml
 com_crashlytics_export_strings.xml
 crashlytics.properties
 crashlytics-build.properties
-.vscode/
-screenshots/

.idea/.name

@@ -0,0 +1 @@
+PyRIGS

.idea/encodings.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
+</project>
+

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/PyRIGS.iml" filepath="$PROJECT_DIR$/.idea/PyRIGS.iml" />
+    </modules>
+  </component>
+</project>

.idea/scopes/scope_settings.xml

@@ -0,0 +1,5 @@
+<component name="DependencyValidationManager">
+  <state>
+    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
+  </state>
+</component>

.idea/vcs.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
+

.slugignore

@@ -1,3 +1,7 @@
 *.sqlite3
 *.scss
 *.md
+*.rb
+Vagrantfile
+config/vagrant/*
+config/vagrant.yml

.travis.yml

@@ -0,0 +1,21 @@
+language: python
+python:
+  "2.7"
+
+before_install:
+  - "export DISPLAY=:99.0"
+  - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16"
+
+install:
+  - pip install -r requirements.txt
+  - pip install coveralls codeclimate-test-reporter
+
+before_script:
+  - python manage.py collectstatic --noinput
+
+script:
+  - coverage run manage.py test RIGS
+
+after_success:
+  - coveralls
+  - codeclimate-test-reporter

Dockerfile

@@ -1,12 +0,0 @@
-FROM python:3.6
-
-WORKDIR /app
-
-ADD . /app
-
-RUN pip install -r requirements.txt && \
-        python manage.py collectstatic --noinput
-
-EXPOSE 8000
-
-CMD ["python", "manage.py", "runserver", "0.0.0.0:8000"]

Procfile

@@ -1,2 +1 @@
-release: python manage.py migrate
 web: gunicorn PyRIGS.wsgi --log-file -

PyRIGS/decorators.py

@@ -1,50 +1,15 @@
 from django.contrib.auth import REDIRECT_FIELD_NAME
-from django.shortcuts import render
 from django.http import HttpResponseRedirect
-from django.urls import reverse
+from django.shortcuts import render_to_response
-
+from django.template import RequestContext
-from RIGS import models
 
 
-def get_oembed(login_url, request, oembed_view, kwargs):
+def user_passes_test_with_403(test_func, login_url=None):
-    context = {}
-    context['oembed_url'] = "{0}://{1}{2}".format(request.scheme, request.META['HTTP_HOST'],
-                                                  reverse(oembed_view, kwargs=kwargs))
-    context['login_url'] = "{0}?{1}={2}".format(login_url, REDIRECT_FIELD_NAME, request.get_full_path())
-    resp = render(request, 'login_redirect.html', context=context)
-    return resp
-
-
-def has_oembed(oembed_view, login_url=None):
-    if not login_url:
-        from django.conf import settings
-        login_url = settings.LOGIN_URL
-
-    def _dec(view_func):
-        def _checklogin(request, *args, **kwargs):
-            if request.user.is_authenticated:
-                return view_func(request, *args, **kwargs)
-            else:
-                if oembed_view is not None:
-                    return get_oembed(login_url, request, oembed_view, kwargs)
-                else:
-                    return HttpResponseRedirect('%s?%s=%s' % (login_url, REDIRECT_FIELD_NAME, request.get_full_path()))
-
-        _checklogin.__doc__ = view_func.__doc__
-        _checklogin.__dict__ = view_func.__dict__
-        return _checklogin
-
-    return _dec
-
-
-def user_passes_test_with_403(test_func, login_url=None, oembed_view=None):
     """
     Decorator for views that checks that the user passes the given test.
+
     Anonymous users will be redirected to login_url, while users that fail
     the test will be given a 403 error.
-    If embed_view is set, then a JS redirect will be used, and a application/json+oembed
-    meta tag set with the url of oembed_view
-    (oembed_view will be passed the kwargs from the main function)
     """
     if not login_url:
         from django.conf import settings
@@ -54,13 +19,12 @@ def user_passes_test_with_403(test_func, login_url=None, oembed_view=None):
         def _checklogin(request, *args, **kwargs):
             if test_func(request.user):
                 return view_func(request, *args, **kwargs)
-            elif not request.user.is_authenticated:
+            elif not request.user.is_authenticated():
-                if oembed_view is not None:
+                return HttpResponseRedirect('%s?%s=%s' % (
-                    return get_oembed(login_url, request, oembed_view, kwargs)
+                    login_url, REDIRECT_FIELD_NAME, request.get_full_path()))
-                else:
-                    return HttpResponseRedirect('%s?%s=%s' % (login_url, REDIRECT_FIELD_NAME, request.get_full_path()))
             else:
-                resp = render(request, '403.html')
+                resp = render_to_response(
+                    '403.html', context_instance=RequestContext(request))
                 resp.status_code = 403
                 return resp
 
@@ -71,12 +35,16 @@ def user_passes_test_with_403(test_func, login_url=None, oembed_view=None):
     return _dec
 
 
-def permission_required_with_403(perm, login_url=None, oembed_view=None):
+def permission_required_with_403(perm, login_url=None):
     """
     Decorator for views that checks whether a user has a particular permission
     enabled, redirecting to the log-in page or rendering a 403 as necessary.
     """
-    return user_passes_test_with_403(lambda u: u.has_perm(perm), login_url=login_url, oembed_view=oembed_view)
+    return user_passes_test_with_403(
+        lambda u: u.has_perm(perm), login_url=login_url)
+
+
+from RIGS import models
 
 
 def api_key_required(function):
@@ -91,7 +59,8 @@ def api_key_required(function):
         userid = kwargs.get('api_pk')
         key = kwargs.get('api_key')
 
-        error_resp = render(request, '403.html')
+        error_resp = render_to_response(
+            '403.html', context_instance=RequestContext(request))
         error_resp.status_code = 403
 
         if key is None:
@@ -109,19 +78,3 @@ def api_key_required(function):
         return function(request, *args, **kwargs)
 
     return wrap
-
-
-def nottinghamtec_address_required(function):
-    """
-    Checks that the current user has an email address ending @nottinghamtec.co.uk
-    """
-
-    def wrap(request, *args, **kwargs):
-        # Fail if current user's email address isn't @nottinghamtec.co.uk
-        if not request.user.email.endswith('@nottinghamtec.co.uk'):
-            error_resp = render(request, 'eventauthorisation_request_error.html')
-            return error_resp
-
-        return function(request, *args, **kwargs)
-
-    return wrap

PyRIGS/formats/en/formats.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 DATETIME_FORMAT = ('d/m/Y H:i')
 DATE_FORMAT = ('d/m/Y')
 TIME_FORMAT = ('H:i')

PyRIGS/settings.py

@@ -10,10 +10,6 @@ https://docs.djangoproject.com/en/1.7/ref/settings/
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 import os
-import raven
-import secrets
-import datetime
-from envparse import env
 
 BASE_DIR = os.path.dirname(os.path.dirname(__file__))
 
@@ -21,38 +17,37 @@ BASE_DIR = os.path.dirname(os.path.dirname(__file__))
 # See https://docs.djangoproject.com/en/1.7/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = env('SECRET_KEY', default='gxhy(a#5mhp289_=6xx$7jh=eh$ymxg^ymc+di*0c*geiu3p_e')
+SECRET_KEY = os.environ.get('SECRET_KEY') if os.environ.get(
-
+    'SECRET_KEY') else 'gxhy(a#5mhp289_=6xx$7jh=eh$ymxg^ymc+di*0c*geiu3p_e'
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = env('DEBUG', cast=bool, default=True)
+DEBUG = bool(int(os.environ.get('DEBUG'))) if os.environ.get('DEBUG') else True
 
-STAGING = env('STAGING', cast=bool, default=False)
+STAGING = bool(int(os.environ.get('STAGING'))
+               ) if os.environ.get('STAGING') else False
 
-CI = env('CI', cast=bool, default=False)
+TEMPLATE_DEBUG = True
 
-ALLOWED_HOSTS = ['pyrigs.nottinghamtec.co.uk', 'rigs.nottinghamtec.co.uk', 'pyrigs.herokuapp.com']
+ALLOWED_HOSTS = [
+    'pyrigs.nottinghamtec.co.uk',
+    'rigs.nottinghamtec.co.uk',
+    'pyrigs.herokuapp.com']
 
 if STAGING:
     ALLOWED_HOSTS.append('.herokuapp.com')
 
-if DEBUG:
-    ALLOWED_HOSTS.append('localhost')
-    ALLOWED_HOSTS.append('example.com')
-    ALLOWED_HOSTS.append('127.0.0.1')
-
 SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
 if not DEBUG:
     SECURE_SSL_REDIRECT = True  # Redirect all http requests to https
 
 INTERNAL_IPS = ['127.0.0.1']
 
-ADMINS = [('Tom Price', 'tomtom5152@gmail.com'), ('IT Manager', 'it@nottinghamtec.co.uk'),
+ADMINS = (
-          ('Arona Jones', 'arona.jones@nottinghamtec.co.uk')]
+    ('Tom Price', 'tomtom5152@gmail.com')
-if DEBUG:
+)
-    ADMINS.append(('Testing Superuser', 'superuser@example.com'))
 
 # Application definition
+
 INSTALLED_APPS = (
     'django.contrib.admin',
     'django.contrib.auth',
@@ -60,11 +55,7 @@ INSTALLED_APPS = (
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    'django.contrib.humanize',
-    'versioning',
-    'users',
     'RIGS',
-    'assets',
 
     'debug_toolbar',
     'registration',
@@ -74,15 +65,15 @@ INSTALLED_APPS = (
     'raven.contrib.django.raven_compat',
 )
 
-MIDDLEWARE = (
+MIDDLEWARE_CLASSES = (
     'raven.contrib.django.raven_compat.middleware.SentryResponseErrorIdMiddleware',
     'django.middleware.security.SecurityMiddleware',
-    'debug_toolbar.middleware.DebugToolbarMiddleware',
     'reversion.middleware.RevisionMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 )
@@ -153,63 +144,44 @@ LOGGING = {
     }
 }
 
-# Tests lock up SQLite otherwise
+import raven
-if STAGING or CI:
-    CACHES = {
-        'default': {
-            'BACKEND': 'django.core.cache.backends.locmem.LocMemCache'
-        }
-    }
-elif DEBUG:
-    CACHES = {
-        'default': {
-            'BACKEND': 'django.core.cache.backends.dummy.DummyCache'
-        }
-    }
-else:
-    CACHES = {
-        'default': {
-            'BACKEND': 'django.core.cache.backends.db.DatabaseCache',
-            'LOCATION': 'cache_table',
-        }
-    }
 
 RAVEN_CONFIG = {
-    'dsn': env('RAVEN_DSN', default=""),
+    'dsn': os.environ.get('RAVEN_DSN'),
+    # If you are using git, you can also automatically configure the
+    # release based on the git info.
+    # 'release': raven.fetch_git_sha(os.path.dirname(os.path.dirname(__file__))),
+    'debug': DEBUG,
 }
 
 # User system
 AUTH_USER_MODEL = 'RIGS.Profile'
 
 LOGIN_REDIRECT_URL = '/'
-LOGIN_URL = '/user/login/'
+LOGIN_URL = '/user/login'
-LOGOUT_URL = '/user/logout/'
+LOGOUT_URL = '/user/logout'
 
 ACCOUNT_ACTIVATION_DAYS = 7
 
 # reCAPTCHA settings
-RECAPTCHA_PUBLIC_KEY = env('RECAPTCHA_PUBLIC_KEY', default="6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI")  # If not set, use development key
+RECAPTCHA_PUBLIC_KEY = os.environ.get('RECAPTCHA_PUBLIC_KEY', None)
-RECAPTCHA_PRIVATE_KEY = env('RECAPTCHA_PUBLIC_KEY', default="6LeIxAcTAAAAAGG-vFI1TnRWxMZNFuojJ4WifJWe")  # If not set, use development key
+RECAPTCHA_PRIVATE_KEY = os.environ.get('RECAPTCHA_PRIVATE_KEY', None)
 NOCAPTCHA = True
 
-SILENCED_SYSTEM_CHECKS = ['captcha.recaptcha_test_key_error']
-
 # Email
 EMAILER_TEST = False
 if not DEBUG or EMAILER_TEST:
     EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
-    EMAIL_HOST = env('EMAIL_HOST')
+    EMAIL_HOST = os.environ.get('EMAIL_HOST')
-    EMAIL_PORT = env('EMAIL_PORT', cast=int, default=25)
+    EMAIL_PORT = int(os.environ.get('EMAIL_PORT'))
-    EMAIL_HOST_USER = env('EMAIL_HOST_USER')
+    EMAIL_HOST_USER = os.environ.get('EMAIL_HOST_USER')
-    EMAIL_HOST_PASSWORD = env('EMAIL_HOST_PASSWORD')
+    EMAIL_HOST_PASSWORD = os.environ.get('EMAIL_HOST_PASSWORD')
-    EMAIL_USE_TLS = env('EMAIL_USE_TLS', cast=bool, default=False)
+    EMAIL_USE_TLS = bool(int(os.environ.get('EMAIL_USE_TLS', 0)))
-    EMAIL_USE_SSL = env('EMAIL_USE_SSL', cast=bool, default=False)
+    EMAIL_USE_SSL = bool(int(os.environ.get('EMAIL_USE_SSL', 0)))
-    DEFAULT_FROM_EMAIL = env('EMAIL_FROM')
+    DEFAULT_FROM_EMAIL = os.environ.get('EMAIL_FROM')
 else:
     EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
 
-EMAIL_COOLDOWN = datetime.timedelta(minutes=15)
-
 # Internationalization
 # https://docs.djangoproject.com/en/1.7/topics/i18n/
 
@@ -225,10 +197,21 @@ USE_L10N = True
 
 USE_TZ = True
 
-# Need to allow seconds as datetime-local input type spits out a time that has seconds
 DATETIME_INPUT_FORMATS = ('%Y-%m-%dT%H:%M', '%Y-%m-%dT%H:%M:%S')
 
+TEMPLATE_CONTEXT_PROCESSORS = (
+    "django.contrib.auth.context_processors.auth",
+    "django.core.context_processors.debug",
+    "django.core.context_processors.i18n",
+    "django.core.context_processors.media",
+    "django.core.context_processors.static",
+    "django.core.context_processors.tz",
+    "django.core.context_processors.request",
+    "django.contrib.messages.context_processors.messages",
+)
+
 # Static files (CSS, JavaScript, Images)
+# https://docs.djangoproject.com/en/1.7/howto/static-files/
 STATICFILES_STORAGE = 'django.contrib.staticfiles.storage.ManifestStaticFilesStorage'
 STATIC_URL = '/static/'
 STATIC_ROOT = os.path.join(BASE_DIR, 'static/')
@@ -236,30 +219,10 @@ STATIC_DIRS = (
     os.path.join(BASE_DIR, 'static/')
 )
 
-TEMPLATES = [
+TEMPLATE_DIRS = (
-    {
+    os.path.join(BASE_DIR, 'templates'),
-        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+)
-        'DIRS': [
-            os.path.join(BASE_DIR, 'templates')
-        ],
-        'APP_DIRS': True,
-        'OPTIONS': {
-            'context_processors': [
-                "django.contrib.auth.context_processors.auth",
-                "django.template.context_processors.debug",
-                "django.template.context_processors.i18n",
-                "django.template.context_processors.media",
-                "django.template.context_processors.static",
-                "django.template.context_processors.tz",
-                "django.template.context_processors.request",
-                "django.contrib.messages.context_processors.messages",
-            ],
-            'debug': DEBUG
-        },
-    },
-]
 
 USE_GRAVATAR = True
 
 TERMS_OF_HIRE_URL = "http://www.nottinghamtec.co.uk/terms.pdf"
-AUTHORISATION_NOTIFICATION_ADDRESS = 'productions@nottinghamtec.co.uk'

PyRIGS/tests/base.py

@@ -1,81 +0,0 @@
-from django.test import LiveServerTestCase
-from selenium import webdriver
-from RIGS import models as rigsmodels
-from . import pages
-import os
-import pytz
-from datetime import date, time, datetime, timedelta
-from django.conf import settings
-import PyRIGS.settings
-import sys
-import pathlib
-import inspect
-
-
-def create_datetime(year, month, day, hour, min):
-    tz = pytz.timezone(settings.TIME_ZONE)
-    return tz.localize(datetime(year, month, day, hour, min)).astimezone(pytz.utc)
-
-
-def create_browser():
-    options = webdriver.ChromeOptions()
-    options.add_argument("--window-size=1920,1080")
-    options.add_argument("--headless")
-    if settings.CI:
-        options.add_argument("--no-sandbox")
-    driver = webdriver.Chrome(options=options)
-    return driver
-
-
-class BaseTest(LiveServerTestCase):
-    def setUp(self):
-        super().setUpClass()
-        self.driver = create_browser()
-
-    def tearDown(self):
-        super().tearDown()
-        self.driver.quit()
-
-
-class AutoLoginTest(BaseTest):
-    def setUp(self):
-        super().setUp()
-        self.profile = rigsmodels.Profile(
-            username="EventTest", first_name="Event", last_name="Test", initials="ETU", is_superuser=True)
-        self.profile.set_password("EventTestPassword")
-        self.profile.save()
-        loginPage = pages.LoginPage(self.driver, self.live_server_url).open()
-        loginPage.login("EventTest", "EventTestPassword")
-
-
-def screenshot_failure(func):
-    def wrapper_func(self, *args, **kwargs):
-        try:
-            func(self, *args, **kwargs)
-        except Exception as e:
-            screenshot_name = func.__module__ + "." + func.__qualname__
-            screenshot_file = "screenshots/" + func.__qualname__ + ".png"
-            if not pathlib.Path("screenshots").is_dir():
-                os.mkdir("screenshots")
-            self.driver.save_screenshot(screenshot_file)
-            print("Error in test {} is at path {}".format(screenshot_name, screenshot_file), file=sys.stderr)
-            raise e
-    return wrapper_func
-
-
-def screenshot_failure_cls(cls):
-    for attr in cls.__dict__:
-        if callable(getattr(cls, attr)) and attr.startswith("test"):
-            setattr(cls, attr, screenshot_failure(getattr(cls, attr)))
-    return cls
-
-
-# Checks if animation is done
-class animation_is_finished():
-    def __call__(self, driver):
-        numberAnimating = driver.execute_script('return $(":animated").length')
-        finished = numberAnimating == 0
-        if finished:
-            import time
-            time.sleep(0.1)
-        return finished

PyRIGS/tests/pages.py

@@ -1,75 +0,0 @@
-from pypom import Page, Region
-from selenium.webdriver.common.action_chains import ActionChains
-from selenium.webdriver.common.by import By
-from selenium.webdriver import Chrome
-from selenium.common.exceptions import NoSuchElementException
-from PyRIGS.tests import regions
-
-
-class BasePage(Page):
-    form_items = {}
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-    def __getattr__(self, name):
-        if name in self.form_items:
-            element = self.form_items[name]
-            form_element = element[0](self, self.find_element(*element[1]))
-            return form_element.value
-        else:
-            return super().__getattribute__(name)
-
-    def __setattr__(self, name, value):
-        if name in self.form_items:
-            element = self.form_items[name]
-            form_element = element[0](self, self.find_element(*element[1]))
-            form_element.set_value(value)
-        else:
-            self.__dict__[name] = value
-
-
-class FormPage(BasePage):
-    _errors_selector = (By.CLASS_NAME, "alert-danger")
-    _submit_locator = (By.XPATH, "//button[@type='submit' and contains(., 'Save')]")
-
-    def remove_all_required(self):
-        self.driver.execute_script(
-            "Array.from(document.getElementsByTagName(\"input\")).forEach(function (el, ind, arr) { el.removeAttribute(\"required\")});")
-        self.driver.execute_script(
-            "Array.from(document.getElementsByTagName(\"select\")).forEach(function (el, ind, arr) { el.removeAttribute(\"required\")});")
-
-    def submit(self):
-        previous_errors = self.errors
-        submit = self.find_element(*self._submit_locator)
-        ActionChains(self.driver).move_to_element(submit).perform()
-        submit.click()
-        self.wait.until(lambda x: self.errors != previous_errors or self.success)
-
-    @property
-    def errors(self):
-        try:
-            error_page = regions.ErrorPage(self, self.find_element(*self._errors_selector))
-            return error_page.errors
-        except NoSuchElementException:
-            return None
-
-
-class LoginPage(BasePage):
-    URL_TEMPLATE = '/user/login'
-
-    _username_locator = (By.ID, 'id_username')
-    _password_locator = (By.ID, 'id_password')
-    _submit_locator = (By.ID, 'id_submit')
-    _error_locator = (By.CSS_SELECTOR, '.errorlist>li')
-
-    def login(self, username, password):
-        username_element = self.find_element(*self._username_locator)
-        username_element.clear()
-        username_element.send_keys(username)
-
-        password_element = self.find_element(*self._password_locator)
-        password_element.clear()
-        password_element.send_keys(password)
-
-        self.find_element(*self._submit_locator).click()

PyRIGS/tests/regions.py

@@ -1,255 +0,0 @@
-from pypom import Region
-from django.utils import timezone
-from django.conf import settings
-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
-from selenium.webdriver.common.keys import Keys
-from selenium.common.exceptions import NoSuchElementException
-import datetime
-
-
-def parse_bool_from_string(string):
-    # Used to convert from attribute strings to boolean values, written after I found this:
-    # >>> bool("false")
-    # True
-    if string == "true":
-        return True
-    else:
-        return False
-
-
-def get_time_format():
-    # Default
-    time_format = "%H%M"
-    if settings.CI:  # The CI is American
-        time_format = "%I%M%p"
-    return time_format
-
-
-def get_date_format():
-    date_format = "%d%m%Y"
-    if settings.CI:  # And try as I might I can't stop it being so
-        date_format = "%m%d%Y"
-    return date_format
-
-
-class BootstrapSelectElement(Region):
-    _main_button_locator = (By.CSS_SELECTOR, 'button.dropdown-toggle')
-    _option_box_locator = (By.CSS_SELECTOR, 'ul.dropdown-menu')
-    _option_locator = (By.CSS_SELECTOR, 'ul.dropdown-menu.inner>li>a.dropdown-item')
-    _select_all_locator = (By.CLASS_NAME, 'bs-select-all')
-    _deselect_all_locator = (By.CLASS_NAME, 'bs-deselect-all')
-    _search_locator = (By.CSS_SELECTOR, '.bs-searchbox>input')
-    _status_locator = (By.CLASS_NAME, 'status')
-
-    @property
-    def is_open(self):
-        return parse_bool_from_string(self.find_element(*self._main_button_locator).get_attribute("aria-expanded"))
-
-    def toggle(self):
-        original_state = self.is_open
-        option_box = self.find_element(*self._option_box_locator)
-        if not original_state:
-            self.wait.until(expected_conditions.invisibility_of_element(option_box))
-        else:
-            self.wait.until(expected_conditions.visibility_of(option_box))
-        return self.find_element(*self._main_button_locator).click()
-
-    def open(self):
-        if not self.is_open:
-            self.toggle()
-
-    def close(self):
-        if self.is_open:
-            self.toggle()
-
-    def select_all(self):
-        self.find_element(*self._select_all_locator).click()
-
-    def deselect_all(self):
-        self.find_element(*self._deselect_all_locator).click()
-
-    def search(self, query):
-        search_box = self.find_element(*self._search_locator)
-        self.open()
-        search_box.clear()
-        search_box.send_keys(query)
-        status_text = self.find_element(*self._status_locator)
-        self.wait.until(expected_conditions.invisibility_of_element_located(self._status_locator))
-
-    @property
-    def options(self):
-        options = list(self.find_elements(*self._option_locator))
-        return [self.BootstrapSelectOption(self, i) for i in options]
-
-    def set_option(self, name, selected):
-        options = list((x for x in self.options if x.name == name))
-        assert len(options) == 1
-        options[0].set_selected(selected)
-
-    class BootstrapSelectOption(Region):
-        _text_locator = (By.CLASS_NAME, 'text')
-
-        @property
-        def selected(self):
-            return parse_bool_from_string(self.root.get_attribute("aria-selected"))
-
-        def toggle(self):
-            self.root.click()
-
-        def set_selected(self, selected):
-            if self.selected != selected:
-                self.toggle()
-
-        @property
-        def name(self):
-            return self.find_element(*self._text_locator).text
-
-
-class TextBox(Region):
-    @property
-    def value(self):
-        return self.root.get_attribute("value")
-
-    def set_value(self, value):
-        self.root.clear()
-        self.root.send_keys(value)
-
-
-class CheckBox(Region):
-    def toggle(self):
-        self.root.click()
-
-    @property
-    def value(self):
-        return parse_bool_from_string(self.root.get_attribute("checked"))
-
-    def set_value(self, value):
-        if value != self.value:
-            self.toggle()
-
-
-class RadioSelect(Region):  # Currently only works for yes/no radio selects
-    def set_value(self, value):
-        if value:
-            value = "0"
-        else:
-            value = "1"
-        self.find_element(By.XPATH, "//label[@for='{}_{}']".format(self.root.get_attribute("id"), value)).click()
-
-    @property
-    def value(self):
-        try:
-            return parse_bool_from_string(self.find_element(By.CSS_SELECTOR, '.custom-control-input:checked').get_attribute("value").lower())
-        except NoSuchElementException:
-            return None
-
-
-class DatePicker(Region):
-    @property
-    def value(self):
-        return datetime.datetime.strptime(self.root.get_attribute("value"), "%Y-%m-%d")
-
-    def set_value(self, value):
-        self.root.clear()
-        self.root.send_keys(value.strftime(get_date_format()))
-
-
-class TimePicker(Region):
-    @property
-    def value(self):
-        return datetime.datetime.strptime(self.root.get_attribute("value"), "%H:%M")
-
-    def set_value(self, value):
-        self.root.clear()
-        self.root.send_keys(value.strftime(get_time_format()))
-
-
-class DateTimePicker(Region):
-    @property
-    def value(self):
-        return datetime.datetime.strptime(self.root.get_attribute("value"), "%Y-%m-%d %H:%M")
-
-    def set_value(self, value):
-        self.root.clear()
-
-        date = value.date().strftime(get_date_format())
-        time = value.time().strftime(get_time_format())
-
-        self.root.send_keys(date)
-        self.root.send_keys(Keys.TAB)
-        self.root.send_keys(time)
-
-
-class SingleSelectPicker(Region):
-    @property
-    def value(self):
-        picker = Select(self.root)
-        return picker.first_selected_option.text
-
-    def set_value(self, value):
-        picker = Select(self.root)
-        picker.select_by_visible_text(value)
-
-
-class ErrorPage(Region):
-    _error_item_selector = (By.CSS_SELECTOR, "dl>span")
-
-    class ErrorItem(Region):
-        _field_selector = (By.CSS_SELECTOR, "dt")
-        _error_selector = (By.CSS_SELECTOR, "dd>ul>li")
-
-        @property
-        def field_name(self):
-            return self.find_element(*self._field_selector).text
-
-        @property
-        def errors(self):
-            return [x.text for x in self.find_elements(*self._error_selector)]
-
-    @property
-    def errors(self):
-        error_items = [self.ErrorItem(self, x) for x in self.find_elements(*self._error_item_selector)]
-        errors = {}
-        for error in error_items:
-            errors[error.field_name] = error.errors
-        return errors
-
-
-class Modal(Region):
-    _submit_locator = (By.CSS_SELECTOR, '.btn-primary')
-    _header_selector = (By.TAG_NAME, 'h4')
-
-    form_items = {
-        'name': (TextBox, (By.ID, 'id_name'))
-    }
-
-    @property
-    def header(self):
-        return self.find_element(*self._header_selector).text
-
-    @property
-    def is_open(self):
-        return self.root.is_displayed()
-
-    def submit(self):
-        self.root.find_element(*self._submit_locator).click()
-
-    def __getattr__(self, name):
-        if name in self.form_items:
-            element = self.form_items[name]
-            form_element = element[0](self, self.find_element(*element[1]))
-            return form_element.value
-        else:
-            return super().__getattribute__(name)
-
-    def __setattr__(self, name, value):
-        if name in self.form_items:
-            element = self.form_items[name]
-            form_element = element[0](self, self.find_element(*element[1]))
-            form_element.set_value(value)
-        else:
-            self.__dict__[name] = value

PyRIGS/urls.py

@@ -1,44 +1,25 @@
-from django.urls import path, re_path
+from django.conf import settings
-from django.conf.urls import include
+from django.conf.urls import patterns, include, url
 from django.contrib import admin
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
-from django.contrib.auth.decorators import login_required
+from registration.backends.default.views import RegistrationView
-from django.conf import settings
+
-from django.views.decorators.clickjacking import xframe_options_exempt
-from django.contrib.auth.views import LoginView
-from django.views.generic import TemplateView
-from PyRIGS.decorators import permission_required_with_403
 import RIGS
-import users
-import versioning
-from PyRIGS import views
 
-urlpatterns = [
+urlpatterns = patterns('',
-    path('', include('versioning.urls')),
+                       # Examples:
-    path('', include('RIGS.urls')),
+                       # url(r'^$', 'PyRIGS.views.home', name='home'),
-    path('assets/', include('assets.urls')),
+                       # url(r'^blog/', include('blog.urls')),
 
-    path('', login_required(views.Index.as_view()), name='index'),
+                       url(r'^', include('RIGS.urls')),
+                       url('^user/register/$',
+                           RegistrationView.as_view(form_class=RIGS.forms.ProfileRegistrationFormUniqueEmail),
+                           name="registration_register"),
+                       url('^user/', include('django.contrib.auth.urls')),
+                       url('^user/', include('registration.backends.default.urls')),
 
-    # API
+                       url(r'^admin/', include(admin.site.urls)),
-    path('api/<str:model>/', login_required(views.SecureAPIRequest.as_view()),
+                       )
-         name="api_secure"),
-    path('api/<str:model>/<int:pk>/', login_required(views.SecureAPIRequest.as_view()),
-         name="api_secure"),
-
-    path('closemodal/', views.CloseModal.as_view(), name='closemodal'),
-    path('search_help/', views.SearchHelp.as_view(), name='search_help'),
-
-    path('', include('users.urls')),
-
-    path('admin/', admin.site.urls),
-]
 
 if settings.DEBUG:
     urlpatterns += staticfiles_urlpatterns()
-
-    import debug_toolbar
-    urlpatterns = [
-        re_path(r'^__debug__/', include(debug_toolbar.urls)),
-        path('bootstrap/', TemplateView.as_view(template_name="bootstrap.html")),
-    ] + urlpatterns

PyRIGS/views.py

@@ -1,252 +0,0 @@
-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
-from django.contrib import messages
-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 django.views.decorators.cache import never_cache, cache_page
-from django.utils.decorators import method_decorator
-
-
-def is_ajax(request):
-    return request.headers.get('x-requested-with') == 'XMLHttpRequest'
-
-# Displays the current rig count along with a few other bits and pieces
-
-
-class Index(generic.TemplateView):
-    template_name = 'index.html'
-
-    def get_context_data(self, **kwargs):
-        context = super(Index, self).get_context_data(**kwargs)
-        context['rig_count'] = models.Event.objects.rig_count()
-        return context
-
-
-class SecureAPIRequest(generic.View):
-    models = {
-        'venue': models.Venue,
-        'person': models.Person,
-        'organisation': models.Organisation,
-        'profile': models.Profile,
-        'event': models.Event,
-        'supplier': asset_models.Supplier
-    }
-
-    perms = {
-        'venue': 'RIGS.view_venue',
-        'person': 'RIGS.view_person',
-        'organisation': 'RIGS.view_organisation',
-        'profile': 'RIGS.view_profile',
-        'event': None,
-        'supplier': None
-    }
-
-    '''
-    Validate the request is allowed based on user permissions.
-    Raises 403 if denied.
-    Potential to add API key validation at a later date.
-    '''
-
-    def __validate__(self, request, key, perm):
-        if request.user.is_active:
-            if request.user.is_superuser or perm is None:
-                return True
-            elif request.user.has_perm(perm):
-                return True
-        raise PermissionDenied()
-
-    def get(self, request, model, pk=None, param=None):
-        # Request permission validation things
-        key = request.GET.get('apikey', None)
-        perm = self.perms[model]
-        self.__validate__(request, key, perm)
-
-        # Response format where applicable
-        format = request.GET.get('format', 'json')
-        fields = request.GET.get('fields', None)
-        if fields:
-            fields = fields.split(",")
-
-        # Supply data for one record
-        if pk:
-            object = get_object_or_404(self.models[model], pk=pk)
-            data = serializers.serialize(format, [object], fields=fields)
-            return HttpResponse(data, content_type="application/" + format)
-
-        # Supply data for autocomplete ajax request in json form
-        term = request.GET.get('q', None)
-        if term:
-            if fields is None:  # Default to just name
-                fields = ['name']
-
-            # Build a list of Q objects for use later
-            queries = []
-            for part in term.split(" "):
-                qs = []
-                for field in fields:
-                    q = Q(**{field + "__icontains": part})
-                    qs.append(q)
-                queries.append(reduce(operator.or_, qs))
-
-            # Build the data response list
-            results = []
-            query = reduce(operator.and_, queries)
-            objects = self.models[model].objects.filter(query)
-            for o in objects:
-                data = {
-                    'pk': o.pk,
-                    'value': o.pk,
-                    'text': o.name,
-                }
-                try:  # See if there is a valid update URL
-                    data['update'] = reverse("%s_update" % model, kwargs={'pk': o.pk})
-                except NoReverseMatch:
-                    pass
-                results.append(data)
-
-            # return a data response
-            json = simplejson.dumps(results)
-            return HttpResponse(json, content_type="application/json")  # Always json
-
-        start = request.GET.get('start', None)
-        end = request.GET.get('end', None)
-
-        if model == "event" and start and end:
-            # Probably a calendar request
-            start_datetime = datetime.datetime.strptime(start, "%Y-%m-%dT%H:%M:%S")
-            end_datetime = datetime.datetime.strptime(end, "%Y-%m-%dT%H:%M:%S")
-
-            objects = self.models[model].objects.events_in_bounds(start_datetime, end_datetime)
-
-            results = []
-            for item in objects:
-                data = {
-                    'pk': item.pk,
-                    'title': item.name,
-                    'is_rig': item.is_rig,
-                    'status': str(item.get_status_display()),
-                    'earliest': item.earliest_time.isoformat(),
-                    'latest': item.latest_time.isoformat(),
-                    'url': str(item.get_absolute_url())
-                }
-
-                results.append(data)
-            json = simplejson.dumps(results)
-            return HttpResponse(json, content_type="application/json")  # Always json
-
-        return HttpResponse(model)
-
-
-class ModalURLMixin:
-    def get_close_url(self, update, detail):
-        if is_ajax(self.request):
-            url = reverse_lazy('closemodal')
-            update_url = str(reverse_lazy(update, kwargs={'pk': self.object.pk}))
-            messages.info(self.request, "modalobject=" + serializers.serialize("json", [self.object]))
-            messages.info(self.request, "modalobject[0]['update_url']='" + update_url + "'")
-        else:
-            url = reverse_lazy(detail, kwargs={
-                'pk': self.object.pk,
-            })
-        return url
-
-
-class GenericListView(generic.ListView):
-    template_name = 'generic_list.html'
-    paginate_by = 20
-
-    def get_context_data(self, **kwargs):
-        context = super(GenericListView, self).get_context_data(**kwargs)
-        context['page_title'] = self.model.__name__ + "s"
-        if is_ajax(self.request):
-            context['override'] = "base_ajax.html"
-        return context
-
-    def get_queryset(self):
-        q = self.request.GET.get('q', "")
-
-        filter = Q(name__icontains=q) | Q(email__icontains=q) | Q(address__icontains=q) | Q(notes__icontains=q) | Q(
-            phone__startswith=q) | Q(phone__endswith=q)
-
-        # try and parse an int
-        try:
-            val = int(q)
-            filter = filter | Q(pk=val)
-        except:  # noqa
-            # not an integer
-            pass
-
-        object_list = self.model.objects.filter(filter)
-
-        orderBy = self.request.GET.get('orderBy', "name")
-        if orderBy != "":
-            object_list = object_list.order_by(orderBy)
-        return object_list
-
-
-class GenericDetailView(generic.DetailView):
-    template_name = "generic_detail.html"
-
-    def get_context_data(self, **kwargs):
-        context = super(GenericDetailView, self).get_context_data(**kwargs)
-        context['page_title'] = "{} | {}".format(self.model.__name__, self.object.name)
-        if is_ajax(self.request):
-            context['override'] = "base_ajax.html"
-        return context
-
-
-class GenericUpdateView(generic.UpdateView):
-    template_name = "generic_form.html"
-
-    def get_context_data(self, **kwargs):
-        context = super(GenericUpdateView, self).get_context_data(**kwargs)
-        context['page_title'] = "Edit {}".format(self.model.__name__)
-        if is_ajax(self.request):
-            context['override'] = "base_ajax.html"
-        return context
-
-
-class GenericCreateView(generic.CreateView):
-    template_name = "generic_form.html"
-
-    def get_context_data(self, **kwargs):
-        context = super(GenericCreateView, self).get_context_data(**kwargs)
-        context['page_title'] = "Create {}".format(self.model.__name__)
-        if is_ajax(self.request):
-            context['override'] = "base_ajax.html"
-        return context
-
-
-class SearchHelp(generic.TemplateView):
-    template_name = 'search_help.html'
-
-
-"""
-Called from a modal window (e.g. when an item is submitted to an event/invoice).
-May optionally also include some javascript in a success message to cause a load of
-the new information onto the page.
-"""
-
-
-class CloseModal(generic.TemplateView):
-    template_name = 'closemodal.html'
-
-    def get_context_data(self, **kwargs):
-        return {'messages': messages.get_messages(self.request)}

PyRIGS/wsgi.py

@@ -10,7 +10,7 @@ import os
 
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "PyRIGS.settings")
 
-from django.core.wsgi import get_wsgi_application  # noqa
+from django.core.wsgi import get_wsgi_application
-from dj_static import Cling  # noqa
+from dj_static import Cling
 
 application = Cling(get_wsgi_application())

README.md

@@ -1,17 +1,96 @@
 # TEC PA & Lighting - PyRIGS #
-![Build Status](https://github.com/nottinghamtec/PyRIGS/workflows/Django%20CI/badge.svg)
+[![Build Status](https://travis-ci.org/nottinghamtec/PyRIGS.svg?branch=develop)](https://travis-ci.org/nottinghamtec/PyRIGS)
-[![Coverage Status](https://coveralls.io/repos/github/nottinghamtec/PyRIGS/badge.svg)](https://coveralls.io/github/nottinghamtec/PyRIGS)
+[![Coverage Status](https://coveralls.io/repos/github/nottinghamtec/PyRIGS/badge.svg?branch=develop)](https://coveralls.io/github/nottinghamtec/PyRIGS?branch=develop)
 
-Welcome to TEC PA & Lighting's PyRIGS program. This is a reimplementation of the previous Rig Information Gathering System (RIGS) that was developed using Ruby on Rails. PyRIGS is our in house app for the centralisation of information on our events and now assets.
+Welcome to TEC PA & Lightings PyRIGS program. This is a reimplementation of the existing Rig Information Gathering System (RIGS) that was developed using Ruby on Rails.
 
-For setup information and other such helpful stuff check the [Wiki](https://github.com/nottinghamtec/PyRIGS/wiki)
+The purpose of this project is to make the system more compatible and easier to understand such that should future changes be needed they can be made without having to understand the intricacies of Rails.
 
-# Apps
+At this stage the project is very early on, and the main focus has been on getting a working system that can be tested and put into use ASAP due to the imminent failure of the existing system. Because of this, the documentation is still quite weak, but this should be fixed as time goes on.
-- PyRIGS: Base app, stores 'global' information
-- RIGS: Rigboard stuff - event calendar etc
-- assets: Database of our kit, testing data etc
-- versioning: Our custom logic built on top of django-reversion. Semi-modular.
-- users: Our custom logic for registration and profiles. Semi-modular.
-- training: SoonTM
 
-[![forthebadge](https://forthebadge.com/images/badges/built-with-resentment.svg)](https://forthebadge.com) [![forthebadge](https://forthebadge.com/images/badges/contains-technical-debt.svg)](https://forthebadge.com)
+This document is intended to get you up and running, but if don't care about what I have to say, just clone the sodding repository and have a poke around with what's in it, but for GODS SAKE DO NOT PUSH WITHOUT TESTING.
+
+### What is this repository for? ###
+For the rapid development of the application for medium term deployment, the main branch is being used.
+Once the application is deployed in a production environment, other branches should be used to properly stage edits and pushes of new features. When a significant feature is developed on a branch, raise a pull request and it can be reviewed before being put into production.
+
+Most of the documents here assume a basic knowledge of how Python and Django work (hint, if I don't say something, Google it, you will find 10000's of answers). The documentation is purely to be specific to TEC's application of the framework.
+
+### Editing ###
+It is recommended that you use the PyCharm IDE by JetBrains. Whilst other editors are available, this is the best for integration with Django as it can automatically manage all the pesky admin commands that frequently need running, as well as nice integration with git.
+
+For the more experienced developer/somebody who doesn't want a full IDE and wants it to open in less than the age of the universe, I can strongly recommend [Sublime Text](http://www.sublimetext.com/). It has a bit of a steeper learning curve, and won't manage anything Django/git related out of the box, but once you get the hang of it is by far the fastest and most powerful editor I have used (for any type of project).
+
+Please contact TJP for details on how to acquire these.
+
+### Python Environment ###
+Whilst the Python version used is not critical to the running of the application, using the same version usually helps avoid a lot of issues. Mainly the C implementation of Python 2 (CPython 2) has been used (specifically the Python 2.7 standard). Most of the application has been written with Python 3 in mind however, and should run without issue. Some level of testing on Python 3 has been done, but there is no guarantee it will work (for more information on this please see [[Python Version]] on the wiki)
+
+Once you have your Python distribution installed, go ahead an follow the steps to set up a virtualenv, which will isolate the project from the system environment.
+
+#### PyCharm ####
+If you are using the prefered PyCharm IDE, then this should be quite easy.
+
+1. Select "File/Settings" -> "Project Interpreter"
+2. Click the small cog in the top right
+3. Select "Create VirtualEnv"
+4. Enter a name and a location. This doesn't matter where, just make sure it makes sense and you remember it incase you need it later (I recommend calling it "pyrigs" in "~/.virtualenvs/pyrigs")
+5. Select the base interpreter to your Python 3 base interpreter (Python 2 will work, just be careful)
+6. Click OK, you *don't* want to inherit global packages or make it available to all projects.
+7. Open a file such as manage.py. PyCharm should winge that dependances aren't installed. This might take a while to register, but give it change. When it does, click the button to install them and let it do it's thing. If for some reason PyCharm should decide that it doesn't want to help you here, see below for the console instructions on how to do this manually.
+
+To run the Django application follow these steps
+
+1. Select "Run/Edit Configurations"
+2. Create a new "Django server", give it a sensible name for when you need it later.
+3. You might need to set the interpreter to be your virtualenv.
+4. Click "OK"
+5. Run the application
+
+#### Console Based ####
+If you aren't using PyCharm, or want to use a console for some reason, this is really easy, there is even [virtualenvwrapper](https://virtualenvwrapper.readthedocs.org/en/latest/) to help things along. Simply run
+```
+virtualenv <dir>
+```
+Where dir is the directory you wish to create the virtualenv in.
+
+Next activate the virtualenv.
+```
+Windows
+<virtualenv_dir>/Scripts/activate.bat
+
+Unix
+source <virtualenv_dir>/bin/activate
+```
+Finally install the requirements using pip
+```
+cd <pyrigs project directory>
+pip install -r requirements.txt
+```
+This might take a while, but be patient and you should then be ready to go.
+
+To run the server under normal conditions when you are already in the virtualenv (see above)
+```
+python manage.py runserver
+```
+Please refer to Django documentation for a full list of options available here.
+
+### Sample Data ###
+Sample data is available to aid local development and user acceptance testing. To load this data into your local database, first ensure the database is empty:
+```
+python manage.py flush
+```
+Then load the sample data using the command:
+```
+python manage.py generateSampleData
+```
+4 user accounts are created for convenience:
+|Username |Password |
+|---------|---------|
+|superuser|superuser|
+|finance  |finance  |
+|keyholder|keyholder|
+|basic    |basic    |
+
+### Committing, pushing and testing ###
+Feel free to commit as you wish, on your own branch. On my branch (master for development) do not commit code that you either know doesn't work or don't know works. If you must commit this code, please make sure you say in the commit message that it isn't working, and if you can why it isn't working. If and only if you absolutely must push, then please don't leave it as the HEAD for too long, it's not much to ask but when you are done just make sure you haven't broken the HEAD for the next person.

RIGS/__init__.py

@@ -1 +0,0 @@
-default_app_config = 'RIGS.apps.RIGSAppConfig'

RIGS/admin.py

@@ -1,43 +1,32 @@
+import reversion
 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 ugettext_lazy as _
 
-from reversion import revisions as reversion
+from RIGS import models, forms
 
 # Register your models here.
-admin.site.register(models.VatRate, VersionAdmin)
+admin.site.register(models.VatRate, reversion.VersionAdmin)
-admin.site.register(models.Event, VersionAdmin)
+admin.site.register(models.Event, reversion.VersionAdmin)
-admin.site.register(models.EventItem, VersionAdmin)
+admin.site.register(models.EventItem, reversion.VersionAdmin)
-admin.site.register(models.Invoice, VersionAdmin)
+admin.site.register(models.Invoice)
-
+admin.site.register(models.Payment)
-
-def approve_user(modeladmin, request, queryset):
-    queryset.update(is_approved=True)
-
-
-approve_user.short_description = "Approve selected users"
 
 
 @admin.register(models.Profile)
 class ProfileAdmin(UserAdmin):
-    # Don't know how to add 'is_approved' whilst preserving the default list...
-    list_filter = ('is_approved', 'is_active', 'is_staff', 'is_superuser', 'groups')
     fieldsets = (
         (None, {'fields': ('username', 'password')}),
         (_('Personal info'), {
             'fields': ('first_name', 'last_name', 'email', 'initials', 'phone')}),
-        (_('Permissions'), {'fields': ('is_approved', 'is_active', 'is_staff', 'is_superuser',
+        (_('Permissions'), {'fields': ('is_active', 'is_staff', 'is_superuser',
                                        'groups', 'user_permissions')}),
         (_('Important dates'), {
             'fields': ('last_login', 'date_joined')}),
@@ -48,12 +37,11 @@ class ProfileAdmin(UserAdmin):
             'fields': ('username', 'password1', 'password2'),
         }),
     )
-    form = user_forms.ProfileChangeForm
+    form = forms.ProfileChangeForm
-    add_form = user_forms.ProfileCreationForm
+    add_form = forms.ProfileCreationForm
-    actions = [approve_user]
 
 
-class AssociateAdmin(VersionAdmin):
+class AssociateAdmin(reversion.VersionAdmin):
     list_display = ('id', 'name', 'number_of_events')
     search_fields = ['id', 'name']
     list_display_links = ['id', 'name']
@@ -62,7 +50,8 @@ class AssociateAdmin(VersionAdmin):
     merge_fields = ['name']
 
     def get_queryset(self, request):
-        return super(AssociateAdmin, self).get_queryset(request).annotate(event_count=Count('event'))
+        return super(AssociateAdmin, self).get_queryset(
+            request).annotate(event_count=Count('event'))
 
     def number_of_events(self, obj):
         return obj.latest_events.count()
@@ -70,12 +59,16 @@ class AssociateAdmin(VersionAdmin):
     number_of_events.admin_order_field = 'event_count'
 
     def merge(self, request, queryset):
-        if request.POST.get('post'):  # Has the user confirmed which is the master record?
+        if request.POST.get(
+            'post'):  # Has the user confirmed which is the master record?
             try:
                 masterObjectPk = request.POST.get('master')
                 masterObject = queryset.get(pk=masterObjectPk)
             except ObjectDoesNotExist:
-                self.message_user(request, "An error occured. Did you select a 'master' record?", level=messages.ERROR)
+                self.message_user(
+                    request,
+                    "An error occured. Did you select a 'master' record?",
+                    level=messages.ERROR)
                 return
 
             with transaction.atomic(), reversion.create_revision():
@@ -91,6 +84,7 @@ class AssociateAdmin(VersionAdmin):
         else:  # Present the confirmation screen
 
             class TempForm(ModelForm):
+
                 class Meta:
                     model = queryset.model
                     fields = self.merge_fields
@@ -105,7 +99,8 @@ class AssociateAdmin(VersionAdmin):
                 'action_checkbox_name': helpers.ACTION_CHECKBOX_NAME,
                 'forms': forms
             }
-            return TemplateResponse(request, 'admin_associate_merge.html', context)
+            return TemplateResponse(request, 'RIGS/admin_associate_merge.html', context,
+                                    current_app=self.admin_site.name)
 
 
 @admin.register(models.Person)
@@ -117,20 +112,22 @@ class PersonAdmin(AssociateAdmin):
 @admin.register(models.Venue)
 class VenueAdmin(AssociateAdmin):
     list_display = ('id', 'name', 'phone', 'email', 'number_of_events')
-    merge_fields = ['name', 'phone', 'email', 'address', 'notes', 'three_phase_available']
+    merge_fields = [
+        'name',
+        'phone',
+        'email',
+        'address',
+        'notes',
+        'three_phase_available']
 
 
 @admin.register(models.Organisation)
 class OrganisationAdmin(AssociateAdmin):
     list_display = ('id', 'name', 'phone', 'email', 'number_of_events')
-    merge_fields = ['name', 'phone', 'email', 'address', 'notes', 'union_account']
+    merge_fields = [
-
+        'name',
-
+        'phone',
-@admin.register(models.RiskAssessment)
+        'email',
-class RiskAssessmentAdmin(VersionAdmin):
+        'address',
-    list_display = ('id', 'event', 'reviewed_at', 'reviewed_by')
+        'notes',
-
+        'union_account']
-
-@admin.register(models.EventChecklist)
-class EventChecklistAdmin(VersionAdmin):
-    list_display = ('id', 'event', 'reviewed_at', 'reviewed_by')

RIGS/apps.py

@@ -1,8 +0,0 @@
-from django.apps import AppConfig
-
-
-class RIGSAppConfig(AppConfig):
-    name = 'RIGS'
-
-    def ready(self):
-        import RIGS.signals

RIGS/finance.py

@@ -1,43 +1,37 @@
+import cStringIO as StringIO
 import datetime
 import re
 
 from django.contrib import messages
-from django.urls import reverse_lazy
+from django.core.urlresolvers import reverse_lazy
+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.views import generic
-from django.db.models import Q
 from z3c.rml import rml2pdf
-from django.db.models import Q
-
-from django.db import transaction
-import reversion
 
 from RIGS import models
 
-from django import forms
-
-forms.DateField.widget = forms.DateInput(attrs={'type': 'date'})
-
 
 class InvoiceIndex(generic.ListView):
     model = models.Invoice
-    template_name = 'invoice_list.html'
+    template_name = 'RIGS/invoice_list_active.html'
 
     def get_context_data(self, **kwargs):
         context = super(InvoiceIndex, self).get_context_data(**kwargs)
         total = 0
         for i in context['object_list']:
             total += i.balance
-        context['page_title'] = "Outstanding Invoices ({} Events, £{:.2f})".format(len(list(context['object_list'])), total)
+        context['total'] = total
-        context['description'] = "Paperwork for these events has been sent to treasury, but the full balance has not yet appeared on a ledger"
+        context['count'] = len(list(context['object_list']))
         return context
 
     def get_queryset(self):
-        # Manual query is the only way I have found to do this efficiently. Not ideal but needs must
+        # Manual query is the only way I have found to do this efficiently. Not
+        # ideal but needs must
         sql = "SELECT * FROM " \
               "(SELECT " \
               "(SELECT COUNT(p.amount) FROM \"RIGS_payment\" AS p WHERE p.invoice_id=\"RIGS_invoice\".id) AS \"payment_count\", " \
@@ -55,21 +49,15 @@ class InvoiceIndex(generic.ListView):
 
 class InvoiceDetail(generic.DetailView):
     model = models.Invoice
-    template_name = 'invoice_detail.html'
-
-    def get_context_data(self, **kwargs):
-        context = super(InvoiceDetail, self).get_context_data(**kwargs)
-        context['page_title'] = "Invoice {} ({})".format(self.object.display_id, self.object.invoice_date.strftime("%d/%m/%Y"))
-        return context
 
 
 class InvoicePrint(generic.View):
     def get(self, request, pk):
         invoice = get_object_or_404(models.Invoice, pk=pk)
         object = invoice.event
-        template = get_template('event_print.xml')
+        template = get_template('RIGS/event_print.xml')
-
+        copies = ('TEC', 'Client')
-        context = {
+        context = RequestContext(request, {
             'object': object,
             'fonts': {
                 'opensans': {
@@ -79,17 +67,20 @@ class InvoicePrint(generic.View):
             },
             'invoice': invoice,
             'current_user': request.user,
-            'filename': 'Invoice {} for {} {}.pdf'.format(invoice.display_id, object.display_id, re.sub(r'[^a-zA-Z0-9 \n\.]', '', object.name))
+        })
-        }
 
         rml = template.render(context)
+        buffer = StringIO.StringIO()
 
         buffer = rml2pdf.parseString(rml)
 
         pdfData = buffer.read()
 
+        escapedEventName = re.sub('[^a-zA-Z0-9 \n\.]', '', object.name)
+
         response = HttpResponse(content_type='application/pdf')
-        response['Content-Disposition'] = 'filename="{}"'.format(context['filename'])
+        response[
+            'Content-Disposition'] = "filename=Invoice %05d | %s.pdf" % (invoice.pk, escapedEventName)
         response.write(pdfData)
         return response
 
@@ -103,25 +94,31 @@ class InvoiceVoid(generic.View):
 
         if object.void:
             return HttpResponseRedirect(reverse_lazy('invoice_list'))
-        return HttpResponseRedirect(reverse_lazy('invoice_detail', kwargs={'pk': object.pk}))
+        return HttpResponseRedirect(reverse_lazy(
+            'invoice_detail', kwargs={'pk': object.pk}))
 
 
 class InvoiceDelete(generic.DeleteView):
     model = models.Invoice
-    template_name = 'invoice_confirm_delete.html'
 
     def get(self, request, pk):
         obj = self.get_object()
         if obj.payment_set.all().count() > 0:
-            messages.info(self.request, 'To delete an invoice, delete the payments first.')
+            messages.info(
-            return HttpResponseRedirect(reverse_lazy('invoice_detail', kwargs={'pk': obj.pk}))
+                self.request,
+                'To delete an invoice, delete the payments first.')
+            return HttpResponseRedirect(reverse_lazy(
+                'invoice_detail', kwargs={'pk': obj.pk}))
         return super(InvoiceDelete, self).get(pk)
 
     def post(self, request, pk):
         obj = self.get_object()
         if obj.payment_set.all().count() > 0:
-            messages.info(self.request, 'To delete an invoice, delete the payments first.')
+            messages.info(
-            return HttpResponseRedirect(reverse_lazy('invoice_detail', kwargs={'pk': obj.pk}))
+                self.request,
+                'To delete an invoice, delete the payments first.')
+            return HttpResponseRedirect(reverse_lazy(
+                'invoice_detail', kwargs={'pk': obj.pk}))
         return super(InvoiceDelete, self).post(pk)
 
     def get_success_url(self):
@@ -130,55 +127,22 @@ class InvoiceDelete(generic.DeleteView):
 
 class InvoiceArchive(generic.ListView):
     model = models.Invoice
-    template_name = 'invoice_list_archive.html'
+    template_name = 'RIGS/invoice_list_archive.html'
     paginate_by = 25
 
-    def get_context_data(self, **kwargs):
-        context = super(InvoiceArchive, self).get_context_data(**kwargs)
-        context['page_title'] = "Invoice Archive"
-        context['description'] = "This page displays all invoices: outstanding, paid, and void"
-        return context
-
-    def get_queryset(self):
-        q = self.request.GET.get('q', "")
-
-        filter = Q(event__name__icontains=q)
-
-        # try and parse an int
-        try:
-            val = int(q)
-            filter = filter | Q(pk=val)
-            filter = filter | Q(event__pk=val)
-        except:  # noqa
-            # not an integer
-            pass
-
-        try:
-            if q[0] == "N":
-                val = int(q[1:])
-                filter = Q(event__pk=val)  # If string is Nxxxxx then filter by event number
-            elif q[0] == "#":
-                val = int(q[1:])
-                filter = Q(pk=val)  # If string is #xxxxx then filter by invoice number
-        except:  # noqa
-            pass
-
-        object_list = self.model.objects.filter(filter).order_by('-invoice_date')
-
-        return object_list
-
 
 class InvoiceWaiting(generic.ListView):
     model = models.Event
-    paginate_by = 25
+    # paginate_by = 25
-    template_name = 'invoice_list_waiting.html'
+    template_name = 'RIGS/event_invoice.html'
 
     def get_context_data(self, **kwargs):
         context = super(InvoiceWaiting, self).get_context_data(**kwargs)
         total = 0
         for obj in self.get_objects():
             total += obj.sum_total
-        context['page_title'] = "Events for Invoice ({} Events, £{:.2f})".format(len(self.get_objects()), total)
+        context['total'] = total
+        context['count'] = len(self.get_objects())
         return context
 
     def get_queryset(self):
@@ -188,10 +152,12 @@ class InvoiceWaiting(generic.ListView):
         # @todo find a way to select items
         events = self.model.objects.filter(
             (
-                Q(start_date__lte=datetime.date.today(), end_date__isnull=True) |  # Starts before with no end
+                # Starts before with no end
-                Q(end_date__lte=datetime.date.today())  # Has end date, finishes before
+                Q(start_date__lte=datetime.date.today(), end_date__isnull=True) |
-            ) & Q(invoice__isnull=True) &  # Has not already been invoiced
+                # Has end date, finishes before
-            Q(is_rig=True)  # Is a rig (not non-rig)
+                Q(end_date__lte=datetime.date.today())
+            ) & Q(invoice__isnull=True)  # Has not already been invoiced
+            & Q(is_rig=True)  # Is a rig (not non-rig)
 
         ).order_by('start_date') \
             .select_related('person',
@@ -203,10 +169,7 @@ class InvoiceWaiting(generic.ListView):
 
 
 class InvoiceEvent(generic.View):
-    @transaction.atomic()
-    @reversion.create_revision()
     def get(self, *args, **kwargs):
-        reversion.set_user(self.request.user)
         epk = kwargs.get('pk')
         event = models.Event.objects.get(pk=epk)
         invoice, created = models.Invoice.objects.get_or_create(event=event)
@@ -215,35 +178,25 @@ class InvoiceEvent(generic.View):
             invoice.invoice_date = datetime.date.today()
             messages.success(self.request, 'Invoice created successfully')
 
-        if kwargs.get('void'):
+        return HttpResponseRedirect(reverse_lazy(
-            invoice.void = not invoice.void
+            'invoice_detail', kwargs={'pk': invoice.pk}))
-            invoice.save()
-            messages.warning(self.request, 'Invoice voided')
-
-        return HttpResponseRedirect(reverse_lazy('invoice_detail', kwargs={'pk': invoice.pk}))
 
 
 class PaymentCreate(generic.CreateView):
     model = models.Payment
     fields = ['invoice', 'date', 'amount', 'method']
-    template_name = 'payment_form.html'
 
     def get_initial(self):
         initial = super(generic.CreateView, self).get_initial()
-        invoicepk = self.request.GET.get('invoice', self.request.POST.get('invoice', None))
+        invoicepk = self.request.GET.get(
+            'invoice', self.request.POST.get(
+                'invoice', None))
         if invoicepk is None:
             raise Http404()
         invoice = get_object_or_404(models.Invoice, pk=invoicepk)
         initial.update({'invoice': invoice})
         return initial
 
-    @transaction.atomic()
-    @reversion.create_revision()
-    def form_valid(self, form, *args, **kwargs):
-        reversion.add_to_revision(form.cleaned_data['invoice'])
-        reversion.set_comment("Payment added")
-        return super().form_valid(form, *args, **kwargs)
-
     def get_success_url(self):
         messages.info(self.request, "location.reload()")
         return reverse_lazy('closemodal')
@@ -251,14 +204,6 @@ class PaymentCreate(generic.CreateView):
 
 class PaymentDelete(generic.DeleteView):
     model = models.Payment
-    template_name = 'payment_confirm_delete.html'
-
-    @transaction.atomic()
-    @reversion.create_revision()
-    def delete(self, *args, **kwargs):
-        reversion.add_to_revision(self.get_object().invoice)
-        reversion.set_comment("Payment removed")
-        return super().delete(*args, **kwargs)
 
     def get_success_url(self):
         return self.request.POST.get('next')

RIGS/forms.py

@@ -1,31 +1,66 @@
-from django import forms
+__author__ = 'Ghost'
-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 captcha.fields import ReCaptchaField
-from django.utils import timezone
+from django import forms
+from django.conf import settings
+from django.contrib.auth.forms import UserCreationForm, UserChangeForm, PasswordResetForm
+from django.core import serializers
+from django.utils import formats
+from registration.forms import RegistrationFormUniqueEmail
 
 from RIGS import models
 
-# Override the django form defaults to use the HTML date/time/datetime UI elements
+
-forms.DateField.widget = forms.DateInput(attrs={'type': 'date'})
+# Registration
-forms.TimeField.widget = forms.TimeInput(attrs={'type': 'time'}, format='%H:%M')
+class ProfileRegistrationFormUniqueEmail(RegistrationFormUniqueEmail):
-forms.DateTimeField.widget = forms.DateTimeInput(attrs={'type': 'datetime-local'}, format='%Y-%m-%d %H:%M')
+    captcha = ReCaptchaField()
+
+    class Meta:
+        model = models.Profile
+        fields = (
+            'username',
+            'email',
+            'first_name',
+            'last_name',
+            'initials',
+            'phone')
+
+    def clean_initials(self):
+        """
+        Validate that the supplied initials are unique.
+        """
+        if models.Profile.objects.filter(
+            initials__iexact=self.cleaned_data['initials']):
+            raise forms.ValidationError(
+                "These initials are already in use. Please supply different initials.")
+        return self.cleaned_data['initials']
+
+
+# Login form
+class PasswordReset(PasswordResetForm):
+    captcha = ReCaptchaField(label='Captcha')
+
+
+class ProfileCreationForm(UserCreationForm):
+    class Meta(UserCreationForm.Meta):
+        model = models.Profile
+
+
+class ProfileChangeForm(UserChangeForm):
+    class Meta(UserChangeForm.Meta):
+        model = models.Profile
 
 
 # Events Shit
 class EventForm(forms.ModelForm):
-    datetime_input_formats = list(settings.DATETIME_INPUT_FORMATS)
+    datetime_input_formats = formats.get_format_lazy(
-    meet_at = forms.DateTimeField(input_formats=datetime_input_formats, required=False)
+        "DATETIME_INPUT_FORMATS") + settings.DATETIME_INPUT_FORMATS
-    access_at = forms.DateTimeField(input_formats=datetime_input_formats, required=False)
+    meet_at = forms.DateTimeField(
+        input_formats=datetime_input_formats,
+        required=False)
+    access_at = forms.DateTimeField(
+        input_formats=datetime_input_formats,
+        required=False)
 
     items_json = forms.CharField()
 
@@ -67,7 +102,8 @@ class EventForm(forms.ModelForm):
         items = {}
         for key in data:
             pk = int(key)
-            items[pk] = self._get_or_initialise_item(pk, data[key]['fields'], event)
+            items[pk] = self._get_or_initialise_item(
+                pk, data[key]['fields'], event)
 
         return items
 
@@ -96,14 +132,6 @@ class EventForm(forms.ModelForm):
 
         return item
 
-    def clean(self):
-        if self.cleaned_data.get("is_rig") and not (
-                self.cleaned_data.get('person') or self.cleaned_data.get('organisation')):
-            raise forms.ValidationError(
-                'You haven\'t provided any client contact details. Please add a person or organisation.',
-                code='contact')
-        return super(EventForm, self).clean()
-
     def save(self, commit=True):
         m = super(EventForm, self).save(commit=False)
 
@@ -126,158 +154,4 @@ class EventForm(forms.ModelForm):
         fields = ['is_rig', 'name', 'venue', 'start_time', 'end_date', 'start_date',
                   'end_time', 'meet_at', 'access_at', 'description', 'notes', 'mic',
                   'person', 'organisation', 'dry_hire', 'checked_in_by', 'status',
-                  'purchase_order', 'collector']
+                  'collector', 'purchase_order']
-
-
-class BaseClientEventAuthorisationForm(forms.ModelForm):
-    tos = forms.BooleanField(required=True, label="Terms of hire")
-    name = forms.CharField(label="Your Name")
-
-    def clean(self):
-        if self.cleaned_data.get('amount') != self.instance.event.total:
-            self.add_error('amount', 'The amount authorised must equal the total for the event (inc VAT).')
-        return super(BaseClientEventAuthorisationForm, self).clean()
-
-    class Meta:
-        abstract = True
-
-
-class InternalClientEventAuthorisationForm(BaseClientEventAuthorisationForm):
-    def __init__(self, **kwargs):
-        super(InternalClientEventAuthorisationForm, self).__init__(**kwargs)
-        self.fields['uni_id'].required = True
-        self.fields['account_code'].required = True
-
-    class Meta:
-        model = models.EventAuthorisation
-        fields = ('tos', 'name', 'amount', 'uni_id', 'account_code')
-
-
-class EventAuthorisationRequestForm(forms.Form):
-    email = forms.EmailField(required=True, label='Authoriser Email')
-
-
-class EventRiskAssessmentForm(forms.ModelForm):
-    def __init__(self, *args, **kwargs):
-        super(EventRiskAssessmentForm, self).__init__(*args, **kwargs)
-        for name, field in self.fields.items():
-            if str(name) == 'supervisor_consulted':
-                field.widget = forms.CheckboxInput()
-            elif field.__class__ == forms.BooleanField:
-                field.widget = forms.RadioSelect(choices=[
-                    (True, 'Yes'),
-                    (False, 'No')
-                ], attrs={'class': 'custom-control-input', 'required': 'true'})
-
-    def clean(self):
-        # Check expected values
-        unexpected_values = []
-        for field, value in models.RiskAssessment.expected_values.items():
-            if self.cleaned_data.get(field) != value:
-                unexpected_values.append("<li>{}</li>".format(self._meta.model._meta.get_field(field).help_text))
-        if len(unexpected_values) > 0 and not self.cleaned_data.get('supervisor_consulted'):
-            raise forms.ValidationError("Your answers to these questions: <ul>{}</ul> require consulting with a supervisor.".format(''.join([str(elem) for elem in unexpected_values])), code='unusual_answers')
-        return super(EventRiskAssessmentForm, self).clean()
-
-    class Meta:
-        model = models.RiskAssessment
-        fields = '__all__'
-        exclude = ['reviewed_at', 'reviewed_by']
-
-
-class EventChecklistForm(forms.ModelForm):
-    def __init__(self, *args, **kwargs):
-        super(EventChecklistForm, self).__init__(*args, **kwargs)
-        self.fields['date'].widget.format = '%Y-%m-%d'
-        for name, field in self.fields.items():
-            if field.__class__ == forms.NullBooleanField:
-                # Only display yes/no to user, the 'none' is only ever set in the background
-                field.widget = forms.CheckboxInput()
-    # Parsed from incoming form data by clean, then saved into models when the form is saved
-    items = {}
-
-    related_models = {
-        'venue': models.Venue,
-        'power_mic': models.Profile,
-    }
-
-    # Two possible formats
-    def parsedatetime(self, date_string):
-        try:
-            return timezone.make_aware(datetime.strptime(date_string, '%Y-%m-%dT%H:%M:%S'))
-        except ValueError:
-            return timezone.make_aware(datetime.strptime(date_string, '%Y-%m-%dT%H:%M'))
-
-    # There's probably a thousand better ways to do this, but this one is mine
-    def clean(self):
-        vehicles = {key: val for key, val in self.data.items()
-                    if key.startswith('vehicle')}
-        for key in vehicles:
-            pk = int(key.split('_')[1])
-            driver_key = 'driver_' + str(pk)
-            if(self.data[driver_key] == ''):
-                raise forms.ValidationError('Add a driver to vehicle ' + str(pk), code='vehicle_mismatch')
-            else:
-                try:
-                    item = models.EventChecklistVehicle.objects.get(pk=pk)
-                except models.EventChecklistVehicle.DoesNotExist:
-                    item = models.EventChecklistVehicle()
-
-                item.vehicle = vehicles['vehicle_' + str(pk)]
-                item.driver = models.Profile.objects.get(pk=self.data[driver_key])
-                item.full_clean('checklist')
-
-                # item does not have a database pk yet as it isn't saved
-                self.items['v' + str(pk)] = item
-
-        crewmembers = {key: val for key, val in self.data.items()
-                       if key.startswith('crewmember')}
-        other_fields = ['start', 'role', 'end']
-        for key in crewmembers:
-            pk = int(key.split('_')[1])
-
-            for field in other_fields:
-                value = self.data['{}_{}'.format(field, pk)]
-                if value == '':
-                    raise forms.ValidationError('Add a {} to crewmember {}'.format(field, pk), code='{}_mismatch'.format(field))
-
-            try:
-                item = models.EventChecklistCrew.objects.get(pk=pk)
-            except models.EventChecklistCrew.DoesNotExist:
-                item = models.EventChecklistCrew()
-
-            item.crewmember = models.Profile.objects.get(pk=self.data['crewmember_' + str(pk)])
-            item.start = self.parsedatetime(self.data['start_' + str(pk)])
-            item.role = self.data['role_' + str(pk)]
-            item.end = self.parsedatetime(self.data['end_' + str(pk)])
-            item.full_clean('checklist')
-
-            # item does not have a database pk yet as it isn't saved
-            self.items['c' + str(pk)] = item
-
-        return super(EventChecklistForm, self).clean()
-
-    def save(self, commit=True):
-        checklist = super(EventChecklistForm, self).save(commit=False)
-        if (commit):
-            # Remove all existing, to be recreated from the form
-            checklist.vehicles.all().delete()
-            checklist.crew.all().delete()
-            checklist.save()
-
-            for key in self.items:
-                item = self.items[key]
-                reversion.add_to_revision(item)
-                # finish and save new database items
-                item.checklist = checklist
-                item.full_clean()
-                item.save()
-
-        self.items.clear()
-
-        return checklist
-
-    class Meta:
-        model = models.EventChecklist
-        fields = '__all__'
-        exclude = ['reviewed_at', 'reviewed_by']

RIGS/hs.py

@@ -1,217 +0,0 @@
-from RIGS import models, forms
-from django.views import generic
-from django.utils import timezone
-from django.http import HttpResponseRedirect
-from django.urls import reverse_lazy
-from reversion import revisions as reversion
-from django.db.models import AutoField, ManyToOneRel
-from django.contrib import messages
-
-
-class EventRiskAssessmentCreate(generic.CreateView):
-    model = models.RiskAssessment
-    template_name = 'risk_assessment_form.html'
-    form_class = forms.EventRiskAssessmentForm
-
-    def get(self, *args, **kwargs):
-        epk = kwargs.get('pk')
-        event = models.Event.objects.get(pk=epk)
-
-        # Check if RA exists
-        ra = models.RiskAssessment.objects.filter(event=event).first()
-
-        if ra is not None:
-            return HttpResponseRedirect(reverse_lazy('ra_edit', kwargs={'pk': ra.pk}))
-
-        return super(EventRiskAssessmentCreate, self).get(self)
-
-    def get_form(self, **kwargs):
-        form = super(EventRiskAssessmentCreate, self).get_form(**kwargs)
-        epk = self.kwargs.get('pk')
-        event = models.Event.objects.get(pk=epk)
-        form.instance.event = event
-        return form
-
-    def get_context_data(self, **kwargs):
-        context = super(EventRiskAssessmentCreate, self).get_context_data(**kwargs)
-        epk = self.kwargs.get('pk')
-        event = models.Event.objects.get(pk=epk)
-        context['event'] = event
-        context['page_title'] = 'Create Risk Assessment for Event {}'.format(event.display_id)
-        return context
-
-    def get_success_url(self):
-        return reverse_lazy('ra_detail', kwargs={'pk': self.object.pk})
-
-
-class EventRiskAssessmentEdit(generic.UpdateView):
-    model = models.RiskAssessment
-    template_name = 'risk_assessment_form.html'
-    form_class = forms.EventRiskAssessmentForm
-
-    def get_success_url(self):
-        ra = self.get_object()
-        ra.reviewed_by = None
-        ra.reviewed_at = None
-        ra.save()
-        return reverse_lazy('ra_detail', kwargs={'pk': self.object.pk})
-
-    def get_context_data(self, **kwargs):
-        context = super(EventRiskAssessmentEdit, self).get_context_data(**kwargs)
-        rpk = self.kwargs.get('pk')
-        ra = models.RiskAssessment.objects.get(pk=rpk)
-        context['event'] = ra.event
-        context['edit'] = True
-        context['page_title'] = 'Edit Risk Assessment for Event {}'.format(ra.event.display_id)
-        return context
-
-
-class EventRiskAssessmentDetail(generic.DetailView):
-    model = models.RiskAssessment
-    template_name = 'risk_assessment_detail.html'
-
-
-class EventRiskAssessmentList(generic.ListView):
-    paginate_by = 20
-    model = models.RiskAssessment
-    template_name = 'hs_object_list.html'
-
-    def get_context_data(self, **kwargs):
-        context = super(EventRiskAssessmentList, self).get_context_data(**kwargs)
-        context['title'] = 'Risk Assessment'
-        context['view'] = 'ra_detail'
-        context['edit'] = 'ra_edit'
-        context['review'] = 'ra_review'
-        context['perm'] = 'perms.RIGS.review_riskassessment'
-        context['fields'] = [n.name for n in list(self.model._meta.get_fields()) if n.name != 'reviewed_at' and n.name != 'reviewed_by' and not n.is_relation and not n.auto_created]
-        return context
-
-
-class EventRiskAssessmentReview(generic.View):
-    def get(self, *args, **kwargs):
-        rpk = kwargs.get('pk')
-        ra = models.RiskAssessment.objects.get(pk=rpk)
-        with reversion.create_revision():
-            reversion.set_user(self.request.user)
-            ra.reviewed_by = self.request.user
-            ra.reviewed_at = timezone.now()
-            ra.save()
-        return HttpResponseRedirect(reverse_lazy('ra_list'))
-
-
-class EventChecklistDetail(generic.DetailView):
-    model = models.EventChecklist
-    template_name = 'event_checklist_detail.html'
-
-    def get_context_data(self, **kwargs):
-        context = super(EventChecklistDetail, self).get_context_data(**kwargs)
-        context['page_title'] = "Event Checklist for Event {} {}".format(self.object.event.display_id, self.object.event.name)
-        return context
-
-
-class EventChecklistEdit(generic.UpdateView):
-    model = models.EventChecklist
-    template_name = 'event_checklist_form.html'
-    form_class = forms.EventChecklistForm
-
-    def get_success_url(self):
-        ec = self.get_object()
-        ec.reviewed_by = None
-        ec.reviewed_at = None
-        ec.save()
-        return reverse_lazy('ec_detail', kwargs={'pk': self.object.pk})
-
-    def get_context_data(self, **kwargs):
-        context = super(EventChecklistEdit, self).get_context_data(**kwargs)
-        pk = self.kwargs.get('pk')
-        ec = models.EventChecklist.objects.get(pk=pk)
-        context['event'] = ec.event
-        context['edit'] = True
-        context['page_title'] = 'Edit Event Checklist for Event {}'.format(ec.event.display_id)
-        form = context['form']
-        # Get some other objects to include in the form. Used when there are errors but also nice and quick.
-        for field, model in form.related_models.items():
-            value = form[field].value()
-            if value is not None and value != '':
-                context[field] = model.objects.get(pk=value)
-        return context
-
-
-class EventChecklistCreate(generic.CreateView):
-    model = models.EventChecklist
-    template_name = 'event_checklist_form.html'
-    form_class = forms.EventChecklistForm
-
-    # From both business logic and programming POVs, RAs must exist before ECs!
-    def get(self, *args, **kwargs):
-        epk = kwargs.get('pk')
-        event = models.Event.objects.get(pk=epk)
-
-        # Check if RA exists
-        ra = models.RiskAssessment.objects.filter(event=event).first()
-
-        if ra is None:
-            messages.error(self.request, 'A Risk Assessment must exist prior to creating any Event Checklists for {}! Please create one now.'.format(event))
-            return HttpResponseRedirect(reverse_lazy('event_ra', kwargs={'pk': epk}))
-
-        return super(EventChecklistCreate, self).get(self)
-
-    def get_form(self, **kwargs):
-        form = super(EventChecklistCreate, self).get_form(**kwargs)
-        epk = self.kwargs.get('pk')
-        event = models.Event.objects.get(pk=epk)
-        form.instance.event = event
-        return form
-
-    def get_context_data(self, **kwargs):
-        context = super(EventChecklistCreate, self).get_context_data(**kwargs)
-        epk = self.kwargs.get('pk')
-        event = models.Event.objects.get(pk=epk)
-        context['event'] = event
-        context['page_title'] = 'Create Event Checklist for Event {}'.format(event.display_id)
-        return context
-
-    def get_success_url(self):
-        return reverse_lazy('ec_detail', kwargs={'pk': self.object.pk})
-
-
-class EventChecklistList(generic.ListView):
-    paginate_by = 20
-    model = models.EventChecklist
-    template_name = 'hs_object_list.html'
-
-    def get_context_data(self, **kwargs):
-        context = super(EventChecklistList, self).get_context_data(**kwargs)
-        context['title'] = 'Event Checklist'
-        context['view'] = 'ec_detail'
-        context['edit'] = 'ec_edit'
-        context['review'] = 'ec_review'
-        context['perm'] = 'perms.RIGS.review_eventchecklist'
-        context['fields'] = [n.name for n in list(self.model._meta.get_fields()) if n.name != 'reviewed_at' and n.name != 'reviewed_by' and not n.is_relation and not n.auto_created]
-        return context
-
-
-class EventChecklistReview(generic.View):
-    def get(self, *args, **kwargs):
-        rpk = kwargs.get('pk')
-        ec = models.EventChecklist.objects.get(pk=rpk)
-        with reversion.create_revision():
-            reversion.set_user(self.request.user)
-            ec.reviewed_by = self.request.user
-            ec.reviewed_at = timezone.now()
-            ec.save()
-        return HttpResponseRedirect(reverse_lazy('ec_list'))
-
-
-class HSList(generic.ListView):
-    paginate_by = 20
-    model = models.Event
-    template_name = 'hs_list.html'
-
-    def get_queryset(self):
-        return models.Event.objects.all().order_by('-start_date')
-
-    def get_context_data(self, **kwargs):
-        context = super(HSList, self).get_context_data(**kwargs)
-        context['page_title'] = 'H&S Overview'
-        return context

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):
@@ -34,7 +33,8 @@ class CalendarICS(ICalFeed):
         params['rig'] = request.GET.get('rig', 'true') == 'true'
 
         params['cancelled'] = request.GET.get('cancelled', 'false') == 'true'
-        params['provisional'] = request.GET.get('provisional', 'true') == 'true'
+        params['provisional'] = request.GET.get(
+            'provisional', 'true') == 'true'
         params['confirmed'] = request.GET.get('confirmed', 'true') == 'true'
 
         return params
@@ -52,7 +52,8 @@ class CalendarICS(ICalFeed):
         start = datetime.datetime.now() - datetime.timedelta(days=365)
         filter = Q(start_date__gte=start)
 
-        typeFilters = Q(pk=None)  # Need something that is false for every entry
+        # Need something that is false for every entry
+        typeFilters = Q(pk=None)
 
         if params['dry-hire']:
             typeFilters = typeFilters | Q(dry_hire=True, is_rig=True)
@@ -63,19 +64,22 @@ class CalendarICS(ICalFeed):
         if params['rig']:
             typeFilters = typeFilters | Q(is_rig=True, dry_hire=False)
 
-        statusFilters = Q(pk=None)  # Need something that is false for every entry
+        # Need something that is false for every entry
+        statusFilters = Q(pk=None)
 
         if params['cancelled']:
             statusFilters = statusFilters | Q(status=models.Event.CANCELLED)
         if params['provisional']:
             statusFilters = statusFilters | Q(status=models.Event.PROVISIONAL)
         if params['confirmed']:
-            statusFilters = statusFilters | Q(status=models.Event.CONFIRMED) | Q(status=models.Event.BOOKED)
+            statusFilters = statusFilters | Q(
+                status=models.Event.CONFIRMED) | Q(
+                status=models.Event.BOOKED)
 
         filter = filter & typeFilters & statusFilters
 
-        return models.Event.objects.filter(filter).order_by('-start_date').select_related('person', 'organisation',
+        return models.Event.objects.filter(filter).order_by(
-                                                                                          'venue', 'mic')
+            '-start_date').select_related('person', 'organisation', 'venue', 'mic')
 
     def item_title(self, item):
         title = ''
@@ -102,7 +106,8 @@ class CalendarICS(ICalFeed):
         return item.earliest_time
 
     def item_end_datetime(self, item):
-        if isinstance(item.latest_time, datetime.date):  # Ical end_datetime is non-inclusive, so add a day
+        if isinstance(
+            item.latest_time, datetime.date):  # Ical end_datetime is non-inclusive, so add a day
             return item.latest_time + datetime.timedelta(days=1)
 
         return item.latest_time
@@ -120,18 +125,20 @@ class CalendarICS(ICalFeed):
         desc += 'Event = ' + item.name + '\n'
         desc += 'Venue = ' + (item.venue.name if item.venue else '---') + '\n'
         if item.is_rig and item.person:
-            desc += 'Client = ' + item.person.name + (
+            desc += 'Client = ' + item.person.name + \
-                (' for ' + item.organisation.name) if item.organisation else '') + '\n'
+                    ((' for ' + item.organisation.name)
+                     if item.organisation else '') + '\n'
         desc += 'Status = ' + str(item.get_status_display()) + '\n'
         desc += 'MIC = ' + (item.mic.name if item.mic else '---') + '\n'
 
         desc += '\n'
         if item.meet_at:
-            desc += 'Crew Meet = ' + (
+            desc += 'Crew Meet = ' + \
-                item.meet_at.astimezone(tz).strftime('%Y-%m-%d %H:%M') if item.meet_at else '---') + '\n'
+                    (item.meet_at.astimezone(tz).strftime(
+                        '%Y-%m-%d %H:%M') if item.meet_at else '---') + '\n'
         if item.access_at:
-            desc += 'Access At = ' + (
+            desc += 'Access At = ' + (item.access_at.astimezone(tz).strftime(
-                item.access_at.astimezone(tz).strftime('%Y-%m-%d %H:%M') if item.access_at else '---') + '\n'
+                '%Y-%m-%d %H:%M') if item.access_at else '---') + '\n'
         if item.start_date:
             desc += 'Event Start = ' + item.start_date.strftime('%Y-%m-%d') + (
                 (' ' + item.start_time.strftime('%H:%M')) if item.has_start_time else '') + '\n'
@@ -145,7 +152,7 @@ class CalendarICS(ICalFeed):
         # if item.notes:  // Need to add proper keyholder checks before this gets put back
         #     desc += 'Notes:\n'+item.notes+'\n\n'
 
-        base_url = "https://rigs.nottinghamtec.co.uk"
+        base_url = "http://rigs.nottinghamtec.co.uk"
         desc += 'URL = ' + base_url + str(item.get_absolute_url())
 
         return desc

RIGS/importer_tests.py

@@ -0,0 +1,28 @@
+__author__ = 'ghost'
+
+import unittest
+from importer import fix_email
+
+
+class EmailFixerTest(unittest.TestCase):
+    def test_correct(self):
+        e = fix_email("tom@ghost.uk.net")
+        self.assertEqual(e, "tom@ghost.uk.net")
+
+    def test_partial(self):
+        e = fix_email("psytp")
+        self.assertEqual(e, "psytp@nottingham.ac.uk")
+
+    def test_none(self):
+        old = None
+        new = fix_email(old)
+        self.assertEqual(old, new)
+
+    def test_empty(self):
+        old = ""
+        new = fix_email(old)
+        self.assertEqual(old, new)
+
+
+if __name__ == '__main__':
+    unittest.main()

RIGS/management/commands/generateSampleData.py

@@ -1,11 +1,321 @@
+import datetime
+import random
+
+import reversion
+from django.contrib.auth.models import Group, Permission
 from django.core.management.base import BaseCommand, CommandError
-from django.core.management import call_command
+from django.db import transaction
+
+from RIGS import models
 
 
 class Command(BaseCommand):
     help = 'Adds sample data to use for testing'
     can_import_settings = True
 
+    people = []
+    organisations = []
+    venues = []
+    profiles = []
+
+    keyholder_group = None
+    finance_group = None
+
     def handle(self, *args, **options):
-        call_command('generateSampleRIGSData')
+        from django.conf import settings
-        call_command('generateSampleAssetsData')
+
+        if not (settings.DEBUG or settings.STAGING):
+            raise CommandError('You cannot run this command in production')
+
+        random.seed(
+            'Some object to seed the random number generator')  # otherwise it is done by time, which could lead to inconsistant tests
+
+        with transaction.atomic():
+            models.VatRate.objects.create(start_at='2014-03-05', rate=0.20, comment='test1')
+
+            self.setupGenericProfiles()
+
+            self.setupPeople()
+            self.setupOrganisations()
+            self.setupVenues()
+
+            self.setupGroups()
+
+            self.setupEvents()
+
+            self.setupUsefulProfiles()
+
+    def setupPeople(self):
+        names = ["Regulus Black", "Sirius Black", "Lavender Brown", "Cho Chang", "Vincent Crabbe", "Vincent Crabbe",
+                 "Bartemius Crouch", "Fleur Delacour", "Cedric Diggory", "Alberforth Dumbledore", "Albus Dumbledore",
+                 "Dudley Dursley", "Petunia Dursley", "Vernon Dursley", "Argus Filch", "Seamus Finnigan",
+                 "Nicolas Flamel", "Cornelius Fudge", "Goyle", "Gregory Goyle", "Hermione Granger", "Rubeus Hagrid",
+                 "Igor Karkaroff", "Viktor Krum", "Bellatrix Lestrange", "Alice Longbottom", "Frank Longbottom",
+                 "Neville Longbottom", "Luna Lovegood", "Xenophilius Lovegood", "Remus Lupin", "Draco Malfoy",
+                 "Lucius Malfoy", "Narcissa Malfoy", "Olympe Maxime", "Minerva McGonagall", "Mad-Eye Moody",
+                 "Peter Pettigrew", "Harry Potter", "James Potter", "Lily Potter", "Quirinus Quirrell", "Tom Riddle",
+                 "Mary Riddle", "Lord Voldemort", "Rita Skeeter", "Severus Snape", "Nymphadora Tonks",
+                 "Dolores Janes Umbridge", "Arthur Weasley", "Bill Weasley", "Charlie Weasley", "Fred Weasley",
+                 "George Weasley", "Ginny Weasley", "Molly Weasley", "Percy Weasley", "Ron Weasley", "Dobby", "Fluffy",
+                 "Hedwig", "Moaning Myrtle", "Aragog", "Grawp"]
+        for i, name in enumerate(names):
+            with reversion.create_revision():
+                reversion.set_user(random.choice(self.profiles))
+
+                newPerson = models.Person.objects.create(name=name)
+                if i % 3 == 0:
+                    newPerson.email = "address@person.com"
+
+                if i % 5 == 0:
+                    newPerson.notes = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua"
+
+                if i % 7 == 0:
+                    newPerson.address = "1 Person Test Street \n Demoton \n United States of TEC \n RMRF 567"
+
+                if i % 9 == 0:
+                    newPerson.phone = "01234 567894"
+
+                newPerson.save()
+                self.people.append(newPerson)
+
+    def setupOrganisations(self):
+        names = ["Acme, inc.", "Widget Corp", "123 Warehousing", "Demo Company", "Smith and Co.", "Foo Bars",
+                 "ABC Telecom", "Fake Brothers", "QWERTY Logistics", "Demo, inc.", "Sample Company", "Sample, inc",
+                 "Acme Corp", "Allied Biscuit", "Ankh-Sto Associates", "Extensive Enterprise", "Galaxy Corp",
+                 "Globo-Chem", "Mr. Sparkle", "Globex Corporation", "LexCorp", "LuthorCorp",
+                 "North Central Positronics", "Omni Consimer Products", "Praxis Corporation", "Sombra Corporation",
+                 "Sto Plains Holdings", "Tessier-Ashpool", "Wayne Enterprises", "Wentworth Industries", "ZiffCorp",
+                 "Bluth Company", "Strickland Propane", "Thatherton Fuels", "Three Waters", "Water and Power",
+                 "Western Gas & Electric", "Mammoth Pictures", "Mooby Corp", "Gringotts", "Thrift Bank",
+                 "Flowers By Irene", "The Legitimate Businessmens Club", "Osato Chemicals", "Transworld Consortium",
+                 "Universal Export", "United Fried Chicken", "Virtucon", "Kumatsu Motors", "Keedsler Motors",
+                 "Powell Motors", "Industrial Automation", "Sirius Cybernetics Corporation",
+                 "U.S. Robotics and Mechanical Men", "Colonial Movers", "Corellian Engineering Corporation",
+                 "Incom Corporation", "General Products", "Leeding Engines Ltd.", "Blammo", "Input, Inc.",
+                 "Mainway Toys", "Videlectrix", "Zevo Toys", "Ajax", "Axis Chemical Co.", "Barrytron", "Carrys Candles",
+                 "Cogswell Cogs", "Spacely Sprockets", "General Forge and Foundry", "Duff Brewing Company",
+                 "Dunder Mifflin", "General Services Corporation", "Monarch Playing Card Co.", "Krustyco", "Initech",
+                 "Roboto Industries", "Primatech", "Sonky Rubber Goods", "St. Anky Beer", "Stay Puft Corporation",
+                 "Vandelay Industries", "Wernham Hogg", "Gadgetron", "Burleigh and Stronginthearm", "BLAND Corporation",
+                 "Nordyne Defense Dynamics", "Petrox Oil Company", "Roxxon", "McMahon and Tate", "Sixty Second Avenue",
+                 "Charles Townsend Agency", "Spade and Archer", "Megadodo Publications", "Rouster and Sideways",
+                 "C.H. Lavatory and Sons", "Globo Gym American Corp", "The New Firm", "SpringShield",
+                 "Compuglobalhypermeganet", "Data Systems", "Gizmonic Institute", "Initrode",
+                 "Taggart Transcontinental", "Atlantic Northern", "Niagular", "Plow King", "Big Kahuna Burger",
+                 "Big T Burgers and Fries", "Chez Quis", "Chotchkies", "The Frying Dutchman", "Klimpys",
+                 "The Krusty Krab", "Monks Diner", "Milliways", "Minuteman Cafe", "Taco Grande", "Tip Top Cafe",
+                 "Moes Tavern", "Central Perk", "Chasers"]
+        for i, name in enumerate(names):
+            with reversion.create_revision():
+                reversion.set_user(random.choice(self.profiles))
+                newOrganisation = models.Organisation.objects.create(name=name)
+                if i % 2 == 0:
+                    newOrganisation.has_su_account = True
+
+                if i % 3 == 0:
+                    newOrganisation.email = "address@organisation.com"
+
+                if i % 5 == 0:
+                    newOrganisation.notes = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua"
+
+                if i % 7 == 0:
+                    newOrganisation.address = "1 Organisation Test Street \n Demoton \n United States of TEC \n RMRF 567"
+
+                if i % 9 == 0:
+                    newOrganisation.phone = "01234 567894"
+
+                newOrganisation.save()
+                self.organisations.append(newOrganisation)
+
+    def setupVenues(self):
+        names = ["Bear Island", "Crossroads Inn", "Deepwood Motte", "The Dreadfort", "The Eyrie", "Greywater Watch",
+                 "The Iron Islands", "Karhold", "Moat Cailin", "Oldstones", "Raventree Hall", "Riverlands",
+                 "The Ruby Ford", "Saltpans", "Seagard", "Torrhen's Square", "The Trident", "The Twins",
+                 "The Vale of Arryn", "The Whispering Wood", "White Harbor", "Winterfell", "The Arbor", "Ashemark",
+                 "Brightwater Keep", "Casterly Rock", "Clegane's Keep", "Dragonstone", "Dorne", "God's Eye",
+                 "The Golden Tooth", "Harrenhal", "Highgarden", "Horn Hill", "Fingers", "King's Landing", "Lannisport",
+                 "Oldtown", "Rainswood", "Storm's End", "Summerhall", "Sunspear", "Tarth", "Castle Black",
+                 "Craster's Keep", "Fist of the First Men", "The Frostfangs", "The Gift", "The Skirling Pass",
+                 "The Wall", "Asshai", "Astapor", "Braavos", "The Dothraki Sea", "Lys", "Meereen", "Myr", "Norvos",
+                 "Pentos", "Qarth", "Qohor", "The Red Waste", "Tyrosh", "Vaes Dothrak", "Valyria",
+                 "Village of the Lhazareen", "Volantis", "Yunkai"]
+        for i, name in enumerate(names):
+            with reversion.create_revision():
+                reversion.set_user(random.choice(self.profiles))
+                newVenue = models.Venue.objects.create(name=name)
+                if i % 2 == 0:
+                    newVenue.three_phase_available = True
+
+                if i % 3 == 0:
+                    newVenue.email = "address@venue.com"
+
+                if i % 5 == 0:
+                    newVenue.notes = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua"
+
+                if i % 7 == 0:
+                    newVenue.address = "1 Venue Test Street \n Demoton \n United States of TEC \n RMRF 567"
+
+                if i % 9 == 0:
+                    newVenue.phone = "01234 567894"
+
+                newVenue.save()
+                self.venues.append(newVenue)
+
+    def setupGroups(self):
+        self.keyholder_group = Group.objects.create(name='Keyholders')
+        self.finance_group = Group.objects.create(name='Finance')
+
+        keyholderPerms = ["add_event", "change_event", "view_event", "add_eventitem", "change_eventitem",
+                          "delete_eventitem", "add_organisation", "change_organisation", "view_organisation",
+                          "add_person", "change_person", "view_person", "view_profile", "add_venue", "change_venue",
+                          "view_venue"]
+        financePerms = ["change_event", "view_event", "add_eventitem", "change_eventitem", "add_invoice",
+                        "change_invoice", "view_invoice", "add_organisation", "change_organisation",
+                        "view_organisation", "add_payment", "change_payment", "delete_payment", "add_person",
+                        "change_person", "view_person"]
+
+        for permId in keyholderPerms:
+            self.keyholder_group.permissions.add(Permission.objects.get(codename=permId))
+
+        for permId in financePerms:
+            self.finance_group.permissions.add(Permission.objects.get(codename=permId))
+
+    def setupGenericProfiles(self):
+        names = ["Clara Oswin Oswald", "Rory Williams", "Amy Pond", "River Song", "Martha Jones", "Donna Noble",
+                 "Jack Harkness", "Mickey Smith", "Rose Tyler"]
+        for i, name in enumerate(names):
+            newProfile = models.Profile.objects.create(username=name.replace(" ", ""), first_name=name.split(" ")[0],
+                                                       last_name=name.split(" ")[-1],
+                                                       email=name.replace(" ", "") + "@example.com",
+                                                       initials="".join([j[0].upper() for j in name.split()]))
+            if i % 2 == 0:
+                newProfile.phone = "01234 567894"
+
+            newProfile.save()
+            self.profiles.append(newProfile)
+
+    def setupUsefulProfiles(self):
+        superUser = models.Profile.objects.create(username="superuser", first_name="Super", last_name="User",
+                                                  initials="SU",
+                                                  email="superuser@example.com", is_superuser=True, is_active=True,
+                                                  is_staff=True)
+        superUser.set_password('superuser')
+        superUser.save()
+
+        financeUser = models.Profile.objects.create(username="finance", first_name="Finance", last_name="User",
+                                                    initials="FU",
+                                                    email="financeuser@example.com", is_active=True)
+        financeUser.groups.add(self.finance_group)
+        financeUser.groups.add(self.keyholder_group)
+        financeUser.set_password('finance')
+        financeUser.save()
+
+        keyholderUser = models.Profile.objects.create(username="keyholder", first_name="Keyholder", last_name="User",
+                                                      initials="KU",
+                                                      email="keyholderuser@example.com", is_active=True)
+        keyholderUser.groups.add(self.keyholder_group)
+        keyholderUser.set_password('keyholder')
+        keyholderUser.save()
+
+        basicUser = models.Profile.objects.create(username="basic", first_name="Basic", last_name="User", initials="BU",
+                                                  email="basicuser@example.com", is_active=True)
+        basicUser.set_password('basic')
+        basicUser.save()
+
+    def setupEvents(self):
+        names = ["Outdoor Concert", "Hall Open Mic Night", "Festival", "Weekend Event", "Magic Show", "Society Ball",
+                 "Evening Show", "Talent Show", "Acoustic Evening", "Hire of Things", "SU Event", "End of Term Show",
+                 "Theatre Show", "Outdoor Fun Day", "Summer Carnival", "Open Days", "Magic Show", "Awards Ceremony",
+                 "Debating Event", "Club Night", "DJ Evening", "Building Projection", "Choir Concert"]
+        descriptions = ["A brief desciption of the event", "This event is boring", "Probably wont happen",
+                        "Warning: this has lots of kit"]
+        notes = ["The client came into the office at some point", "Who knows if this will happen",
+                 "Probably should check this event", "Maybe not happening", "Run away!"]
+
+        itemOptions = [
+            {'name': 'Speakers', 'description': 'Some really really big speakers \n these are very loud', 'quantity': 2,
+             'cost': 200.00},
+            {'name': 'Projector',
+             'description': 'Some kind of video thinamejig, probably with unnecessary processing for free',
+             'quantity': 1, 'cost': 500.00},
+            {'name': 'Lighting Desk', 'description': 'Cannot provide guarentee that it will work', 'quantity': 1,
+             'cost': 200.52},
+            {'name': 'Moving lights', 'description': 'Flashy lights, with the copper', 'quantity': 8, 'cost': 50.00},
+            {'name': 'Microphones', 'description': 'Make loud noise \n you will want speakers with this', 'quantity': 5,
+             'cost': 0.50},
+            {'name': 'Sound Mixer Thing', 'description': 'Might be analogue, might be digital', 'quantity': 1,
+             'cost': 100.00},
+            {'name': 'Electricity', 'description': 'You need this', 'quantity': 1, 'cost': 200.00},
+            {'name': 'Crew', 'description': 'Costs nothing, because reasons', 'quantity': 1, 'cost': 0.00},
+            {'name': 'Loyalty Discount', 'description': 'Have some negative moneys', 'quantity': 1, 'cost': -50.00}]
+
+        dayDelta = -120  # start adding events from 4 months ago
+
+        for i in range(150):  # Let's add 100 events
+            with reversion.create_revision():
+                reversion.set_user(random.choice(self.profiles))
+
+                name = names[i % len(names)]
+
+                startDate = datetime.date.today() + datetime.timedelta(days=dayDelta)
+                dayDelta = dayDelta + random.randint(0, 3)
+
+                newEvent = models.Event.objects.create(name=name, start_date=startDate)
+
+                if random.randint(0, 2) > 1:  # 1 in 3 have a start time
+                    newEvent.start_time = datetime.time(random.randint(15, 20))
+                    if random.randint(0, 2) > 1:  # of those, 1 in 3 have an end time on the same day
+                        newEvent.end_time = datetime.time(random.randint(21, 23))
+                    elif random.randint(0, 1) > 0:  # half of the others finish early the next day
+                        newEvent.end_date = newEvent.start_date + datetime.timedelta(days=1)
+                        newEvent.end_time = datetime.time(random.randint(0, 5))
+                elif random.randint(0, 2) > 1:  # 1 in 3 of the others finish a few days ahead
+                    newEvent.end_date = newEvent.start_date + datetime.timedelta(days=random.randint(1, 4))
+
+                if random.randint(0, 6) > 0:  # 5 in 6 have MIC
+                    newEvent.mic = random.choice(self.profiles)
+
+                if random.randint(0, 6) > 0:  # 5 in 6 have organisation
+                    newEvent.organisation = random.choice(self.organisations)
+
+                if random.randint(0, 6) > 0:  # 5 in 6 have person
+                    newEvent.person = random.choice(self.people)
+
+                if random.randint(0, 6) > 0:  # 5 in 6 have venue
+                    newEvent.venue = random.choice(self.venues)
+
+                # Could have any status, equally weighted
+                newEvent.status = random.choice(
+                    [models.Event.BOOKED, models.Event.CONFIRMED, models.Event.PROVISIONAL, models.Event.CANCELLED])
+
+                newEvent.dry_hire = (random.randint(0, 7) == 0)  # 1 in 7 are dry hire
+
+                if random.randint(0, 1) > 0:  # 1 in 2 have description
+                    newEvent.description = random.choice(descriptions)
+
+                if random.randint(0, 1) > 0:  # 1 in 2 have notes
+                    newEvent.notes = random.choice(notes)
+
+                newEvent.save()
+
+                # Now add some items
+                for j in range(random.randint(1, 5)):
+                    itemData = itemOptions[random.randint(0, len(itemOptions) - 1)]
+                    newItem = models.EventItem.objects.create(event=newEvent, order=j, **itemData)
+                    newItem.save()
+
+                while newEvent.sum_total < 0:
+                    itemData = itemOptions[random.randint(0, len(itemOptions) - 1)]
+                    newItem = models.EventItem.objects.create(event=newEvent, order=j, **itemData)
+                    newItem.save()
+
+            with reversion.create_revision():
+                reversion.set_user(random.choice(self.profiles))
+                if newEvent.start_date < datetime.date.today():  # think about adding an invoice
+                    if random.randint(0, 2) > 0:  # 2 in 3 have had paperwork sent to treasury
+                        newInvoice = models.Invoice.objects.create(event=newEvent)
+                        if newEvent.status is models.Event.CANCELLED:  # void cancelled events
+                            newInvoice.void = True
+                        elif random.randint(0, 2) > 1:  # 1 in 3 have been paid
+                            models.Payment.objects.create(invoice=newInvoice, amount=newInvoice.balance,
+                                                          date=datetime.date.today())

RIGS/management/commands/generateSampleRIGSData.py

@@ -1,345 +0,0 @@
-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 RIGS import models
-
-
-class Command(BaseCommand):
-    help = 'Adds sample data to use for testing'
-    can_import_settings = True
-
-    people = []
-    organisations = []
-    venues = []
-    profiles = []
-
-    keyholder_group = None
-    finance_group = None
-    hs_group = None
-
-    def handle(self, *args, **options):
-        from django.conf import settings
-
-        if not (settings.DEBUG or settings.STAGING):
-            raise CommandError('You cannot run this command in production')
-
-        random.seed(
-            'Some object to seed the random number generator')  # otherwise it is done by time, which could lead to inconsistant tests
-
-        with transaction.atomic():
-            models.VatRate.objects.create(start_at='2014-03-05', rate=0.20, comment='test1')
-
-            self.setupGenericProfiles()
-
-            self.setupPeople()
-            self.setupOrganisations()
-            self.setupVenues()
-
-            self.setupGroups()
-
-            self.setupEvents()
-
-            self.setupUsefulProfiles()
-
-    def setupPeople(self):
-        names = ["Regulus Black", "Sirius Black", "Lavender Brown", "Cho Chang", "Vincent Crabbe", "Vincent Crabbe",
-                 "Bartemius Crouch", "Fleur Delacour", "Cedric Diggory", "Alberforth Dumbledore", "Albus Dumbledore",
-                 "Dudley Dursley", "Petunia Dursley", "Vernon Dursley", "Argus Filch", "Seamus Finnigan",
-                 "Nicolas Flamel", "Cornelius Fudge", "Goyle", "Gregory Goyle", "Hermione Granger", "Rubeus Hagrid",
-                 "Igor Karkaroff", "Viktor Krum", "Bellatrix Lestrange", "Alice Longbottom", "Frank Longbottom",
-                 "Neville Longbottom", "Luna Lovegood", "Xenophilius Lovegood",  # noqa
-                 "Remus Lupin", "Draco Malfoy", "Lucius Malfoy", "Narcissa Malfoy", "Olympe Maxime",
-                 "Minerva McGonagall", "Mad-Eye Moody", "Peter Pettigrew", "Harry Potter", "James Potter",
-                 "Lily Potter", "Quirinus Quirrell", "Tom Riddle", "Mary Riddle", "Lord Voldemort", "Rita Skeeter",
-                 "Severus Snape", "Nymphadora Tonks", "Dolores Janes Umbridge", "Arthur Weasley", "Bill Weasley",
-                 "Charlie Weasley", "Fred Weasley", "George Weasley", "Ginny Weasley", "Molly Weasley", "Percy Weasley",
-                 "Ron Weasley", "Dobby", "Fluffy", "Hedwig", "Moaning Myrtle", "Aragog", "Grawp"]  # noqa
-        for i, name in enumerate(names):
-            with reversion.create_revision():
-                reversion.set_user(random.choice(self.profiles))
-
-                newPerson = models.Person.objects.create(name=name)
-                if i % 3 == 0:
-                    newPerson.email = "address@person.com"
-
-                if i % 5 == 0:
-                    newPerson.notes = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua"
-
-                if i % 7 == 0:
-                    newPerson.address = "1 Person Test Street \n Demoton \n United States of TEC \n RMRF 567"
-
-                if i % 9 == 0:
-                    newPerson.phone = "01234 567894"
-
-                newPerson.save()
-                self.people.append(newPerson)
-
-    def setupOrganisations(self):
-        names = ["Acme, inc.", "Widget Corp", "123 Warehousing", "Demo Company", "Smith and Co.", "Foo Bars",
-                 "ABC Telecom", "Fake Brothers", "QWERTY Logistics", "Demo, inc.", "Sample Company", "Sample, inc",
-                 "Acme Corp", "Allied Biscuit", "Ankh-Sto Associates", "Extensive Enterprise", "Galaxy Corp",
-                 "Globo-Chem", "Mr. Sparkle", "Globex Corporation", "LexCorp", "LuthorCorp",
-                 "North Central Positronics", "Omni Consimer Products", "Praxis Corporation", "Sombra Corporation",
-                 "Sto Plains Holdings", "Tessier-Ashpool", "Wayne Enterprises", "Wentworth Industries", "ZiffCorp",
-                 "Bluth Company", "Strickland Propane", "Thatherton Fuels", "Three Waters", "Water and Power",
-                 "Western Gas & Electric", "Mammoth Pictures", "Mooby Corp", "Gringotts", "Thrift Bank",
-                 "Flowers By Irene", "The Legitimate Businessmens Club", "Osato Chemicals", "Transworld Consortium",
-                 "Universal Export", "United Fried Chicken", "Virtucon", "Kumatsu Motors", "Keedsler Motors",
-                 "Powell Motors", "Industrial Automation", "Sirius Cybernetics Corporation",
-                 "U.S. Robotics and Mechanical Men", "Colonial Movers", "Corellian Engineering Corporation",
-                 "Incom Corporation", "General Products", "Leeding Engines Ltd.", "Blammo",  # noqa
-                 "Input, Inc.", "Mainway Toys", "Videlectrix", "Zevo Toys", "Ajax", "Axis Chemical Co.", "Barrytron",
-                 "Carrys Candles", "Cogswell Cogs", "Spacely Sprockets", "General Forge and Foundry",
-                 "Duff Brewing Company", "Dunder Mifflin", "General Services Corporation", "Monarch Playing Card Co.",
-                 "Krustyco", "Initech", "Roboto Industries", "Primatech", "Sonky Rubber Goods", "St. Anky Beer",
-                 "Stay Puft Corporation", "Vandelay Industries", "Wernham Hogg", "Gadgetron",
-                 "Burleigh and Stronginthearm", "BLAND Corporation", "Nordyne Defense Dynamics", "Petrox Oil Company",
-                 "Roxxon", "McMahon and Tate", "Sixty Second Avenue", "Charles Townsend Agency", "Spade and Archer",
-                 "Megadodo Publications", "Rouster and Sideways", "C.H. Lavatory and Sons", "Globo Gym American Corp",
-                 "The New Firm", "SpringShield", "Compuglobalhypermeganet", "Data Systems", "Gizmonic Institute",
-                 "Initrode", "Taggart Transcontinental", "Atlantic Northern", "Niagular", "Plow King",
-                 "Big Kahuna Burger", "Big T Burgers and Fries", "Chez Quis", "Chotchkies", "The Frying Dutchman",
-                 "Klimpys", "The Krusty Krab", "Monks Diner", "Milliways", "Minuteman Cafe", "Taco Grande",
-                 "Tip Top Cafe", "Moes Tavern", "Central Perk", "Chasers"]  # noqa
-        for i, name in enumerate(names):
-            with reversion.create_revision():
-                reversion.set_user(random.choice(self.profiles))
-                newOrganisation = models.Organisation.objects.create(name=name)
-                if i % 2 == 0:
-                    newOrganisation.has_su_account = True
-
-                if i % 3 == 0:
-                    newOrganisation.email = "address@organisation.com"
-
-                if i % 5 == 0:
-                    newOrganisation.notes = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua"
-
-                if i % 7 == 0:
-                    newOrganisation.address = "1 Organisation Test Street \n Demoton \n United States of TEC \n RMRF 567"
-
-                if i % 9 == 0:
-                    newOrganisation.phone = "01234 567894"
-
-                newOrganisation.save()
-                self.organisations.append(newOrganisation)
-
-    def setupVenues(self):
-        names = ["Bear Island", "Crossroads Inn", "Deepwood Motte", "The Dreadfort", "The Eyrie", "Greywater Watch",
-                 "The Iron Islands", "Karhold", "Moat Cailin", "Oldstones", "Raventree Hall", "Riverlands",
-                 "The Ruby Ford", "Saltpans", "Seagard", "Torrhen's Square", "The Trident", "The Twins",
-                 "The Vale of Arryn", "The Whispering Wood", "White Harbor", "Winterfell", "The Arbor", "Ashemark",
-                 "Brightwater Keep", "Casterly Rock", "Clegane's Keep", "Dragonstone", "Dorne", "God's Eye",
-                 "The Golden Tooth",  # noqa
-                 "Harrenhal", "Highgarden", "Horn Hill", "Fingers", "King's Landing", "Lannisport", "Oldtown",
-                 "Rainswood", "Storm's End", "Summerhall", "Sunspear", "Tarth", "Castle Black", "Craster's Keep",
-                 "Fist of the First Men", "The Frostfangs", "The Gift", "The Skirling Pass", "The Wall", "Asshai",
-                 "Astapor", "Braavos", "The Dothraki Sea", "Lys", "Meereen", "Myr", "Norvos", "Pentos", "Qarth",
-                 "Qohor", "The Red Waste", "Tyrosh", "Vaes Dothrak", "Valyria", "Village of the Lhazareen", "Volantis",
-                 "Yunkai"]  # noqa
-        for i, name in enumerate(names):
-            with reversion.create_revision():
-                reversion.set_user(random.choice(self.profiles))
-                newVenue = models.Venue.objects.create(name=name)
-                if i % 2 == 0:
-                    newVenue.three_phase_available = True
-
-                if i % 3 == 0:
-                    newVenue.email = "address@venue.com"
-
-                if i % 5 == 0:
-                    newVenue.notes = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua"
-
-                if i % 7 == 0:
-                    newVenue.address = "1 Venue Test Street \n Demoton \n United States of TEC \n RMRF 567"
-
-                if i % 9 == 0:
-                    newVenue.phone = "01234 567894"
-
-                newVenue.save()
-                self.venues.append(newVenue)
-
-    def setupGroups(self):
-        self.keyholder_group = Group.objects.create(name='Keyholders')
-        self.finance_group = Group.objects.create(name='Finance')
-        self.hs_group = Group.objects.create(name='H&S')
-
-        keyholderPerms = ["add_event", "change_event", "view_event",
-                          "add_eventitem", "change_eventitem", "delete_eventitem",
-                          "add_organisation", "change_organisation", "view_organisation",
-                          "add_person", "change_person", "view_person", "view_profile",
-                          "add_venue", "change_venue", "view_venue",
-                          "add_asset", "change_asset", "delete_asset",
-                          "view_asset", "view_supplier", "change_supplier", "asset_finance",
-                          "add_supplier", "view_cabletype", "change_cabletype",
-                          "add_cabletype", "view_eventchecklist", "change_eventchecklist",
-                          "add_eventchecklist", "view_riskassessment", "change_riskassessment",
-                          "add_riskassessment", "add_eventchecklistcrew", "change_eventchecklistcrew",
-                          "delete_eventchecklistcrew", "view_eventchecklistcrew", "add_eventchecklistvehicle",
-                          "change_eventchecklistvehicle",
-                          "delete_eventchecklistvehicle", "view_eventchecklistvehicle", ]
-        financePerms = keyholderPerms + ["add_invoice", "change_invoice", "view_invoice",
-                                         "add_payment", "change_payment", "delete_payment"]
-        hsPerms = keyholderPerms + ["review_riskassessment", "review_eventchecklist"]
-
-        for permId in keyholderPerms:
-            self.keyholder_group.permissions.add(Permission.objects.get(codename=permId))
-
-        for permId in financePerms:
-            self.finance_group.permissions.add(Permission.objects.get(codename=permId))
-
-        for permId in hsPerms:
-            self.hs_group.permissions.add(Permission.objects.get(codename=permId))
-
-    def setupGenericProfiles(self):
-        names = ["Clara Oswin Oswald", "Rory Williams", "Amy Pond", "River Song", "Martha Jones", "Donna Noble",
-                 "Jack Harkness", "Mickey Smith", "Rose Tyler"]
-        for i, name in enumerate(names):
-            newProfile = models.Profile.objects.create(username=name.replace(" ", ""), first_name=name.split(" ")[0],
-                                                       last_name=name.split(" ")[-1],
-                                                       email=name.replace(" ", "") + "@example.com",
-                                                       initials="".join([j[0].upper() for j in name.split()]))
-            if i % 2 == 0:
-                newProfile.phone = "01234 567894"
-
-            newProfile.save()
-            self.profiles.append(newProfile)
-
-    def setupUsefulProfiles(self):
-        superUser = models.Profile.objects.create(username="superuser", first_name="Super", last_name="User",
-                                                  initials="SU",
-                                                  email="superuser@example.com", is_superuser=True, is_active=True,
-                                                  is_staff=True)
-        superUser.set_password('superuser')
-        superUser.save()
-
-        financeUser = models.Profile.objects.create(username="finance", first_name="Finance", last_name="User",
-                                                    initials="FU",
-                                                    email="financeuser@example.com", is_active=True, is_approved=True)
-        financeUser.groups.add(self.finance_group)
-        financeUser.groups.add(self.keyholder_group)
-        financeUser.set_password('finance')
-        financeUser.save()
-
-        hsUser = models.Profile.objects.create(username="hs", first_name="HS", last_name="User",
-                                               initials="HSU",
-                                               email="hsuser@example.com", is_active=True, is_approved=True)
-        hsUser.groups.add(self.hs_group)
-        hsUser.groups.add(self.keyholder_group)
-        hsUser.set_password('hs')
-        hsUser.save()
-
-        keyholderUser = models.Profile.objects.create(username="keyholder", first_name="Keyholder", last_name="User",
-                                                      initials="KU",
-                                                      email="keyholderuser@example.com", is_active=True, is_approved=True)
-        keyholderUser.groups.add(self.keyholder_group)
-        keyholderUser.set_password('keyholder')
-        keyholderUser.save()
-
-        basicUser = models.Profile.objects.create(username="basic", first_name="Basic", last_name="User", initials="BU",
-                                                  email="basicuser@example.com", is_active=True, is_approved=True)
-        basicUser.set_password('basic')
-        basicUser.save()
-
-    def setupEvents(self):
-        names = ["Outdoor Concert", "Hall Open Mic Night", "Festival", "Weekend Event", "Magic Show", "Society Ball",
-                 "Evening Show", "Talent Show", "Acoustic Evening", "Hire of Things", "SU Event",
-                 "End of Term Show", "Theatre Show", "Outdoor Fun Day", "Summer Carnival", "Open Days", "Magic Show",
-                 "Awards Ceremony", "Debating Event", "Club Night", "DJ Evening", "Building Projection",
-                 "Choir Concert"]
-        descriptions = ["A brief description of the event", "This event is boring", "Probably wont happen",
-                        "Warning: this has lots of kit"]
-        notes = ["The client came into the office at some point", "Who knows if this will happen",
-                 "Probably should check this event", "Maybe not happening", "Run away!"]
-
-        itemOptions = [
-            {'name': 'Speakers', 'description': 'Some really really big speakers \n these are very loud', 'quantity': 2,
-             'cost': 200.00},
-            {'name': 'Projector',
-             'description': 'Some kind of video thinamejig, probably with unnecessary processing for free',
-             'quantity': 1, 'cost': 500.00},
-            {'name': 'Lighting Desk', 'description': 'Cannot provide guarentee that it will work', 'quantity': 1,
-             'cost': 200.52},
-            {'name': 'Moving lights', 'description': 'Flashy lights, with the copper', 'quantity': 8, 'cost': 50.00},
-            {'name': 'Microphones', 'description': 'Make loud noise \n you will want speakers with this', 'quantity': 5,
-             'cost': 0.50},
-            {'name': 'Sound Mixer Thing', 'description': 'Might be analogue, might be digital', 'quantity': 1,
-             'cost': 100.00},
-            {'name': 'Electricity', 'description': 'You need this', 'quantity': 1, 'cost': 200.00},
-            {'name': 'Crew', 'description': 'Costs nothing, because reasons', 'quantity': 1, 'cost': 0.00},
-            {'name': 'Loyalty Discount', 'description': 'Have some negative moneys', 'quantity': 1, 'cost': -50.00}]
-
-        dayDelta = -120  # start adding events from 4 months ago
-
-        for i in range(150):  # Let's add 100 events
-            with reversion.create_revision():
-                reversion.set_user(random.choice(self.profiles))
-
-                name = names[i % len(names)]
-
-                startDate = datetime.date.today() + datetime.timedelta(days=dayDelta)
-                dayDelta = dayDelta + random.randint(0, 3)
-
-                newEvent = models.Event.objects.create(name=name, start_date=startDate)
-
-                if random.randint(0, 2) > 1:  # 1 in 3 have a start time
-                    newEvent.start_time = datetime.time(random.randint(15, 20))
-                    if random.randint(0, 2) > 1:  # of those, 1 in 3 have an end time on the same day
-                        newEvent.end_time = datetime.time(random.randint(21, 23))
-                    elif random.randint(0, 1) > 0:  # half of the others finish early the next day
-                        newEvent.end_date = newEvent.start_date + datetime.timedelta(days=1)
-                        newEvent.end_time = datetime.time(random.randint(0, 5))
-                elif random.randint(0, 2) > 1:  # 1 in 3 of the others finish a few days ahead
-                    newEvent.end_date = newEvent.start_date + datetime.timedelta(days=random.randint(1, 4))
-
-                if random.randint(0, 6) > 0:  # 5 in 6 have MIC
-                    newEvent.mic = random.choice(self.profiles)
-
-                if random.randint(0, 6) > 0:  # 5 in 6 have organisation
-                    newEvent.organisation = random.choice(self.organisations)
-
-                if random.randint(0, 6) > 0:  # 5 in 6 have person
-                    newEvent.person = random.choice(self.people)
-
-                if random.randint(0, 6) > 0:  # 5 in 6 have venue
-                    newEvent.venue = random.choice(self.venues)
-
-                # Could have any status, equally weighted
-                newEvent.status = random.choice(
-                    [models.Event.BOOKED, models.Event.CONFIRMED, models.Event.PROVISIONAL, models.Event.CANCELLED])
-
-                newEvent.dry_hire = (random.randint(0, 7) == 0)  # 1 in 7 are dry hire
-
-                if random.randint(0, 1) > 0:  # 1 in 2 have description
-                    newEvent.description = random.choice(descriptions)
-
-                if random.randint(0, 1) > 0:  # 1 in 2 have notes
-                    newEvent.notes = random.choice(notes)
-
-                newEvent.save()
-
-                # Now add some items
-                for j in range(random.randint(1, 5)):
-                    itemData = itemOptions[random.randint(0, len(itemOptions) - 1)]
-                    newItem = models.EventItem.objects.create(event=newEvent, order=j, **itemData)
-                    newItem.save()
-
-                while newEvent.sum_total < 0:
-                    itemData = itemOptions[random.randint(0, len(itemOptions) - 1)]
-                    newItem = models.EventItem.objects.create(event=newEvent, order=j, **itemData)
-                    newItem.save()
-
-            with reversion.create_revision():
-                reversion.set_user(random.choice(self.profiles))
-                if newEvent.start_date < datetime.date.today():  # think about adding an invoice
-                    if random.randint(0, 2) > 0:  # 2 in 3 have had paperwork sent to treasury
-                        newInvoice = models.Invoice.objects.create(event=newEvent)
-                        if newEvent.status is models.Event.CANCELLED:  # void cancelled events
-                            newInvoice.void = True
-                        elif random.randint(0, 2) > 1:  # 1 in 3 have been paid
-                            models.Payment.objects.create(invoice=newInvoice, amount=newInvoice.balance,
-                                                          date=datetime.date.today())

RIGS/migrations/0001_initial.py

@@ -1,13 +1,12 @@
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 
-
-from django.db import models, migrations
 import django.core.validators
 import django.utils.timezone
+from django.db import models, migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('auth', '0001_initial'),
     ]
@@ -19,18 +18,32 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(auto_created=True, verbose_name='ID', serialize=False, primary_key=True)),
                 ('password', models.CharField(max_length=128, verbose_name='password')),
                 ('last_login', models.DateTimeField(default=django.utils.timezone.now, verbose_name='last login')),
-                ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')),
+                ('is_superuser', models.BooleanField(default=False,
-                ('username', models.CharField(max_length=30, unique=True, help_text='Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only.', verbose_name='username', validators=[django.core.validators.RegexValidator('^[\\w.@+-]+$', 'Enter a valid username.', 'invalid')])),
+                                                     help_text='Designates that this user has all permissions without explicitly assigning them.',
+                                                     verbose_name='superuser status')),
+                ('username', models.CharField(max_length=30, unique=True,
+                                              help_text='Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only.',
+                                              verbose_name='username', validators=[
+                        django.core.validators.RegexValidator('^[\\w.@+-]+$', 'Enter a valid username.', 'invalid')])),
                 ('first_name', models.CharField(max_length=30, blank=True, verbose_name='first name')),
                 ('last_name', models.CharField(max_length=30, blank=True, verbose_name='last name')),
                 ('email', models.EmailField(max_length=75, blank=True, verbose_name='email address')),
-                ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')),
+                ('is_staff', models.BooleanField(default=False,
-                ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')),
+                                                 help_text='Designates whether the user can log into this admin site.',
+                                                 verbose_name='staff status')),
+                ('is_active', models.BooleanField(default=True,
+                                                  help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.',
+                                                  verbose_name='active')),
                 ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')),
                 ('initials', models.CharField(max_length=5, unique=True)),
                 ('phone', models.CharField(max_length=13, blank=True, null=True)),
-                ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of his/her group.', verbose_name='groups', related_name='user_set', related_query_name='user', to='auth.Group')),
+                ('groups', models.ManyToManyField(blank=True,
-                ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', verbose_name='user permissions', related_name='user_set', related_query_name='user', to='auth.Permission')),
+                                                  help_text='The groups this user belongs to. A user will get all permissions granted to each of his/her group.',
+                                                  verbose_name='groups', related_name='user_set',
+                                                  related_query_name='user', to='auth.Group')),
+                ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.',
+                                                            verbose_name='user permissions', related_name='user_set',
+                                                            related_query_name='user', to='auth.Permission')),
             ],
             options={
                 'verbose_name_plural': 'users',

RIGS/migrations/0002_modelcomment_person.py

@@ -1,12 +1,11 @@
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 
-
-from django.db import models, migrations
 from django.conf import settings
+from django.db import models, migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('RIGS', '0001_initial'),
     ]
@@ -18,7 +17,7 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('postedAt', models.DateTimeField(auto_now=True)),
                 ('message', models.TextField()),
-                ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
+                ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
             ],
             options={
             },

RIGS/migrations/0003_auto_20141031_0219.py

@@ -1,11 +1,10 @@
 # -*- coding: utf-8 -*-
-
+from __future__ import unicode_literals
 
 from django.db import models, migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('RIGS', '0002_modelcomment_person'),
     ]

RIGS/migrations/0004_organisation.py

@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
-
+from __future__ import unicode_literals
 
 from django.db import models, migrations
+
 import RIGS.models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('RIGS', '0003_auto_20141031_0219'),
     ]

RIGS/migrations/0005_auto_20141104_1619.py

@@ -1,11 +1,10 @@
 # -*- coding: utf-8 -*-
-
+from __future__ import unicode_literals
 
 from django.db import models, migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('RIGS', '0004_organisation'),
     ]

RIGS/migrations/0006_auto_20141105_1553.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-
+from __future__ import unicode_literals
 
 from django.db import models, migrations
 

RIGS/migrations/0007_vatrate.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-
+from __future__ import unicode_literals
 
 from django.db import models, migrations
 import RIGS.models

RIGS/migrations/0008_auto_20141105_1908.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-
+from __future__ import unicode_literals
 
 from django.db import models, migrations
 from django.conf import settings
@@ -33,11 +33,11 @@ class Migration(migrations.Migration):
                 ('payment_method', models.CharField(blank=True, null=True, max_length=255)),
                 ('payment_received', models.CharField(blank=True, null=True, max_length=255)),
                 ('purchase_order', models.CharField(blank=True, null=True, max_length=255)),
-                ('based_on', models.ForeignKey(to='RIGS.Event', related_name='future_events', on_delete=models.CASCADE)),
+                ('based_on', models.ForeignKey(to='RIGS.Event', related_name='future_events')),
-                ('checked_in_by', models.ForeignKey(to=settings.AUTH_USER_MODEL, related_name='event_checked_in', on_delete=models.CASCADE)),
+                ('checked_in_by', models.ForeignKey(to=settings.AUTH_USER_MODEL, related_name='event_checked_in')),
-                ('mic', models.ForeignKey(to=settings.AUTH_USER_MODEL, related_name='event_mic', on_delete=models.CASCADE)),
+                ('mic', models.ForeignKey(to=settings.AUTH_USER_MODEL, related_name='event_mic')),
-                ('organisation', models.ForeignKey(to='RIGS.Organisation', on_delete=models.CASCADE)),
+                ('organisation', models.ForeignKey(to='RIGS.Organisation')),
-                ('person', models.ForeignKey(to='RIGS.Person', on_delete=models.CASCADE)),
+                ('person', models.ForeignKey(to='RIGS.Person')),
             ],
             options={
             },
@@ -52,7 +52,7 @@ class Migration(migrations.Migration):
                 ('quantity', models.IntegerField()),
                 ('cost', models.DecimalField(max_digits=10, decimal_places=2)),
                 ('order', models.IntegerField()),
-                ('event', models.ForeignKey(to='RIGS.Event', related_name='item', on_delete=models.CASCADE)),
+                ('event', models.ForeignKey(to='RIGS.Event', related_name='item')),
             ],
             options={
             },
@@ -75,7 +75,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='event',
             name='venue',
-            field=models.ForeignKey(to='RIGS.Venue', on_delete=models.CASCADE),
+            field=models.ForeignKey(to='RIGS.Venue'),
             preserve_default=True,
         ),
     ]

RIGS/migrations/0009_auto_20141105_1916.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-
+from __future__ import unicode_literals
 
 from django.db import models, migrations
 from django.conf import settings
@@ -14,26 +14,26 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='event',
             name='based_on',
-            field=models.ForeignKey(to='RIGS.Event', related_name='future_events', blank=True, null=True, on_delete=models.CASCADE),
+            field=models.ForeignKey(to='RIGS.Event', related_name='future_events', blank=True, null=True),
             preserve_default=True,
         ),
         migrations.AlterField(
             model_name='event',
             name='checked_in_by',
             field=models.ForeignKey(to=settings.AUTH_USER_MODEL, related_name='event_checked_in', blank=True,
-                                    null=True, on_delete=models.CASCADE),
+                                    null=True),
             preserve_default=True,
         ),
         migrations.AlterField(
             model_name='event',
             name='mic',
-            field=models.ForeignKey(to=settings.AUTH_USER_MODEL, related_name='event_mic', blank=True, null=True, on_delete=models.CASCADE),
+            field=models.ForeignKey(to=settings.AUTH_USER_MODEL, related_name='event_mic', blank=True, null=True),
             preserve_default=True,
         ),
         migrations.AlterField(
             model_name='event',
             name='organisation',
-            field=models.ForeignKey(to='RIGS.Organisation', blank=True, null=True, on_delete=models.CASCADE),
+            field=models.ForeignKey(to='RIGS.Organisation', blank=True, null=True),
             preserve_default=True,
         ),
         migrations.AlterField(

RIGS/migrations/0010_auto_20141105_2219.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-
+from __future__ import unicode_literals
 
 from django.db import models, migrations
 from django.conf import settings
@@ -19,8 +19,8 @@ class Migration(migrations.Migration):
                 ('run', models.BooleanField(default=False)),
                 ('derig', models.BooleanField(default=False)),
                 ('notes', models.TextField(blank=True, null=True)),
-                ('event', models.ForeignKey(related_name='crew', to='RIGS.Event', on_delete=models.CASCADE)),
+                ('event', models.ForeignKey(related_name='crew', to='RIGS.Event')),
-                ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
+                ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
             ],
             options={
             },
@@ -35,7 +35,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='eventitem',
             name='event',
-            field=models.ForeignKey(related_name='items', to='RIGS.Event', on_delete=models.CASCADE),
+            field=models.ForeignKey(related_name='items', to='RIGS.Event'),
             preserve_default=True,
         ),
     ]

RIGS/migrations/0011_venue_address.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-
+from __future__ import unicode_literals
 
 from django.db import models, migrations
 

RIGS/migrations/0012_auto_20141106_0253.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-
+from __future__ import unicode_literals
 
 from django.db import models, migrations
 

RIGS/migrations/0013_auto_20141202_0041.py

@@ -1,11 +1,10 @@
 # -*- coding: utf-8 -*-
-
+from __future__ import unicode_literals
 
 from django.db import models, migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('RIGS', '0012_auto_20141106_0253'),
     ]
@@ -14,7 +13,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='event',
             name='person',
-            field=models.ForeignKey(blank=True, null=True, to='RIGS.Person', on_delete=models.CASCADE),
+            field=models.ForeignKey(blank=True, null=True, to='RIGS.Person'),
             preserve_default=True,
         ),
     ]

RIGS/migrations/0014_auto_20141208_0220.py

@@ -1,11 +1,10 @@
 # -*- coding: utf-8 -*-
-
+from __future__ import unicode_literals
 
 from django.db import models, migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('RIGS', '0013_auto_20141202_0041'),
     ]
@@ -14,13 +13,13 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='event',
             name='venue',
-            field=models.ForeignKey(blank=True, to='RIGS.Venue', null=True, on_delete=models.CASCADE),
+            field=models.ForeignKey(blank=True, to='RIGS.Venue', null=True),
             preserve_default=True,
         ),
         migrations.AlterField(
             model_name='eventitem',
             name='event',
-            field=models.ForeignKey(related_name='items', blank=True, to='RIGS.Event', on_delete=models.CASCADE),
+            field=models.ForeignKey(related_name='items', blank=True, to='RIGS.Event'),
             preserve_default=True,
         ),
     ]

RIGS/migrations/0015_auto_20141208_0233.py

@@ -1,11 +1,10 @@
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 
-
+from django.db import migrations
-from django.db import models, migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('RIGS', '0014_auto_20141208_0220'),
     ]

RIGS/migrations/0016_auto_20150127_1905.py

@@ -1,12 +1,11 @@
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 
-
-from django.db import models, migrations
 from django.conf import settings
+from django.db import models, migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('RIGS', '0015_auto_20141208_0233'),
     ]
@@ -18,7 +17,7 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('invoice_date', models.DateField(auto_now_add=True)),
                 ('void', models.BooleanField()),
-                ('event', models.OneToOneField(to='RIGS.Event', on_delete=models.CASCADE)),
+                ('event', models.OneToOneField(to='RIGS.Event')),
             ],
             options={
             },
@@ -30,8 +29,10 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('date', models.DateField()),
                 ('amount', models.DecimalField(help_text=b'Please use ex. VAT', max_digits=10, decimal_places=2)),
-                ('method', models.CharField(max_length=2, choices=[(b'C', b'Cash'), (b'I', b'Internal'), (b'E', b'External'), (b'SU', b'SU Core'), (b'M', b'Members')])),
+                ('method', models.CharField(max_length=2,
-                ('invoice', models.ForeignKey(to='RIGS.Invoice', on_delete=models.CASCADE)),
+                                            choices=[(b'C', b'Cash'), (b'I', b'Internal'), (b'E', b'External'),
+                                                     (b'SU', b'SU Core'), (b'M', b'Members')])),
+                ('invoice', models.ForeignKey(to='RIGS.Invoice')),
             ],
             options={
             },
@@ -40,7 +41,8 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='event',
             name='mic',
-            field=models.ForeignKey(related_name='event_mic', verbose_name=b'MIC', blank=True, to=settings.AUTH_USER_MODEL, null=True, on_delete=models.CASCADE),
+            field=models.ForeignKey(related_name='event_mic', verbose_name=b'MIC', blank=True,
+                                    to=settings.AUTH_USER_MODEL, null=True),
             preserve_default=True,
         ),
     ]

RIGS/migrations/0017_auto_20150129_2041.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-
+from __future__ import unicode_literals
 
 from django.db import models, migrations
 

RIGS/migrations/0018_auto_20150130_0016.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-
+from __future__ import unicode_literals
 
 from django.db import models, migrations
 

RIGS/migrations/0019_auto_20150131_1919.py

@@ -1,11 +1,10 @@
 # -*- coding: utf-8 -*-
-
+from __future__ import unicode_literals
 
 from django.db import models, migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('RIGS', '0018_auto_20150130_0016'),
     ]
@@ -14,7 +13,9 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='payment',
             name='method',
-            field=models.CharField(blank=True, max_length=2, null=True, choices=[(b'C', b'Cash'), (b'I', b'Internal'), (b'E', b'External'), (b'SU', b'SU Core')]),
+            field=models.CharField(blank=True, max_length=2, null=True,
+                                   choices=[(b'C', b'Cash'), (b'I', b'Internal'), (b'E', b'External'),
+                                            (b'SU', b'SU Core')]),
             preserve_default=True,
         ),
     ]

RIGS/migrations/0020_auto_20150303_0243.py

@@ -1,11 +1,10 @@
 # -*- coding: utf-8 -*-
-
+from __future__ import unicode_literals
 
 from django.db import models, migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('RIGS', '0019_auto_20150131_1919'),
     ]
@@ -14,7 +13,9 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='payment',
             name='method',
-            field=models.CharField(blank=True, max_length=2, null=True, choices=[(b'C', b'Cash'), (b'I', b'Internal'), (b'E', b'External'), (b'SU', b'SU Core'), (b'T', b'TEC Adjustment')]),
+            field=models.CharField(blank=True, max_length=2, null=True,
+                                   choices=[(b'C', b'Cash'), (b'I', b'Internal'), (b'E', b'External'),
+                                            (b'SU', b'SU Core'), (b'T', b'TEC Adjustment')]),
             preserve_default=True,
         ),
     ]

RIGS/migrations/0021_auto_20150420_1155.py

@@ -1,11 +1,10 @@
 # -*- coding: utf-8 -*-
-
+from __future__ import unicode_literals
 
 from django.db import models, migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('RIGS', '0020_auto_20150303_0243'),
     ]

RIGS/migrations/0022_auto_20150424_2104.py

@@ -1,11 +1,10 @@
 # -*- coding: utf-8 -*-
-
+from __future__ import unicode_literals
 
 from django.db import models, migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('RIGS', '0021_auto_20150420_1155'),
     ]

RIGS/migrations/0023_auto_20150529_0048.py

@@ -1,13 +1,12 @@
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 
-
-from django.db import models, migrations
-import django.core.validators
 import django.contrib.auth.models
+import django.core.validators
+from django.db import models, migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('RIGS', '0022_auto_20150424_2104'),
     ]
@@ -46,7 +45,10 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='profile',
             name='groups',
-            field=models.ManyToManyField(related_query_name='user', related_name='user_set', to='auth.Group', blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', verbose_name='groups'),
+            field=models.ManyToManyField(related_query_name='user', related_name='user_set', to='auth.Group',
+                                         blank=True,
+                                         help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.',
+                                         verbose_name='groups'),
         ),
         migrations.AlterField(
             model_name='profile',
@@ -56,7 +58,12 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='profile',
             name='username',
-            field=models.CharField(error_messages={'unique': 'A user with that username already exists.'}, max_length=30, validators=[django.core.validators.RegexValidator('^[\\w.@+-]+$', 'Enter a valid username. This value may contain only letters, numbers and @/./+/-/_ characters.', 'invalid')], help_text='Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only.', unique=True, verbose_name='username'),
+            field=models.CharField(error_messages={'unique': 'A user with that username already exists.'},
+                                   max_length=30, validators=[django.core.validators.RegexValidator('^[\\w.@+-]+$',
+                                                                                                    'Enter a valid username. This value may contain only letters, numbers and @/./+/-/_ characters.',
+                                                                                                    'invalid')],
+                                   help_text='Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only.',
+                                   unique=True, verbose_name='username'),
         ),
         migrations.AlterField(
             model_name='venue',

RIGS/migrations/0024_auto_20160229_2042.py

@@ -1,12 +1,11 @@
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 
-
-from django.db import models, migrations
 import django.db.models.deletion
+from django.db import models, migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('RIGS', '0023_auto_20150529_0048'),
     ]
@@ -15,6 +14,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='event',
             name='based_on',
-            field=models.ForeignKey(related_name='future_events', on_delete=django.db.models.deletion.SET_NULL, blank=True, to='RIGS.Event', null=True),
+            field=models.ForeignKey(related_name='future_events', on_delete=django.db.models.deletion.SET_NULL,
+                                    blank=True, to='RIGS.Event', null=True),
         ),
     ]

RIGS/migrations/0025_auto_20160331_1302.py

@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.4 on 2016-03-31 12:02
-
-
-import django.core.validators
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('RIGS', '0024_auto_20160229_2042'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='profile',
-            name='username',
-            field=models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=30, unique=True, validators=[django.core.validators.RegexValidator('^[\\w.@+-]+$', 'Enter a valid username. This value may contain only letters, numbers and @/./+/-/_ characters.')], verbose_name='username'),
-        ),
-        migrations.AlterField(
-            model_name='vatrate',
-            name='start_at',
-            field=models.DateField(),
-        ),
-    ]

RIGS/migrations/0025_eventauthorisation.py

@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-
-
-from django.db import models, migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('RIGS', '0024_auto_20160229_2042'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='EventAuthorisation',
-            fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('email', models.EmailField(max_length=254)),
-                ('name', models.CharField(max_length=255)),
-                ('uni_id', models.CharField(max_length=10, null=True, verbose_name=b'University ID', blank=True)),
-                ('account_code', models.CharField(max_length=50, null=True, blank=True)),
-                ('amount', models.DecimalField(verbose_name=b'authorisation amount', max_digits=10, decimal_places=2)),
-                ('created_at', models.DateTimeField(auto_now_add=True)),
-                ('event', models.ForeignKey(related_name='authroisations', to='RIGS.Event', on_delete=models.CASCADE)),
-            ],
-        ),
-    ]

RIGS/migrations/0026_auto_20170510_1846.py

@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.1 on 2017-05-10 17:46
-
-
-import django.contrib.auth.validators
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('RIGS', '0025_auto_20160331_1302'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='profile',
-            name='username',
-            field=models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.ASCIIUsernameValidator()], verbose_name='username'),
-        ),
-    ]

RIGS/migrations/0026_remove_eventauthorisation_created_at.py

@@ -1,18 +0,0 @@
-# -*- coding: utf-8 -*-
-
-
-from django.db import models, migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('RIGS', '0025_eventauthorisation'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='eventauthorisation',
-            name='created_at',
-        ),
-    ]

RIGS/migrations/0027_eventauthorisation_event_singular.py

@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-
-
-from django.db import models, migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('RIGS', '0026_remove_eventauthorisation_created_at'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='eventauthorisation',
-            name='event',
-            field=models.OneToOneField(related_name='authorisation', to='RIGS.Event', on_delete=models.CASCADE),
-        ),
-    ]

RIGS/migrations/0029_eventauthorisation_sent_by.py

@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-
-
-from django.db import models, migrations
-from django.conf import settings
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('RIGS', '0027_eventauthorisation_event_singular'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='eventauthorisation',
-            name='sent_by',
-            field=models.ForeignKey(default=1, to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE),
-            preserve_default=False,
-        ),
-    ]

RIGS/migrations/0030_auth_request_sending.py

@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-
-
-from django.db import models, migrations
-from django.conf import settings
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('RIGS', '0029_eventauthorisation_sent_by'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='event',
-            name='auth_request_at',
-            field=models.DateTimeField(null=True, blank=True),
-        ),
-        migrations.AddField(
-            model_name='event',
-            name='auth_request_by',
-            field=models.ForeignKey(blank=True, to=settings.AUTH_USER_MODEL, null=True, on_delete=models.CASCADE),
-        ),
-        migrations.AddField(
-            model_name='event',
-            name='auth_request_to',
-            field=models.EmailField(max_length=254, null=True, blank=True),
-        ),
-    ]

RIGS/migrations/0031_merge_20170512_2102.py

@@ -1,16 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.1 on 2017-05-12 20:02
-
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('RIGS', '0030_auth_request_sending'),
-        ('RIGS', '0026_auto_20170510_1846'),
-    ]
-
-    operations = [
-    ]

RIGS/migrations/0032_auto_20170904_2355.py

@@ -1,69 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.4 on 2017-09-04 22:55
-from __future__ import unicode_literals
-
-from django.conf import settings
-import django.contrib.auth.validators
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('reversion', '0001_squashed_0004_auto_20160611_1202'),
-        ('RIGS', '0031_merge_20170512_2102'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='RIGSVersion',
-            fields=[
-            ],
-            options={
-                'indexes': [],
-                'proxy': True,
-            },
-            bases=('reversion.version',),
-        ),
-        migrations.AlterField(
-            model_name='event',
-            name='collector',
-            field=models.CharField(blank=True, max_length=255, null=True, verbose_name='collected by'),
-        ),
-        migrations.AlterField(
-            model_name='event',
-            name='mic',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='event_mic', to=settings.AUTH_USER_MODEL, verbose_name='MIC'),
-        ),
-        migrations.AlterField(
-            model_name='event',
-            name='purchase_order',
-            field=models.CharField(blank=True, max_length=255, null=True, verbose_name='PO'),
-        ),
-        migrations.AlterField(
-            model_name='eventauthorisation',
-            name='amount',
-            field=models.DecimalField(decimal_places=2, max_digits=10, verbose_name='authorisation amount'),
-        ),
-        migrations.AlterField(
-            model_name='eventauthorisation',
-            name='uni_id',
-            field=models.CharField(blank=True, max_length=10, null=True, verbose_name='University ID'),
-        ),
-        migrations.AlterField(
-            model_name='payment',
-            name='amount',
-            field=models.DecimalField(decimal_places=2, help_text='Please use ex. VAT', max_digits=10),
-        ),
-        migrations.AlterField(
-            model_name='payment',
-            name='method',
-            field=models.CharField(blank=True, choices=[('C', 'Cash'), ('I', 'Internal'), ('E', 'External'), ('SU', 'SU Core'), ('T', 'TEC Adjustment')], max_length=2, null=True),
-        ),
-        migrations.AlterField(
-            model_name='profile',
-            name='username',
-            field=models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username'),
-        ),
-    ]

RIGS/migrations/0033_auto_20180325_0016.py

@@ -1,18 +0,0 @@
-# Generated by Django 2.0.3 on 2018-03-25 00:16
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('RIGS', '0032_auto_20170904_2355'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='profile',
-            name='last_name',
-            field=models.CharField(blank=True, max_length=150, verbose_name='last name'),
-        ),
-    ]

RIGS/migrations/0034_event_risk_assessment_edit_url.py

@@ -1,18 +0,0 @@
-# Generated by Django 2.0.5 on 2019-07-28 21:28
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('RIGS', '0033_auto_20180325_0016'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='event',
-            name='risk_assessment_edit_url',
-            field=models.CharField(blank=True, max_length=255, null=True),
-        ),
-    ]

RIGS/migrations/0035_auto_20191124_1319.py

@@ -1,18 +0,0 @@
-# Generated by Django 2.0.13 on 2019-11-24 13:19
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('RIGS', '0034_event_risk_assessment_edit_url'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='event',
-            name='risk_assessment_edit_url',
-            field=models.CharField(blank=True, max_length=255, null=True, verbose_name='risk assessment'),
-        ),
-    ]

RIGS/migrations/0036_profile_is_approved.py

@@ -1,23 +0,0 @@
-# Generated by Django 2.0.13 on 2020-01-10 14:52
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('RIGS', '0035_auto_20191124_1319'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='profile',
-            name='is_approved',
-            field=models.BooleanField(default=False),
-        ),
-        migrations.AddField(
-            model_name='profile',
-            name='last_emailed',
-            field=models.DateTimeField(blank=True, null=True),
-        ),
-    ]

RIGS/migrations/0037_approve_legacy.py

@@ -1,19 +0,0 @@
-# Generated by Django 2.0.13 on 2020-01-11 18:29
-# This migration ensures that legacy Profiles from before approvals were implemented are automatically approved 
-from django.db import migrations
-
-def approve_legacy(apps, schema_editor):
-    Profile = apps.get_model('RIGS', 'Profile')
-    for person in Profile.objects.all():
-        person.is_approved = True
-        person.save()
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('RIGS', '0036_profile_is_approved'),
-    ]
-
-    operations = [
-        migrations.RunPython(approve_legacy)
-    ]

RIGS/migrations/0038_auto_20200306_2000.py

@@ -1,37 +0,0 @@
-# Generated by Django 2.0.13 on 2020-03-06 20:00
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('RIGS', '0037_approve_legacy'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='event',
-            options={},
-        ),
-        migrations.AlterModelOptions(
-            name='invoice',
-            options={'ordering': ['-invoice_date']},
-        ),
-        migrations.AlterModelOptions(
-            name='organisation',
-            options={},
-        ),
-        migrations.AlterModelOptions(
-            name='person',
-            options={},
-        ),
-        migrations.AlterModelOptions(
-            name='profile',
-            options={'verbose_name': 'user', 'verbose_name_plural': 'users'},
-        ),
-        migrations.AlterModelOptions(
-            name='venue',
-            options={},
-        ),
-    ]

RIGS/migrations/0039_auto_20210123_1910.py

@@ -1,190 +0,0 @@
-# Generated by Django 3.1.2 on 2021-01-23 19:10
-
-import RIGS.models
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('RIGS', '0038_auto_20200306_2000'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='EventChecklist',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('date', models.DateField()),
-                ('safe_parking', models.BooleanField(blank=True, help_text='Vehicles parked safely?<br><small>(does not obstruct venue access)</small>', null=True)),
-                ('safe_packing', models.BooleanField(blank=True, help_text='Equipment packed away safely?<br><small>(including flightcases)</small>', null=True)),
-                ('exits', models.BooleanField(blank=True, help_text='Emergency exits clear?', null=True)),
-                ('trip_hazard', models.BooleanField(blank=True, help_text='Appropriate barriers around kit and cabling secured?', null=True)),
-                ('warning_signs', models.BooleanField(blank=True, help_text='Warning signs in place?<br><small>(strobe, smoke, power etc.)</small>')),
-                ('ear_plugs', models.BooleanField(blank=True, help_text='Ear plugs issued to crew where needed?', null=True)),
-                ('hs_location', models.CharField(blank=True, help_text='Location of Safety Bag/Box', max_length=255, null=True)),
-                ('extinguishers_location', models.CharField(blank=True, help_text='Location of fire extinguishers', max_length=255, null=True)),
-                ('rcds', models.BooleanField(blank=True, help_text='RCDs installed where needed and tested?', null=True)),
-                ('supply_test', models.BooleanField(blank=True, help_text='Electrical supplies tested?<br><small>(using socket tester)</small>', null=True)),
-                ('earthing', models.BooleanField(blank=True, help_text='Equipment appropriately earthed?<br><small>(truss, stage, generators etc)</small>', null=True)),
-                ('pat', models.BooleanField(blank=True, help_text='All equipment in PAT period?', null=True)),
-                ('source_rcd', models.BooleanField(blank=True, help_text='Source RCD protected?<br><small>(if cable is more than 3m long) </small>', null=True)),
-                ('labelling', models.BooleanField(blank=True, help_text='Appropriate and clear labelling on distribution and cabling?', null=True)),
-                ('fd_voltage_l1', models.IntegerField(blank=True, help_text='L1 - N', null=True, verbose_name='First Distro Voltage L1-N')),
-                ('fd_voltage_l2', models.IntegerField(blank=True, help_text='L2 - N', null=True, verbose_name='First Distro Voltage L2-N')),
-                ('fd_voltage_l3', models.IntegerField(blank=True, help_text='L3 - N', null=True, verbose_name='First Distro Voltage L3-N')),
-                ('fd_phase_rotation', models.BooleanField(blank=True, help_text='Phase Rotation<br><small>(if required)</small>', null=True, verbose_name='Phase Rotation')),
-                ('fd_earth_fault', models.IntegerField(blank=True, help_text='Earth Fault Loop Impedance (Z<small>S</small>)', null=True, verbose_name='Earth Fault Loop Impedance')),
-                ('fd_pssc', models.IntegerField(blank=True, help_text='Prospective Short Circuit Current', null=True, verbose_name='PSCC')),
-                ('w1_description', models.CharField(blank=True, help_text='Description', max_length=255, null=True)),
-                ('w1_polarity', models.BooleanField(blank=True, help_text='Polarity Checked?', null=True)),
-                ('w1_voltage', models.IntegerField(blank=True, help_text='Voltage', null=True)),
-                ('w1_earth_fault', models.IntegerField(blank=True, help_text='Earth Fault Loop Impedance (Z<small>S</small>)', null=True)),
-                ('w2_description', models.CharField(blank=True, help_text='Description', max_length=255, null=True)),
-                ('w2_polarity', models.BooleanField(blank=True, help_text='Polarity Checked?', null=True)),
-                ('w2_voltage', models.IntegerField(blank=True, help_text='Voltage', null=True)),
-                ('w2_earth_fault', models.IntegerField(blank=True, help_text='Earth Fault Loop Impedance (Z<small>S</small>)', null=True)),
-                ('w3_description', models.CharField(blank=True, help_text='Description', max_length=255, null=True)),
-                ('w3_polarity', models.BooleanField(blank=True, help_text='Polarity Checked?', null=True)),
-                ('w3_voltage', models.IntegerField(blank=True, help_text='Voltage', null=True)),
-                ('w3_earth_fault', models.IntegerField(blank=True, help_text='Earth Fault Loop Impedance (Z<small>S</small>)', null=True)),
-                ('all_rcds_tested', models.BooleanField(blank=True, help_text='All circuit RCDs tested?<br><small>(using test button)</small>', null=True)),
-                ('public_sockets_tested', models.BooleanField(blank=True, help_text='Public/Performer accessible circuits tested?<br><small>(using socket tester)</small>', null=True)),
-                ('reviewed_at', models.DateTimeField(null=True)),
-            ],
-            options={
-                'ordering': ['event'],
-                'permissions': [('review_eventchecklist', 'Can review Event Checklists')],
-            },
-            bases=(models.Model, RIGS.models.RevisionMixin),
-        ),
-        migrations.CreateModel(
-            name='EventChecklistCrew',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('role', models.CharField(max_length=255)),
-                ('start', models.DateTimeField()),
-                ('end', models.DateTimeField()),
-                ('checklist', models.ForeignKey(blank=True, on_delete=django.db.models.deletion.CASCADE, related_name='crew', to='RIGS.eventchecklist')),
-            ],
-            bases=(models.Model, RIGS.models.RevisionMixin),
-        ),
-        migrations.CreateModel(
-            name='EventChecklistVehicle',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('vehicle', models.CharField(max_length=255)),
-                ('checklist', models.ForeignKey(blank=True, on_delete=django.db.models.deletion.CASCADE, related_name='vehicles', to='RIGS.eventchecklist')),
-            ],
-            bases=(models.Model, RIGS.models.RevisionMixin),
-        ),
-        migrations.CreateModel(
-            name='RiskAssessment',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('nonstandard_equipment', models.BooleanField(help_text="Does the event require any hired in equipment or use of equipment that is not covered by <a href='https://nottinghamtec.sharepoint.com/:f:/g/HealthAndSafety/Eo4xED_DrqFFsfYIjKzMZIIB6Gm_ZfR-a8l84RnzxtBjrA?e=Bf0Haw'>TEC's standard risk assessments and method statements?</a>")),
-                ('nonstandard_use', models.BooleanField(help_text='Are TEC using their equipment in a way that is abnormal?<br><small>i.e. Not covered by TECs standard health and safety documentation</small>')),
-                ('contractors', models.BooleanField(help_text='Are you using any external contractors?<br><small>i.e. Freelancers/Crewing Companies</small>')),
-                ('other_companies', models.BooleanField(help_text='Are TEC working with any other companies on site?<br><small>e.g. TEC is providing the lighting while another company does sound</small>')),
-                ('crew_fatigue', models.BooleanField(help_text='Is crew fatigue likely to be a risk at any point during this event?')),
-                ('general_notes', models.TextField(blank=True, help_text='Did you have to consult a supervisor about any of the above? If so who did you consult and what was the outcome?', null=True)),
-                ('big_power', models.BooleanField(help_text='Does the event require larger power supplies than 13A or 16A single phase wall sockets, or draw more than 20A total current?')),
-                ('outside', models.BooleanField(help_text='Is the event outdoors?')),
-                ('generators', models.BooleanField(help_text='Will generators be used?')),
-                ('other_companies_power', models.BooleanField(help_text='Will TEC be supplying power to any other companies?')),
-                ('nonstandard_equipment_power', models.BooleanField(help_text='Does the power plan require the use of any power equipment (distros, dimmers, motor controllers, etc.) that does not belong to TEC?')),
-                ('multiple_electrical_environments', models.BooleanField(help_text='Will the electrical installation occupy more than one electrical environment?')),
-                ('power_notes', models.TextField(blank=True, help_text='Did you have to consult a supervisor about any of the above? If so who did you consult and what was the outcome?', null=True)),
-                ('power_plan', models.URLField(blank=True, help_text="Upload your power plan to the <a href='https://nottinghamtec.sharepoint.com/'>Sharepoint</a> and submit a link", null=True, validators=[RIGS.models.validate_url])),
-                ('noise_monitoring', models.BooleanField(help_text='Does the event require noise monitoring or any non-standard procedures in order to comply with health and safety legislation or site rules?')),
-                ('sound_notes', models.TextField(blank=True, help_text='Did you have to consult a supervisor about any of the above? If so who did you consult and what was the outcome?', null=True)),
-                ('known_venue', models.BooleanField(help_text='Is this venue new to you (the MIC) or new to TEC?')),
-                ('safe_loading', models.BooleanField(help_text='Are there any issues preventing a safe load in or out? (e.g. sufficient lighting, flat, not in a crowded area etc.)')),
-                ('safe_storage', models.BooleanField(help_text='Are there any problems with safe and secure equipment storage?')),
-                ('area_outside_of_control', models.BooleanField(help_text="Is any part of the work area out of TEC's direct control or openly accessible during the build or breakdown period?")),
-                ('barrier_required', models.BooleanField(help_text='Is there a requirement for TEC to provide any barrier for security or protection of persons/equipment?')),
-                ('nonstandard_emergency_procedure', models.BooleanField(help_text="Does the emergency procedure for the event differ from TEC's standard procedures?")),
-                ('special_structures', models.BooleanField(help_text='Does the event require use of winch stands, motors, MPT Towers, or staging?')),
-                ('suspended_structures', models.BooleanField(help_text="Are any structures (excluding projector screens and IWBs) being suspended from TEC's structures?")),
-                ('persons_responsible_structures', models.TextField(blank=True, help_text='Who are the persons on site responsible for their use?', null=True)),
-                ('rigging_plan', models.URLField(blank=True, help_text="Upload your rigging plan to the <a href='https://nottinghamtec.sharepoint.com/'>Sharepoint</a> and submit a link", null=True, validators=[RIGS.models.validate_url])),
-                ('reviewed_at', models.DateTimeField(null=True)),
-                ('supervisor_consulted', models.BooleanField(null=True)),
-            ],
-            options={
-                'ordering': ['event'],
-                'permissions': [('review_riskassessment', 'Can review Risk Assessments')],
-            },
-            bases=(models.Model, RIGS.models.RevisionMixin),
-        ),
-        migrations.RemoveField(
-            model_name='eventcrew',
-            name='event',
-        ),
-        migrations.RemoveField(
-            model_name='eventcrew',
-            name='user',
-        ),
-        migrations.DeleteModel(
-            name='RIGSVersion',
-        ),
-        migrations.RemoveField(
-            model_name='event',
-            name='risk_assessment_edit_url',
-        ),
-        migrations.AlterField(
-            model_name='profile',
-            name='first_name',
-            field=models.CharField(blank=True, max_length=150, verbose_name='first name'),
-        ),
-        migrations.DeleteModel(
-            name='EventCrew',
-        ),
-        migrations.AddField(
-            model_name='riskassessment',
-            name='event',
-            field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='RIGS.event'),
-        ),
-        migrations.AddField(
-            model_name='riskassessment',
-            name='power_mic',
-            field=models.ForeignKey(blank=True, help_text='Who is the Power MIC? (if yes to the above question, this person <em>must</em> be a Power Technician or Power Supervisor)', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='power_mic', to=settings.AUTH_USER_MODEL, verbose_name='Power MIC'),
-        ),
-        migrations.AddField(
-            model_name='riskassessment',
-            name='reviewed_by',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Reviewer'),
-        ),
-        migrations.AddField(
-            model_name='eventchecklistvehicle',
-            name='driver',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='vehicles', to=settings.AUTH_USER_MODEL),
-        ),
-        migrations.AddField(
-            model_name='eventchecklistcrew',
-            name='crewmember',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='crewed', to=settings.AUTH_USER_MODEL),
-        ),
-        migrations.AddField(
-            model_name='eventchecklist',
-            name='event',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='checklists', to='RIGS.event'),
-        ),
-        migrations.AddField(
-            model_name='eventchecklist',
-            name='power_mic',
-            field=models.ForeignKey(blank=True, help_text='Who is the Power MIC?', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='checklists', to=settings.AUTH_USER_MODEL, verbose_name='Power MIC'),
-        ),
-        migrations.AddField(
-            model_name='eventchecklist',
-            name='reviewed_by',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Reviewer'),
-        ),
-        migrations.AddField(
-            model_name='eventchecklist',
-            name='venue',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='RIGS.venue'),
-        ),
-    ]

RIGS/models.py

@@ -1,34 +1,35 @@
 import datetime
 import hashlib
-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.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
+import string
 from collections import Counter
 from decimal import Decimal
 
+import pytz
+import reversion
+from django.conf import settings
+from django.contrib.auth.models import AbstractUser
 from django.core.exceptions import ValidationError
-from django.urls import reverse_lazy
+from django.core.urlresolvers import reverse_lazy
-
+from django.db import models
-from urllib.parse import urlparse
+from django.utils.encoding import python_2_unicode_compatible
+from django.utils.functional import cached_property
 
 
+# Create your models here.
+@python_2_unicode_compatible
 class Profile(AbstractUser):
-    initials = models.CharField(max_length=5, unique=True, null=True, blank=False)
+    initials = models.CharField(
+        max_length=5,
+        unique=True,
+        null=True,
+        blank=False)
     phone = models.CharField(max_length=13, null=True, blank=True)
-    api_key = models.CharField(max_length=40, blank=True, editable=False, null=True)
+    api_key = models.CharField(
-    is_approved = models.BooleanField(default=False)
+        max_length=40,
-    last_emailed = models.DateTimeField(blank=True,
+        blank=True,
-                                        null=True)  # Currently only populated by the admin approval email. TODO: Populate it each time we send any email, might need that...
+        editable=False,
+        null=True)
 
     @classmethod
     def make_api_key(cls):
@@ -41,8 +42,8 @@ class Profile(AbstractUser):
     def profile_picture(self):
         url = ""
         if settings.USE_GRAVATAR or settings.USE_GRAVATAR is None:
-            url = "https://www.gravatar.com/avatar/" + hashlib.md5(
+            url = "https://www.gravatar.com/avatar/" + \
-                self.email.encode('utf-8')).hexdigest() + "?d=wavatar&s=500"
+                  hashlib.md5(self.email).hexdigest() + "?d=wavatar&s=500"
         return url
 
     @property
@@ -54,55 +55,49 @@ class Profile(AbstractUser):
 
     @property
     def latest_events(self):
-        return self.event_mic.order_by('-start_date').select_related('person', 'organisation', 'venue', 'mic')
+        return self.event_mic.order_by(
-
+            '-start_date').select_related('person', 'organisation', 'venue', 'mic')
-    @classmethod
-    def admins(cls):
-        return Profile.objects.filter(email__in=[y for x in settings.ADMINS for y in x])
-
-    @classmethod
-    def users_awaiting_approval_count(cls):
-        return Profile.objects.filter(models.Q(is_approved=False)).count()
 
     def __str__(self):
         return self.name
 
-# TODO move to versioning - currently get import errors with that
+    class Meta:
+        permissions = (
+            ('view_profile', 'Can view Profile'),
+        )
 
 
 class RevisionMixin(object):
-    @property
-    def is_first_version(self):
-        versions = Version.objects.get_for_object(self)
-        return len(versions) == 1
-
-    @property
-    def current_version(self):
-        version = Version.objects.get_for_object(self).select_related('revision').first()
-        return version
-
     @property
     def last_edited_at(self):
-        version = self.current_version
+        versions = reversion.get_for_object(self)
-        if version is None:
+        if versions:
+            version = reversion.get_for_object(self)[0]
+            return version.revision.date_created
+        else:
             return None
-        return version.revision.date_created
 
     @property
     def last_edited_by(self):
-        version = self.current_version
+        versions = reversion.get_for_object(self)
-        if version is None:
+        if versions:
+            version = reversion.get_for_object(self)[0]
+            return version.revision.user
+        else:
             return None
-        return version.revision.user
 
     @property
     def current_version_id(self):
-        version = self.current_version
+        versions = reversion.get_for_object(self)
-        if version is None:
+        if versions:
+            version = reversion.get_for_object(self)[0]
+            return "V{0} | R{1}".format(version.pk, version.revision.pk)
+        else:
             return None
-        return "V{0} | R{1}".format(version.pk, version.revision.pk)
 
 
+@reversion.register
+@python_2_unicode_compatible
 class Person(models.Model, RevisionMixin):
     name = models.CharField(max_length=50)
     phone = models.CharField(max_length=15, blank=True, null=True)
@@ -122,7 +117,8 @@ class Person(models.Model, RevisionMixin):
     @property
     def organisations(self):
         o = []
-        for e in Event.objects.filter(person=self).select_related('organisation'):
+        for e in Event.objects.filter(
+            person=self).select_related('organisation'):
             if e.organisation:
                 o.append(e.organisation)
 
@@ -133,12 +129,20 @@ class Person(models.Model, RevisionMixin):
 
     @property
     def latest_events(self):
-        return self.event_set.order_by('-start_date').select_related('person', 'organisation', 'venue', 'mic')
+        return self.event_set.order_by(
+            '-start_date').select_related('person', 'organisation', 'venue', 'mic')
 
     def get_absolute_url(self):
         return reverse_lazy('person_detail', kwargs={'pk': self.pk})
 
+    class Meta:
+        permissions = (
+            ('view_person', 'Can view Persons'),
+        )
 
+
+@reversion.register
+@python_2_unicode_compatible
 class Organisation(models.Model, RevisionMixin):
     name = models.CharField(max_length=50)
     phone = models.CharField(max_length=15, blank=True, null=True)
@@ -159,7 +163,8 @@ class Organisation(models.Model, RevisionMixin):
     @property
     def persons(self):
         p = []
-        for e in Event.objects.filter(organisation=self).select_related('person'):
+        for e in Event.objects.filter(
+            organisation=self).select_related('person'):
             if e.person:
                 p.append(e.person)
 
@@ -170,15 +175,21 @@ class Organisation(models.Model, RevisionMixin):
 
     @property
     def latest_events(self):
-        return self.event_set.order_by('-start_date').select_related('person', 'organisation', 'venue', 'mic')
+        return self.event_set.order_by(
+            '-start_date').select_related('person', 'organisation', 'venue', 'mic')
 
     def get_absolute_url(self):
         return reverse_lazy('organisation_detail', kwargs={'pk': self.pk})
 
+    class Meta:
+        permissions = (
+            ('view_organisation', 'Can view Organisations'),
+        )
+
 
 class VatManager(models.Manager):
     def current_rate(self):
-        return self.find_rate(timezone.now())
+        return self.find_rate(datetime.datetime.now())
 
     def find_rate(self, date):
         # return self.filter(startAt__lte=date).latest()
@@ -191,15 +202,14 @@ class VatManager(models.Manager):
 
 
 @reversion.register
+@python_2_unicode_compatible
 class VatRate(models.Model, RevisionMixin):
-    start_at = models.DateField()
+    start_at = models.DateTimeField()
     rate = models.DecimalField(max_digits=6, decimal_places=6)
     comment = models.CharField(max_length=255)
 
     objects = VatManager()
 
-    reversion_hide = True
-
     @property
     def as_percent(self):
         return self.rate * 100
@@ -209,9 +219,12 @@ class VatRate(models.Model, RevisionMixin):
         get_latest_by = 'start_at'
 
     def __str__(self):
-        return self.comment + " " + str(self.start_at) + " @ " + str(self.as_percent) + "%"
+        return self.comment + " " + \
+               str(self.start_at) + " @ " + str(self.as_percent) + "%"
 
 
+@reversion.register
+@python_2_unicode_compatible
 class Venue(models.Model, RevisionMixin):
     name = models.CharField(max_length=255)
     phone = models.CharField(max_length=15, blank=True, null=True)
@@ -229,24 +242,33 @@ class Venue(models.Model, RevisionMixin):
 
     @property
     def latest_events(self):
-        return self.event_set.order_by('-start_date').select_related('person', 'organisation', 'venue', 'mic')
+        return self.event_set.order_by(
+            '-start_date').select_related('person', 'organisation', 'venue', 'mic')
 
     def get_absolute_url(self):
         return reverse_lazy('venue_detail', kwargs={'pk': self.pk})
 
+    class Meta:
+        permissions = (
+            ('view_venue', 'Can view Venues'),
+        )
+
 
 class EventManager(models.Manager):
     def current_events(self):
         events = self.filter(
-            (models.Q(start_date__gte=timezone.now().date(), end_date__isnull=True, dry_hire=False) & ~models.Q(
+            (models.Q(start_date__gte=datetime.date.today(), end_date__isnull=True, dry_hire=False) & ~models.Q(
                 status=Event.CANCELLED)) |  # Starts after with no end
-            (models.Q(end_date__gte=timezone.now().date(), dry_hire=False) & ~models.Q(
+            (models.Q(end_date__gte=datetime.date.today(), dry_hire=False) & ~models.Q(
                 status=Event.CANCELLED)) |  # Ends after
-            (models.Q(dry_hire=True, start_date__gte=timezone.now().date()) & ~models.Q(
+            (models.Q(dry_hire=True, start_date__gte=datetime.date.today()) & ~models.Q(
                 status=Event.CANCELLED)) |  # Active dry hire
             (models.Q(dry_hire=True, checked_in_by__isnull=True) & (
                 models.Q(status=Event.BOOKED) | models.Q(status=Event.CONFIRMED))) |  # Active dry hire GT
-            models.Q(status=Event.CANCELLED, start_date__gte=timezone.now().date())  # Canceled but not started
+            # Canceled but not started
+            models.Q(
+                status=Event.CANCELLED,
+                start_date__gte=datetime.date.today())
         ).order_by('start_date', 'end_date', 'start_time', 'end_time', 'meet_at').select_related('person',
                                                                                                  'organisation',
                                                                                                  'venue', 'mic')
@@ -254,16 +276,24 @@ class EventManager(models.Manager):
 
     def events_in_bounds(self, start, end):
         events = self.filter(
-            (models.Q(start_date__gte=start.date(), start_date__lte=end.date())) |  # Start date in bounds
+            # Start date in bounds
-            (models.Q(end_date__gte=start.date(), end_date__lte=end.date())) |  # End date in bounds
+            (models.Q(start_date__gte=start.date(), start_date__lte=end.date())) |
-            (models.Q(access_at__gte=start, access_at__lte=end)) |  # Access at in bounds
+            # End date in bounds
+            (models.Q(end_date__gte=start.date(), end_date__lte=end.date())) |
+            # Access at in bounds
+            (models.Q(access_at__gte=start, access_at__lte=end)) |
             (models.Q(meet_at__gte=start, meet_at__lte=end)) |  # Meet at in bounds
 
-            (models.Q(start_date__lte=start, end_date__gte=end)) |  # Start before, end after
+            # Start before, end after
-            (models.Q(access_at__lte=start, start_date__gte=end)) |  # Access before, start after
+            (models.Q(start_date__lte=start, end_date__gte=end)) |
-            (models.Q(access_at__lte=start, end_date__gte=end)) |  # Access before, end after
+            # Access before, start after
-            (models.Q(meet_at__lte=start, start_date__gte=end)) |  # Meet before, start after
+            (models.Q(access_at__lte=start, start_date__gte=end)) |
-            (models.Q(meet_at__lte=start, end_date__gte=end))  # Meet before, end after
+            # Access before, end after
+            (models.Q(access_at__lte=start, end_date__gte=end)) |
+            # Meet before, start after
+            (models.Q(meet_at__lte=start, start_date__gte=end)) |
+            # Meet before, end after
+            (models.Q(meet_at__lte=start, end_date__gte=end))
 
         ).order_by('start_date', 'end_date', 'start_time', 'end_time', 'meet_at').select_related('person',
                                                                                                  'organisation',
@@ -272,18 +302,21 @@ class EventManager(models.Manager):
 
     def rig_count(self):
         event_count = self.filter(
-            (models.Q(start_date__gte=timezone.now().date(), end_date__isnull=True, dry_hire=False,
+            (models.Q(start_date__gte=datetime.date.today(), end_date__isnull=True, dry_hire=False,
                       is_rig=True) & ~models.Q(
                 status=Event.CANCELLED)) |  # Starts after with no end
-            (models.Q(end_date__gte=timezone.now().date(), dry_hire=False, is_rig=True) & ~models.Q(
+            (models.Q(end_date__gte=datetime.date.today(), dry_hire=False, is_rig=True) & ~models.Q(
                 status=Event.CANCELLED)) |  # Ends after
-            (models.Q(dry_hire=True, start_date__gte=timezone.now().date(), is_rig=True) & ~models.Q(
+            (models.Q(dry_hire=True, start_date__gte=datetime.date.today(), is_rig=True) & ~models.Q(
-                status=Event.CANCELLED))  # Active dry hire
+                status=Event.CANCELLED)) |  # Active dry hire
+            (models.Q(dry_hire=True, checked_in_by__isnull=True, is_rig=True) & (
+                models.Q(status=Event.BOOKED) | models.Q(status=Event.CONFIRMED)))  # Active dry hire GT
         ).count()
         return event_count
 
 
 @reversion.register(follow=['items'])
+@python_2_unicode_compatible
 class Event(models.Model, RevisionMixin):
     # Done to make it much nicer on the database
     PROVISIONAL = 0
@@ -298,12 +331,14 @@ class Event(models.Model, RevisionMixin):
     )
 
     name = models.CharField(max_length=255)
-    person = models.ForeignKey('Person', null=True, blank=True, on_delete=models.CASCADE)
+    person = models.ForeignKey('Person', null=True, blank=True)
-    organisation = models.ForeignKey('Organisation', blank=True, null=True, on_delete=models.CASCADE)
+    organisation = models.ForeignKey('Organisation', blank=True, null=True)
-    venue = models.ForeignKey('Venue', blank=True, null=True, on_delete=models.CASCADE)
+    venue = models.ForeignKey('Venue', blank=True, null=True)
     description = models.TextField(blank=True, null=True)
     notes = models.TextField(blank=True, null=True)
-    status = models.IntegerField(choices=EVENT_STATUS_CHOICES, default=PROVISIONAL)
+    status = models.IntegerField(
+        choices=EVENT_STATUS_CHOICES,
+        default=PROVISIONAL)
     dry_hire = models.BooleanField(default=False)
     is_rig = models.BooleanField(default=True)
     based_on = models.ForeignKey('Event', on_delete=models.SET_NULL, related_name='future_events', blank=True,
@@ -319,28 +354,27 @@ class Event(models.Model, RevisionMixin):
     meet_info = models.CharField(max_length=255, blank=True, null=True)
 
     # Crew management
-    checked_in_by = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='event_checked_in', blank=True, null=True,
+    checked_in_by = models.ForeignKey(
-                                      on_delete=models.CASCADE)
+        settings.AUTH_USER_MODEL,
+        related_name='event_checked_in',
+        blank=True,
+        null=True)
     mic = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='event_mic', blank=True, null=True,
-                            verbose_name="MIC", on_delete=models.CASCADE)
+                            verbose_name="MIC")
 
     # Monies
     payment_method = models.CharField(max_length=255, blank=True, null=True)
     payment_received = models.CharField(max_length=255, blank=True, null=True)
-    purchase_order = models.CharField(max_length=255, blank=True, null=True, verbose_name='PO')
+    purchase_order = models.CharField(
-    collector = models.CharField(max_length=255, blank=True, null=True, verbose_name='collected by')
+        max_length=255,
-
+        blank=True,
-    # Authorisation request details
+        null=True,
-    auth_request_by = models.ForeignKey('Profile', null=True, blank=True, on_delete=models.CASCADE)
+        verbose_name='PO')
-    auth_request_at = models.DateTimeField(null=True, blank=True)
+    collector = models.CharField(
-    auth_request_to = models.EmailField(null=True, blank=True)
+        max_length=255,
-
+        blank=True,
-    @property
+        null=True,
-    def display_id(self):
+        verbose_name='collected by')
-        if self.is_rig:
-            return str("N%05d" % self.pk)
-        else:
-            return self.pk
 
     # Calculated values
     """
@@ -349,6 +383,17 @@ class Event(models.Model, RevisionMixin):
 
     @property
     def sum_total(self):
+        # Manual querying is required for efficiency whilst maintaining floating point arithmetic
+        # if connection.vendor == 'postgresql':
+        #    sql = "SELECT SUM(quantity * cost) AS sum_total FROM \"RIGS_eventitem\" WHERE event_id=%i" % self.id
+        # else:
+        #    sql = "SELECT id, SUM(quantity * cost) AS sum_total FROM RIGS_eventitem WHERE event_id=%i" % self.id
+        # total = self.items.raw(sql)[0]
+        # if total.sum_total:
+        #    return total.sum_total
+        # total = 0.0
+        # for item in self.items.filter(cost__gt=0).extra(select="SUM(cost * quantity) AS sum"):
+        #    total += item.sum
         total = EventItem.objects.filter(event=self).aggregate(
             sum_total=models.Sum(models.F('cost') * models.F('quantity'),
                                  output_field=models.DecimalField(max_digits=10, decimal_places=2))
@@ -363,7 +408,7 @@ class Event(models.Model, RevisionMixin):
 
     @property
     def vat(self):
-        return Decimal(self.sum_total * self.vat_rate.rate).quantize(Decimal('.01'))
+        return self.sum_total * self.vat_rate.rate
 
     """
     Inc VAT
@@ -371,7 +416,7 @@ class Event(models.Model, RevisionMixin):
 
     @property
     def total(self):
-        return Decimal(self.sum_total + self.vat).quantize(Decimal('.01'))
+        return self.sum_total + self.vat
 
     @property
     def cancelled(self):
@@ -381,10 +426,6 @@ class Event(models.Model, RevisionMixin):
     def confirmed(self):
         return (self.status == self.BOOKED or self.status == self.CONFIRMED)
 
-    @property
-    def hs_done(self):
-        return self.riskassessment is not None and len(self.checklists.all()) > 0
-
     @property
     def has_start_time(self):
         return self.start_time is not None
@@ -409,9 +450,11 @@ class Event(models.Model, RevisionMixin):
         # If there is no start time defined, pretend it's midnight
         startTimeFaked = False
         if self.has_start_time:
-            startDateTime = datetime.datetime.combine(self.start_date, self.start_time)
+            startDateTime = datetime.datetime.combine(
+                self.start_date, self.start_time)
         else:
-            startDateTime = datetime.datetime.combine(self.start_date, datetime.time(00, 00))
+            startDateTime = datetime.datetime.combine(
+                self.start_date, datetime.time(00, 00))
             startTimeFaked = True
 
         # timezoneIssues - apply the default timezone to the naiive datetime
@@ -419,7 +462,8 @@ class Event(models.Model, RevisionMixin):
         startDateTime = tz.localize(startDateTime)
         datetime_list.append(startDateTime)  # then add it to the list
 
-        earliest = min(datetime_list).astimezone(tz)  # find the earliest datetime in the list
+        # find the earliest datetime in the list
+        earliest = min(datetime_list).astimezone(tz)
 
         # if we faked it & it's the earliest, better own up
         if startTimeFaked and earliest == startDateTime:
@@ -445,61 +489,44 @@ class Event(models.Model, RevisionMixin):
         else:
             return endDate
 
-    @property
-    def internal(self):
-        return bool(self.organisation and self.organisation.union_account)
-
-    @property
-    def authorised(self):
-        if self.internal:
-            return self.authorisation.amount == self.total
-        else:
-            return bool(self.purchase_order)
-
     objects = EventManager()
 
     def get_absolute_url(self):
         return reverse_lazy('event_detail', kwargs={'pk': self.pk})
 
     def __str__(self):
-        return "{}: {}".format(self.display_id, self.name)
+        return unicode(self.pk) + ": " + self.name
 
     def clean(self):
-        errdict = {}
         if self.end_date and self.start_date > self.end_date:
-            errdict['end_date'] = ['Unless you\'ve invented time travel, the event can\'t finish before it has started.']
+            raise ValidationError(
+                'Unless you\'ve invented time travel, the event can\'t finish before it has started.')
 
         startEndSameDay = not self.end_date or self.end_date == self.start_date
         hasStartAndEnd = self.has_start_time and self.has_end_time
         if startEndSameDay and hasStartAndEnd and self.start_time > self.end_time:
-            errdict['end_time'] = ['Unless you\'ve invented time travel, the event can\'t finish before it has started.']
+            raise ValidationError(
-
+                'Unless you\'ve invented time travel, the event can\'t finish before it has started.')
-        if self.access_at is not None:
-            if self.access_at.date() > self.start_date:
-                errdict['access_at'] = ['Regardless of what some clients might think, access time cannot be after the event has started.']
-            elif self.start_time is not None and self.start_date == self.access_at.date() and self.access_at.time() > self.start_time:
-                errdict['access_at'] = ['Regardless of what some clients might think, access time cannot be after the event has started.']
-
-        if errdict != {}:  # If there was an error when validation
-            raise ValidationError(errdict)
 
     def save(self, *args, **kwargs):
         """Call :meth:`full_clean` before saving."""
         self.full_clean()
         super(Event, self).save(*args, **kwargs)
 
+    class Meta:
+        permissions = (
+            ('view_event', 'Can view Events'),
+        )
 
-@reversion.register
+
-class EventItem(models.Model, RevisionMixin):
+class EventItem(models.Model):
-    event = models.ForeignKey('Event', related_name='items', blank=True, on_delete=models.CASCADE)
+    event = models.ForeignKey('Event', related_name='items', blank=True)
     name = models.CharField(max_length=255)
     description = models.TextField(blank=True, null=True)
     quantity = models.IntegerField()
     cost = models.DecimalField(max_digits=10, decimal_places=2)
     order = models.IntegerField()
 
-    reversion_hide = True
-
     @property
     def total_cost(self):
         return self.cost * self.quantity
@@ -508,39 +535,25 @@ class EventItem(models.Model, RevisionMixin):
         ordering = ['order']
 
     def __str__(self):
-        return str(self.event.pk) + "." + str(self.order) + ": " + self.event.name + " | " + self.name
+        return str(self.event.pk) + "." + str(self.order) + \
-
+               ": " + self.event.name + " | " + self.name
-    @property
-    def activity_feed_string(self):
-        return str("item {}".format(self.name))
 
 
-@reversion.register
+class EventCrew(models.Model):
-class EventAuthorisation(models.Model, RevisionMixin):
+    event = models.ForeignKey('Event', related_name='crew')
-    event = models.OneToOneField('Event', related_name='authorisation', on_delete=models.CASCADE)
+    user = models.ForeignKey(settings.AUTH_USER_MODEL)
-    email = models.EmailField()
+    rig = models.BooleanField(default=False)
-    name = models.CharField(max_length=255)
+    run = models.BooleanField(default=False)
-    uni_id = models.CharField(max_length=10, blank=True, null=True, verbose_name="University ID")
+    derig = models.BooleanField(default=False)
-    account_code = models.CharField(max_length=50, blank=True, null=True)
+    notes = models.TextField(blank=True, null=True)
-    amount = models.DecimalField(max_digits=10, decimal_places=2, verbose_name="authorisation amount")
-    sent_by = models.ForeignKey('Profile', on_delete=models.CASCADE)
-
-    def get_absolute_url(self):
-        return reverse_lazy('event_detail', kwargs={'pk': self.event.pk})
-
-    @property
-    def activity_feed_string(self):
-        return "{} (requested by {})".format(self.event.display_id, self.sent_by.initials)
 
 
-@reversion.register(follow=['payment_set'])
+@python_2_unicode_compatible
-class Invoice(models.Model, RevisionMixin):
+class Invoice(models.Model):
-    event = models.OneToOneField('Event', on_delete=models.CASCADE)
+    event = models.OneToOneField('Event')
     invoice_date = models.DateField(auto_now_add=True)
     void = models.BooleanField(default=False)
 
-    reversion_perm = 'RIGS.view_invoice'
-
     @property
     def sum_total(self):
         return self.event.sum_total
@@ -564,26 +577,18 @@ class Invoice(models.Model, RevisionMixin):
     def is_closed(self):
         return self.balance == 0 or self.void
 
-    def get_absolute_url(self):
-        return reverse_lazy('invoice_detail', kwargs={'pk': self.pk})
-
-    @property
-    def activity_feed_string(self):
-        return "#{} for Event {}".format(self.display_id, "N%05d" % self.event.pk)
-
     def __str__(self):
         return "%i: %s (%.2f)" % (self.pk, self.event, self.balance)
 
-    @property
-    def display_id(self):
-        return "{:05d}".format(self.pk)
-
     class Meta:
+        permissions = (
+            ('view_invoice', 'Can view Invoices'),
+        )
         ordering = ['-invoice_date']
 
 
-@reversion.register
+@python_2_unicode_compatible
-class Payment(models.Model, RevisionMixin):
+class Payment(models.Model):
     CASH = 'C'
     INTERNAL = 'I'
     EXTERNAL = 'E'
@@ -597,244 +602,17 @@ class Payment(models.Model, RevisionMixin):
         (ADJUSTMENT, 'TEC Adjustment'),
     )
 
-    invoice = models.ForeignKey('Invoice', on_delete=models.CASCADE)
+    invoice = models.ForeignKey('Invoice')
     date = models.DateField()
-    amount = models.DecimalField(max_digits=10, decimal_places=2, help_text='Please use ex. VAT')
+    amount = models.DecimalField(
-    method = models.CharField(max_length=2, choices=METHODS, null=True, blank=True)
+        max_digits=10,
-
+        decimal_places=2,
-    reversion_hide = True
+        help_text='Please use ex. VAT')
+    method = models.CharField(
+        max_length=2,
+        choices=METHODS,
+        null=True,
+        blank=True)
 
     def __str__(self):
         return "%s: %d" % (self.get_method_display(), self.amount)
-
-    @property
-    def activity_feed_string(self):
-        return str("payment of £{}".format(self.amount))
-
-
-def validate_url(value):
-    if not value:
-        return  # Required error is done the field
-    obj = urlparse(value)
-    if obj.hostname not in ('nottinghamtec.sharepoint.com'):
-        raise ValidationError('URL must point to a location on the TEC Sharepoint')
-
-
-@reversion.register
-class RiskAssessment(models.Model, RevisionMixin):
-    SMALL = (0, 'Small')
-    MEDIUM = (1, 'Medium')
-    LARGE = (2, 'Large')
-    SIZES = (SMALL, MEDIUM, LARGE)
-
-    event = models.OneToOneField('Event', on_delete=models.CASCADE)
-    # General
-    nonstandard_equipment = models.BooleanField(help_text="Does the event require any hired in equipment or use of equipment that is not covered by <a href='https://nottinghamtec.sharepoint.com/:f:/g/HealthAndSafety/Eo4xED_DrqFFsfYIjKzMZIIB6Gm_ZfR-a8l84RnzxtBjrA?e=Bf0Haw'>"
-                                                          "TEC's standard risk assessments and method statements?</a>")
-    nonstandard_use = models.BooleanField(help_text="Are TEC using their equipment in a way that is abnormal?<br><small>i.e. Not covered by TECs standard health and safety documentation</small>")
-    contractors = models.BooleanField(help_text="Are you using any external contractors?<br><small>i.e. Freelancers/Crewing Companies</small>")
-    other_companies = models.BooleanField(help_text="Are TEC working with any other companies on site?<br><small>e.g. TEC is providing the lighting while another company does sound</small>")
-    crew_fatigue = models.BooleanField(help_text="Is crew fatigue likely to be a risk at any point during this event?")
-    general_notes = models.TextField(blank=True, null=True, help_text="Did you have to consult a supervisor about any of the above? If so who did you consult and what was the outcome?")
-
-    # Power
-    # event_size = models.IntegerField(blank=True, null=True, choices=SIZES)
-    big_power = models.BooleanField(help_text="Does the event require larger power supplies than 13A or 16A single phase wall sockets, or draw more than 20A total current?")
-    # If yes to the above two, you must answer...
-    power_mic = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='power_mic', blank=True, null=True,
-                                  verbose_name="Power MIC", on_delete=models.CASCADE, help_text="Who is the Power MIC? (if yes to the above question, this person <em>must</em> be a Power Technician or Power Supervisor)")
-    outside = models.BooleanField(help_text="Is the event outdoors?")
-    generators = models.BooleanField(help_text="Will generators be used?")
-    other_companies_power = models.BooleanField(help_text="Will TEC be supplying power to any other companies?")
-    nonstandard_equipment_power = models.BooleanField(help_text="Does the power plan require the use of any power equipment (distros, dimmers, motor controllers, etc.) that does not belong to TEC?")
-    multiple_electrical_environments = models.BooleanField(help_text="Will the electrical installation occupy more than one electrical environment?")
-    power_notes = models.TextField(blank=True, null=True, help_text="Did you have to consult a supervisor about any of the above? If so who did you consult and what was the outcome?")
-    power_plan = models.URLField(blank=True, null=True, help_text="Upload your power plan to the <a href='https://nottinghamtec.sharepoint.com/'>Sharepoint</a> and submit a link", validators=[validate_url])
-
-    # Sound
-    noise_monitoring = models.BooleanField(help_text="Does the event require noise monitoring or any non-standard procedures in order to comply with health and safety legislation or site rules?")
-    sound_notes = models.TextField(blank=True, null=True, help_text="Did you have to consult a supervisor about any of the above? If so who did you consult and what was the outcome?")
-
-    # Site
-    known_venue = models.BooleanField(help_text="Is this venue new to you (the MIC) or new to TEC?")
-    safe_loading = models.BooleanField(help_text="Are there any issues preventing a safe load in or out? (e.g. sufficient lighting, flat, not in a crowded area etc.)")
-    safe_storage = models.BooleanField(help_text="Are there any problems with safe and secure equipment storage?")
-    area_outside_of_control = models.BooleanField(help_text="Is any part of the work area out of TEC's direct control or openly accessible during the build or breakdown period?")
-    barrier_required = models.BooleanField(help_text="Is there a requirement for TEC to provide any barrier for security or protection of persons/equipment?")
-    nonstandard_emergency_procedure = models.BooleanField(help_text="Does the emergency procedure for the event differ from TEC's standard procedures?")
-
-    # Structures
-    special_structures = models.BooleanField(help_text="Does the event require use of winch stands, motors, MPT Towers, or staging?")
-    suspended_structures = models.BooleanField(help_text="Are any structures (excluding projector screens and IWBs) being suspended from TEC's structures?")
-    persons_responsible_structures = models.TextField(blank=True, null=True, help_text="Who are the persons on site responsible for their use?")
-    rigging_plan = models.URLField(blank=True, null=True, help_text="Upload your rigging plan to the <a href='https://nottinghamtec.sharepoint.com/'>Sharepoint</a> and submit a link", validators=[validate_url])
-
-    # Blimey that was a lot of options
-
-    reviewed_at = models.DateTimeField(null=True)
-    reviewed_by = models.ForeignKey(settings.AUTH_USER_MODEL, blank=True, null=True,
-                                    verbose_name="Reviewer", on_delete=models.CASCADE)
-
-    supervisor_consulted = models.BooleanField(null=True)
-
-    expected_values = {
-        'nonstandard_equipment': False,
-        'nonstandard_use': False,
-        'contractors': False,
-        'other_companies': False,
-        'crew_fatigue': False,
-        'big_power': False,
-        'generators': False,
-        'other_companies_power': False,
-        'nonstandard_equipment_power': False,
-        'multiple_electrical_environments': False,
-        'noise_monitoring': False,
-        'known_venue': False,
-        'safe_loading': False,
-        'safe_storage': False,
-        'area_outside_of_control': False,
-        'barrier_required': False,
-        'nonstandard_emergency_procedure': False,
-        'special_structures': False,
-        'suspended_structures': False,
-    }
-    inverted_fields = {key: value for (key, value) in expected_values.items() if not value}.keys()
-
-    def clean(self):
-        # Check for idiots
-        if not self.outside and self.generators:
-            raise forms.ValidationError("Engage brain, please. <strong>No generators indoors!(!)</strong>")
-
-    class Meta:
-        ordering = ['event']
-        permissions = [
-            ('review_riskassessment', 'Can review Risk Assessments')
-        ]
-
-    @property
-    def event_size(self):
-        # Confirm event size. Check all except generators, since generators entails outside
-        if self.outside or self.other_companies_power or self.nonstandard_equipment_power or self.multiple_electrical_environments:
-            return self.LARGE[0]
-        elif self.big_power:
-            return self.MEDIUM[0]
-        else:
-            return self.SMALL[0]
-
-    @property
-    def activity_feed_string(self):
-        return str(self.event)
-
-    def get_absolute_url(self):
-        return reverse_lazy('ra_detail', kwargs={'pk': self.pk})
-
-    def __str__(self):
-        return "%i - %s" % (self.pk, self.event)
-
-
-@reversion.register(follow=['vehicles', 'crew'])
-class EventChecklist(models.Model, RevisionMixin):
-    event = models.ForeignKey('Event', related_name='checklists', on_delete=models.CASCADE)
-
-    # General
-    power_mic = models.ForeignKey(settings.AUTH_USER_MODEL, blank=True, null=True, related_name='checklists',
-                                  verbose_name="Power MIC", on_delete=models.CASCADE, help_text="Who is the Power MIC?")
-    venue = models.ForeignKey('Venue', on_delete=models.CASCADE)
-    date = models.DateField()
-
-    # Safety Checks
-    safe_parking = models.BooleanField(blank=True, null=True, help_text="Vehicles parked safely?<br><small>(does not obstruct venue access)</small>")
-    safe_packing = models.BooleanField(blank=True, null=True, help_text="Equipment packed away safely?<br><small>(including flightcases)</small>")
-    exits = models.BooleanField(blank=True, null=True, help_text="Emergency exits clear?")
-    trip_hazard = models.BooleanField(blank=True, null=True, help_text="Appropriate barriers around kit and cabling secured?")
-    warning_signs = models.BooleanField(blank=True, help_text="Warning signs in place?<br><small>(strobe, smoke, power etc.)</small>")
-    ear_plugs = models.BooleanField(blank=True, null=True, help_text="Ear plugs issued to crew where needed?")
-    hs_location = models.CharField(blank=True, null=True, max_length=255, help_text="Location of Safety Bag/Box")
-    extinguishers_location = models.CharField(blank=True, null=True, max_length=255, help_text="Location of fire extinguishers")
-
-    # Small Electrical Checks
-    rcds = models.BooleanField(blank=True, null=True, help_text="RCDs installed where needed and tested?")
-    supply_test = models.BooleanField(blank=True, null=True, help_text="Electrical supplies tested?<br><small>(using socket tester)</small>")
-
-    # Shared electrical checks
-    earthing = models.BooleanField(blank=True, null=True, help_text="Equipment appropriately earthed?<br><small>(truss, stage, generators etc)</small>")
-    pat = models.BooleanField(blank=True, null=True, help_text="All equipment in PAT period?")
-
-    # Medium Electrical Checks
-    source_rcd = models.BooleanField(blank=True, null=True, help_text="Source RCD protected?<br><small>(if cable is more than 3m long) </small>")
-    labelling = models.BooleanField(blank=True, null=True, help_text="Appropriate and clear labelling on distribution and cabling?")
-    # First Distro
-    fd_voltage_l1 = models.IntegerField(blank=True, null=True, verbose_name="First Distro Voltage L1-N", help_text="L1 - N")
-    fd_voltage_l2 = models.IntegerField(blank=True, null=True, verbose_name="First Distro Voltage L2-N", help_text="L2 - N")
-    fd_voltage_l3 = models.IntegerField(blank=True, null=True, verbose_name="First Distro Voltage L3-N", help_text="L3 - N")
-    fd_phase_rotation = models.BooleanField(blank=True, null=True, verbose_name="Phase Rotation", help_text="Phase Rotation<br><small>(if required)</small>")
-    fd_earth_fault = models.IntegerField(blank=True, null=True, verbose_name="Earth Fault Loop Impedance", help_text="Earth Fault Loop Impedance (Z<small>S</small>)")
-    fd_pssc = models.IntegerField(blank=True, null=True, verbose_name="PSCC", help_text="Prospective Short Circuit Current")
-    # Worst case points
-    w1_description = models.CharField(blank=True, null=True, max_length=255, help_text="Description")
-    w1_polarity = models.BooleanField(blank=True, null=True, help_text="Polarity Checked?")
-    w1_voltage = models.IntegerField(blank=True, null=True, help_text="Voltage")
-    w1_earth_fault = models.IntegerField(blank=True, null=True, help_text="Earth Fault Loop Impedance (Z<small>S</small>)")
-    w2_description = models.CharField(blank=True, null=True, max_length=255, help_text="Description")
-    w2_polarity = models.BooleanField(blank=True, null=True, help_text="Polarity Checked?")
-    w2_voltage = models.IntegerField(blank=True, null=True, help_text="Voltage")
-    w2_earth_fault = models.IntegerField(blank=True, null=True, help_text="Earth Fault Loop Impedance (Z<small>S</small>)")
-    w3_description = models.CharField(blank=True, null=True, max_length=255, help_text="Description")
-    w3_polarity = models.BooleanField(blank=True, null=True, help_text="Polarity Checked?")
-    w3_voltage = models.IntegerField(blank=True, null=True, help_text="Voltage")
-    w3_earth_fault = models.IntegerField(blank=True, null=True, help_text="Earth Fault Loop Impedance (Z<small>S</small>)")
-
-    all_rcds_tested = models.BooleanField(blank=True, null=True, help_text="All circuit RCDs tested?<br><small>(using test button)</small>")
-    public_sockets_tested = models.BooleanField(blank=True, null=True, help_text="Public/Performer accessible circuits tested?<br><small>(using socket tester)</small>")
-
-    reviewed_at = models.DateTimeField(null=True)
-    reviewed_by = models.ForeignKey(settings.AUTH_USER_MODEL, blank=True, null=True,
-                                    verbose_name="Reviewer", on_delete=models.CASCADE)
-
-    inverted_fields = []
-
-    class Meta:
-        ordering = ['event']
-        permissions = [
-            ('review_eventchecklist', 'Can review Event Checklists')
-        ]
-
-    @property
-    def activity_feed_string(self):
-        return str(self.event)
-
-    def get_absolute_url(self):
-        return reverse_lazy('ec_detail', kwargs={'pk': self.pk})
-
-    def __str__(self):
-        return "%i - %s" % (self.pk, self.event)
-
-
-@reversion.register
-class EventChecklistVehicle(models.Model, RevisionMixin):
-    checklist = models.ForeignKey('EventChecklist', related_name='vehicles', blank=True, on_delete=models.CASCADE)
-    vehicle = models.CharField(max_length=255)
-    driver = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='vehicles', on_delete=models.CASCADE)
-
-    reversion_hide = True
-
-    def __str__(self):
-        return "{} driven by {}".format(self.vehicle, str(self.driver))
-
-
-@reversion.register
-class EventChecklistCrew(models.Model, RevisionMixin):
-    checklist = models.ForeignKey('EventChecklist', related_name='crew', blank=True, on_delete=models.CASCADE)
-    crewmember = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='crewed', on_delete=models.CASCADE)
-    role = models.CharField(max_length=255)
-    start = models.DateTimeField()
-    end = models.DateTimeField()
-
-    reversion_hide = True
-
-    def clean(self):
-        if self.start > self.end:
-            raise ValidationError('Unless you\'ve invented time travel, crew can\'t finish before they have started.')
-
-    def __str__(self):
-        return "{} ({})".format(str(self.crewmember), self.role)

RIGS/regbackend.py

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

RIGS/rigboard.py

@@ -1,42 +1,29 @@
-from io import BytesIO
+import cStringIO as StringIO
-import urllib.request
+import copy
-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 datetime
 import re
-import copy
+import urllib2
+from io import BytesIO
+
+from PyPDF2 import PdfFileMerger, PdfFileReader
+from django.conf import settings
+from django.contrib import messages
+from django.core.urlresolvers import reverse_lazy
+from django.db.models import Q
+from django.http import HttpResponse
+from django.shortcuts import get_object_or_404
+from django.template import RequestContext
+from django.template.loader import get_template
+from django.views import generic
+from z3c.rml import rml2pdf
+
+from RIGS import models, forms
 
 __author__ = 'ghost'
 
 
 class RigboardIndex(generic.TemplateView):
-    template_name = 'rigboard.html'
+    template_name = 'RIGS/rigboard.html'
 
     def get_context_data(self, **kwargs):
         # get super context
@@ -44,12 +31,11 @@ class RigboardIndex(generic.TemplateView):
 
         # call out method to get current events
         context['events'] = models.Event.objects.current_events()
-        context['page_title'] = "Rigboard"
         return context
 
 
 class WebCalendar(generic.TemplateView):
-    template_name = 'calendar.html'
+    template_name = 'RIGS/calendar.html'
 
     def get_context_data(self, **kwargs):
         context = super(WebCalendar, self).get_context_data(**kwargs)
@@ -59,49 +45,27 @@ class WebCalendar(generic.TemplateView):
 
 
 class EventDetail(generic.DetailView):
-    template_name = 'event_detail.html'
     model = models.Event
 
 
-class EventOembed(generic.View):
-    model = models.Event
-
-    def get(self, request, pk=None):
-        embed_url = reverse('event_embed', args=[pk])
-        full_url = "{0}://{1}{2}".format(request.scheme, request.META['HTTP_HOST'], embed_url)
-
-        data = {
-            'html': '<iframe src="{0}" frameborder="0" width="100%" height="250"></iframe>'.format(full_url),
-            'version': '1.0',
-            'type': 'rich',
-            'height': '250'
-        }
-
-        json = simplejson.JSONEncoderForHTML().encode(data)
-        return HttpResponse(json, content_type="application/json")
-
-
-class EventEmbed(EventDetail):
-    template_name = 'event_embed.html'
-
-
 class EventCreate(generic.CreateView):
     model = models.Event
     form_class = forms.EventForm
-    template_name = 'event_form.html'
 
     def get_context_data(self, **kwargs):
         context = super(EventCreate, self).get_context_data(**kwargs)
-        context['page_title'] = "New Event"
         context['edit'] = True
         context['currentVAT'] = models.VatRate.objects.current_rate()
 
         form = context['form']
-        if hasattr(form, 'items_json') and re.search(r'"-\d+"', form['items_json'].value()):
+        if re.search('"-\d+"', form['items_json'].value()):
-            messages.info(self.request, "Your item changes have been saved. Please fix the errors and save the event.")
+            messages.info(
+                self.request,
+                "Your item changes have been saved. Please fix the errors and save the event.")
 
-        # Get some other objects to include in the form. Used when there are errors but also nice and quick.
+        # Get some other objects to include in the form. Used when there are
-        for field, model in form.related_models.items():
+        # errors but also nice and quick.
+        for field, model in form.related_models.iteritems():
             value = form[field].value()
             if value is not None and value != '':
                 context[field] = model.objects.get(pk=value)
@@ -114,67 +78,44 @@ class EventCreate(generic.CreateView):
 class EventUpdate(generic.UpdateView):
     model = models.Event
     form_class = forms.EventForm
-    template_name = 'event_form.html'
 
     def get_context_data(self, **kwargs):
         context = super(EventUpdate, self).get_context_data(**kwargs)
-        context['page_title'] = "Event {}".format(self.object.display_id)
         context['edit'] = True
 
         form = context['form']
 
-        # Get some other objects to include in the form. Used when there are errors but also nice and quick.
+        # Get some other objects to include in the form. Used when there are
-        for field, model in form.related_models.items():
+        # errors but also nice and quick.
+        for field, model in form.related_models.iteritems():
             value = form[field].value()
             if value is not None and value != '':
                 context[field] = model.objects.get(pk=value)
-
         return context
 
-    def render_to_response(self, context, **response_kwargs):
-        if hasattr(context, 'duplicate') and not context['duplicate']:
-            # If this event has already been emailed to a client, show a warning
-            if self.object.auth_request_at is not None:
-                messages.info(self.request,
-                              'This event has already been sent to the client for authorisation, any changes you make will be visible to them immediately.')
-
-            if hasattr(self.object, 'authorised'):
-                messages.warning(self.request,
-                                 'This event has already been authorised by the client, any changes to the price will require reauthorisation.')
-        return super(EventUpdate, self).render_to_response(context, **response_kwargs)
-
     def get_success_url(self):
         return reverse_lazy('event_detail', kwargs={'pk': self.object.pk})
 
 
 class EventDuplicate(EventUpdate):
     def get_object(self, queryset=None):
-        old = super(EventDuplicate, self).get_object(queryset)  # Get the object (the event you're duplicating)
+        # Get the object (the event you're duplicating)
+        old = super(EventDuplicate, self).get_object(queryset)
         new = copy.copy(old)  # Make a copy of the object in memory
         new.based_on = old  # Make the new event based on the old event
-        new.purchase_order = None  # Remove old PO
-        new.status = new.PROVISIONAL  # Return status to provisional
-
-        # Clear checked in by if it's a dry hire
-        if new.dry_hire is True:
-            new.checked_in_by = None
-
-        # Remove all the authorisation information from the new event
-        new.auth_request_to = None
-        new.auth_request_by = None
-        new.auth_request_at = None
 
         if self.request.method in (
-                'POST', 'PUT'):  # This only happens on save (otherwise items won't display in editor)
+            'POST', 'PUT'):  # This only happens on save (otherwise items won't display in editor)
             new.pk = None  # This means a new event will be created on save, and all items will be re-created
-        else:
+
-            messages.info(self.request, 'Event data duplicated but not yet saved. Click save to complete operation.')
+        messages.info(
+            self.request,
+            'Event data duplicated but not yet saved. Click save to complete operation.')
 
         return new
 
     def get_context_data(self, **kwargs):
         context = super(EventDuplicate, self).get_context_data(**kwargs)
-        context['page_title'] = "Duplicate of Event {}".format(self.object.display_id)
         context["duplicate"] = True
         return context
 
@@ -182,55 +123,57 @@ class EventDuplicate(EventUpdate):
 class EventPrint(generic.View):
     def get(self, request, pk):
         object = get_object_or_404(models.Event, pk=pk)
-        template = get_template('event_print.xml')
+        template = get_template('RIGS/event_print.xml')
+        copies = ('TEC', 'Client')
 
         merger = PdfFileMerger()
 
-        context = {
+        for copy in copies:
-            'object': object,
+            context = RequestContext(request, {  # this should be outside the loop, but bug in 1.8.2 prevents this
-            'fonts': {
+                'object': object,
-                'opensans': {
+                'fonts': {
-                    'regular': 'static/fonts/OPENSANS-REGULAR.TTF',
+                    'opensans': {
-                    'bold': 'static/fonts/OPENSANS-BOLD.TTF',
+                        'regular': 'RIGS/static/fonts/OPENSANS-REGULAR.TTF',
-                }
+                        'bold': 'RIGS/static/fonts/OPENSANS-BOLD.TTF',
-            },
+                    }
-            'quote': True,
+                },
-            'current_user': request.user,
+                'copy': copy,
-            'filename': 'Event {} {} {}.pdf'.format(object.display_id, re.sub(r'[^a-zA-Z0-9 \n\.]', '', object.name), object.start_date)
+                'current_user': request.user,
-        }
+            })
 
-        rml = template.render(context)
+            # context['copy'] = copy # this is the way to do it once we upgrade
-        buffer = rml2pdf.parseString(rml)
+            # to Django 1.8.3
-        merger.append(PdfFileReader(buffer))
-        buffer.close()
 
-        terms = urllib.request.urlopen(settings.TERMS_OF_HIRE_URL)
+            rml = template.render(context)
-        merger.append(BytesIO(terms.read()))
+            buffer = StringIO.StringIO()
+
+            buffer = rml2pdf.parseString(rml)
+
+            merger.append(PdfFileReader(buffer))
+
+            buffer.close()
+
+        terms = urllib2.urlopen(settings.TERMS_OF_HIRE_URL)
+        merger.append(StringIO.StringIO(terms.read()))
 
         merged = BytesIO()
         merger.write(merged)
 
         response = HttpResponse(content_type='application/pdf')
-        response['Content-Disposition'] = 'filename="{}"'.format(context['filename'])
+
+        escapedEventName = re.sub('[^a-zA-Z0-9 \n\.]', '', object.name)
+
+        response[
+            'Content-Disposition'] = "filename=N%05d | %s.pdf" % (object.pk, escapedEventName)
         response.write(merged.getvalue())
         return response
 
 
-class EventArchive(generic.ListView):
+class EventArchive(generic.ArchiveIndexView):
-    template_name = "event_archive.html"
     model = models.Event
+    date_field = "start_date"
     paginate_by = 25
 
-    def get_context_data(self, **kwargs):
-        # get super context
-        context = super(EventArchive, self).get_context_data(**kwargs)
-
-        context['start'] = self.request.GET.get('start', None)
-        context['end'] = self.request.GET.get('end', datetime.date.today().strftime('%Y-%m-%d'))
-        context['statuses'] = models.Event.EVENT_STATUS_CHOICES
-        context['page_title'] = 'Event Archive'
-        return context
-
     def get_queryset(self):
         start = self.request.GET.get('start', None)
         end = self.request.GET.get('end', datetime.date.today())
@@ -241,193 +184,27 @@ class EventArchive(generic.ListView):
                                  "Muppet! Check the dates, it has been fixed for you.")
             start, end = end, start  # Stop the impending fail
 
-        filter = Q()
+        filter = False
         if end != "":
-            filter &= Q(start_date__lte=end)
+            filter = Q(start_date__lte=end)
         if start:
-            filter &= Q(start_date__gte=start)
+            if filter:
+                filter = filter & Q(start_date__gte=start)
+            else:
+                filter = Q(start_date__gte=start)
 
-        q = self.request.GET.get('q', "")
+        if filter:
-
+            qs = self.model.objects.filter(filter).order_by('-start_date')
-        if q != "":
+        else:
-            qfilter = Q(name__icontains=q) | Q(description__icontains=q) | Q(notes__icontains=q)
+            qs = self.model.objects.all().order_by('-start_date')
-
-            # try and parse an int
-            try:
-                val = int(q)
-                qfilter = qfilter | Q(pk=val)
-            except:  # noqa not an integer
-                pass
-
-            try:
-                if q[0] == "N":
-                    val = int(q[1:])
-                    qfilter = Q(pk=val)  # If string is N###### then do a simple PK filter
-            except:  # noqa
-                pass
-
-            filter &= qfilter
-
-        status = self.request.GET.getlist('status', "")
-
-        if len(status) > 0:
-            filter &= Q(status__in=status)
-
-        qs = self.model.objects.filter(filter).order_by('-start_date')
 
         # Preselect related for efficiency
         qs.select_related('person', 'organisation', 'venue', 'mic')
 
         if len(qs) == 0:
-            messages.add_message(self.request, messages.WARNING, "No events have been found matching those criteria.")
+            messages.add_message(
+                self.request,
+                messages.WARNING,
+                "No events have been found matching those criteria.")
 
         return qs
-
-
-class EventAuthorise(generic.UpdateView):
-    template_name = 'eventauthorisation_form.html'
-    success_template = 'eventauthorisation_success.html'
-
-    def form_valid(self, form):
-        self.object = form.save()
-
-        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))
-        return self.render_to_response(self.get_context_data())
-
-    @property
-    def event(self):
-        return models.Event.objects.select_related('organisation', 'person', 'venue').get(pk=self.kwargs['pk'])
-
-    def get_object(self, queryset=None):
-        return getattr(self.event, 'authorisation', None)
-
-    def get_form_class(self):
-        return forms.InternalClientEventAuthorisationForm
-
-    def get_context_data(self, **kwargs):
-        context = super(EventAuthorise, self).get_context_data(**kwargs)
-        context['event'] = self.event
-        context['tos_url'] = settings.TERMS_OF_HIRE_URL
-        context['page_title'] = "{}: {}".format(self.event.display_id, self.event.name)
-        if self.event.dry_hire:
-            context['page_title'] += ' <span class="badge badge-secondary align-top">Dry Hire</span>'
-        return context
-
-    def get(self, request, *args, **kwargs):
-        if self.get_object() is not None and self.get_object().pk is not None:
-            if self.event.authorised:
-                messages.add_message(self.request, messages.WARNING,
-                                     "This event has already been authorised. "
-                                     "Reauthorising is not necessary at this time.")
-            else:
-                messages.add_message(self.request, messages.WARNING,
-                                     "This event has already been authorised, but the amount has changed. " +
-                                     "Please check the amount and reauthorise.")
-        return super(EventAuthorise, self).get(request, *args, **kwargs)
-
-    def get_form(self, **kwargs):
-        form = super(EventAuthorise, self).get_form(**kwargs)
-        form.instance.event = self.event
-        form.instance.email = self.request.email
-        form.instance.sent_by = self.request.sent_by
-        return form
-
-    def dispatch(self, request, *args, **kwargs):
-        # Verify our signature matches up and all is well with the integrity of the URL
-        try:
-            data = signing.loads(kwargs.get('hmac'))
-            assert int(kwargs.get('pk')) == int(data.get('pk'))
-            request.email = data['email']
-            request.sent_by = models.Profile.objects.get(pk=data['sent_by'])
-        except (signing.BadSignature, AssertionError, KeyError, models.Profile.DoesNotExist):
-            raise SuspiciousOperation(
-                "This URL is invalid. Please ask your TEC contact for a new URL")
-        return super(EventAuthorise, self).dispatch(request, *args, **kwargs)
-
-
-class EventAuthorisationRequest(generic.FormView, generic.detail.SingleObjectMixin):
-    model = models.Event
-    form_class = forms.EventAuthorisationRequestForm
-    template_name = 'eventauthorisation_request.html'
-
-    @method_decorator(decorators.nottinghamtec_address_required)
-    def dispatch(self, *args, **kwargs):
-        return super(EventAuthorisationRequest, self).dispatch(*args, **kwargs)
-
-    @property
-    def object(self):
-        return self.get_object()
-
-    def get_success_url(self):
-        if self.request.is_ajax():
-            url = reverse_lazy('closemodal')
-            messages.info(self.request, "location.reload()")
-        else:
-            url = reverse_lazy('event_detail', kwargs={
-                'pk': self.object.pk,
-            })
-            messages.add_message(self.request, messages.SUCCESS, "Authorisation request successfully sent.")
-        return url
-
-    def form_valid(self, form):
-        email = form.cleaned_data['email']
-        event = self.object
-        event.auth_request_by = self.request.user
-        event.auth_request_at = timezone.now()
-        event.auth_request_to = email
-        event.save()
-
-        context = {
-            'object': self.object,
-            'request': self.request,
-            'hmac': signing.dumps({
-                'pk': self.object.pk,
-                'email': email,
-                'sent_by': self.request.user.pk,
-            }),
-        }
-        if event.person is not None and email == event.person.email:
-            context['to_name'] = event.person.name
-        elif event.organisation is not None and email == event.organisation.email:
-            context['to_name'] = event.organisation.name
-
-        msg = EmailMultiAlternatives(
-            "N%05d | %s - Event Authorisation Request" % (self.object.pk, self.object.name),
-            get_template("eventauthorisation_client_request.txt").render(context),
-            to=[email],
-            reply_to=[self.request.user.email],
-        )
-        css = staticfiles_storage.path('css/email.css')
-        html = premailer.Premailer(get_template("eventauthorisation_client_request.html").render(context),
-                                   external_styles=css).transform()
-        msg.attach_alternative(html, 'text/html')
-
-        msg.send()
-
-        return super(EventAuthorisationRequest, self).form_valid(form)
-
-
-class EventAuthoriseRequestEmailPreview(generic.DetailView):
-    template_name = "eventauthorisation_client_request.html"
-    model = models.Event
-
-    def render_to_response(self, context, **response_kwargs):
-        from django.contrib.staticfiles.storage import staticfiles_storage
-        css = staticfiles_storage.path('css/email.css')
-        response = super(EventAuthoriseRequestEmailPreview, self).render_to_response(context, **response_kwargs)
-        assert isinstance(response, HttpResponse)
-        response.content = premailer.Premailer(response.rendered_content, external_styles=css).transform()
-        return response
-
-    def get_context_data(self, **kwargs):
-        context = super(EventAuthoriseRequestEmailPreview, self).get_context_data(**kwargs)
-        context['hmac'] = signing.dumps({
-            'pk': self.object.pk,
-            'email': self.request.GET.get('email', 'hello@world.test'),
-            'sent_by': self.request.user.pk,
-        })
-        context['to_name'] = self.request.GET.get('to_name', None)
-        return context

RIGS/signals.py

@@ -1,150 +0,0 @@
-import datetime
-import re
-import urllib.request
-import urllib.error
-import urllib.parse
-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.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 z3c.rml import rml2pdf
-
-from RIGS import models
-from reversion import revisions as reversion
-
-
-def send_eventauthorisation_success_email(instance):
-    # Generate PDF first to prevent context conflicts
-    context = {
-        'object': instance.event,
-        'fonts': {
-            'opensans': {
-                'regular': 'RIGS/static/fonts/OPENSANS-REGULAR.TTF',
-                'bold': 'RIGS/static/fonts/OPENSANS-BOLD.TTF',
-            }
-        },
-        'receipt': True,
-        'current_user': False,
-    }
-
-    template = get_template('event_print.xml')
-    merger = PdfFileMerger()
-
-    rml = template.render(context)
-
-    buffer = rml2pdf.parseString(rml)
-    merger.append(PdfFileReader(buffer))
-    buffer.close()
-
-    terms = urllib.request.urlopen(settings.TERMS_OF_HIRE_URL)
-    merger.append(BytesIO(terms.read()))
-
-    merged = BytesIO()
-    merger.write(merged)
-
-    # Produce email content
-    context = {
-        'object': instance,
-    }
-
-    if instance.event.person is not None and instance.email == instance.event.person.email:
-        context['to_name'] = instance.event.person.name
-    elif instance.event.organisation is not None and instance.email == instance.event.organisation.email:
-        context['to_name'] = instance.event.organisation.name
-
-    subject = "N%05d | %s - Event Authorised" % (instance.event.pk, instance.event.name)
-
-    client_email = EmailMultiAlternatives(
-        subject,
-        get_template("eventauthorisation_client_success.txt").render(context),
-        to=[instance.email],
-        reply_to=[settings.AUTHORISATION_NOTIFICATION_ADDRESS],
-    )
-
-    css = staticfiles_storage.path('css/email.css')
-    html = Premailer(get_template("eventauthorisation_client_success.html").render(context),
-                     external_styles=css).transform()
-    client_email.attach_alternative(html, 'text/html')
-
-    escapedEventName = re.sub(r'[^a-zA-Z0-9 \n\.]', '', instance.event.name)
-
-    client_email.attach('N%05d - %s - CONFIRMATION.pdf' % (instance.event.pk, escapedEventName),
-                        merged.getvalue(),
-                        'application/pdf'
-                        )
-
-    if instance.event.mic:
-        mic_email_address = instance.event.mic.email
-    else:
-        mic_email_address = settings.AUTHORISATION_NOTIFICATION_ADDRESS
-
-    mic_email = EmailMessage(
-        subject,
-        get_template("eventauthorisation_mic_success.txt").render(context),
-        to=[mic_email_address]
-    )
-
-    # Now we have both emails successfully generated, send them out
-    client_email.send(fail_silently=True)
-    mic_email.send(fail_silently=True)
-
-    # Set event to booked now that it's authorised
-    instance.event.status = models.Event.BOOKED
-    instance.event.save()
-
-
-def on_revision_commit(sender, instance, created, **kwargs):
-    if created:
-        send_eventauthorisation_success_email(instance)
-
-
-post_save.connect(on_revision_commit, sender=models.EventAuthorisation)
-
-
-def send_admin_awaiting_approval_email(user, request, **kwargs):
-    # Bit more controlled than just emailing all superusers
-    for admin in models.Profile.admins():
-        # Check we've ever emailed them before and if so, if cooldown has passed.
-        if admin.last_emailed is None or admin.last_emailed + settings.EMAIL_COOLDOWN <= timezone.now():
-            context = {
-                'request': request,
-                'link_suffix': reverse("admin:RIGS_profile_changelist") + '?is_approved__exact=0',
-                'number_of_users': models.Profile.users_awaiting_approval_count(),
-                'to_name': admin.first_name
-            }
-
-            email = EmailMultiAlternatives(
-                "%s new users awaiting approval on RIGS" % (context['number_of_users']),
-                get_template("admin_awaiting_approval.txt").render(context),
-                to=[admin.email],
-                reply_to=[user.email],
-            )
-            css = staticfiles_storage.path('css/email.css')
-            html = Premailer(get_template("admin_awaiting_approval.html").render(context),
-                             external_styles=css).transform()
-            email.attach_alternative(html, 'text/html')
-            email.send()
-
-            # Update last sent
-            admin.last_emailed = timezone.now()
-            admin.save()
-
-
-user_activated.connect(send_admin_awaiting_approval_email)
-
-
-def update_cache(sender, instance, created, **kwargs):
-    cache.clear()
-
-
-for model in reversion.get_registered_models():
-    post_save.connect(update_cache, sender=model)

RIGS/static/config.rb

@@ -0,0 +1,27 @@
+# Require any additional compass plugins here.
+require 'bootstrap-sass'
+
+# Set this to the root of your project when deployed:
+http_path = "/static/"
+css_dir = "css"
+sass_dir = "scss"
+images_dir = "img"
+javascripts_dir = "js"
+fonts_dir = "fonts"
+
+# You can select your preferred output style here (can be overridden via the command line):
+# output_style = :expanded or :nested or :compact or :compressed
+output_style = :compressed
+
+# To enable relative paths to assets via compass helper functions. Uncomment:
+# relative_assets = true
+
+# To disable debugging comments that display the original location of your selectors. Uncomment:
+# line_comments = false
+
+
+# If you prefer the indented syntax, you might want to regenerate this
+# project again passing --syntax sass, or you can uncomment this:
+# preferred_syntax = :sass
+# and then run:
+# sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass

RIGS/static/css/ajax-bootstrap-select.css

@@ -3,16 +3,16 @@
  *
  * Extends existing [Bootstrap Select] implementations by adding the ability to search via AJAX requests as you type. Originally for CROSCON.
  *
- * @version 1.4.5
+ * @version 1.3.1
  * @author Adam Heim - https://github.com/truckingsim
  * @link https://github.com/truckingsim/Ajax-Bootstrap-Select
- * @copyright 2019 Adam Heim
+ * @copyright 2015 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
+ * Last build: 2015-01-06 8:43:11 PM EST
  */
 .bootstrap-select .status {
   background: #f0f0f0;
@@ -23,6 +23,5 @@
   font-weight: 500;
   line-height: 1;
   margin-bottom: -5px;
-  padding: 10px 20px; }
+  padding: 10px 20px;
-
+}
-/*# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImFqYXgtYm9vdHN0cmFwLXNlbGVjdC5jc3MiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7Ozs7Ozs7OztFQWVFO0FBQ0Y7RUFDRSxtQkFBbUI7RUFDbkIsV0FBVztFQUNYLFdBQVc7RUFDWCxlQUFlO0VBQ2Ysa0JBQWtCO0VBQ2xCLGdCQUFnQjtFQUNoQixjQUFjO0VBQ2QsbUJBQW1CO0VBQ25CLGtCQUFrQixFQUFBIiwiZmlsZSI6ImFqYXgtYm9vdHN0cmFwLXNlbGVjdC5jc3MiLCJzb3VyY2VzQ29udGVudCI6WyIvKiFcbiAqIEFqYXggQm9vdHN0cmFwIFNlbGVjdFxuICpcbiAqIEV4dGVuZHMgZXhpc3RpbmcgW0Jvb3RzdHJhcCBTZWxlY3RdIGltcGxlbWVudGF0aW9ucyBieSBhZGRpbmcgdGhlIGFiaWxpdHkgdG8gc2VhcmNoIHZpYSBBSkFYIHJlcXVlc3RzIGFzIHlvdSB0eXBlLiBPcmlnaW5hbGx5IGZvciBDUk9TQ09OLlxuICpcbiAqIEB2ZXJzaW9uIDEuNC41XG4gKiBAYXV0aG9yIEFkYW0gSGVpbSAtIGh0dHBzOi8vZ2l0aHViLmNvbS90cnVja2luZ3NpbVxuICogQGxpbmsgaHR0cHM6Ly9naXRodWIuY29tL3RydWNraW5nc2ltL0FqYXgtQm9vdHN0cmFwLVNlbGVjdFxuICogQGNvcHlyaWdodCAyMDE5IEFkYW0gSGVpbVxuICogQGxpY2Vuc2UgUmVsZWFzZWQgdW5kZXIgdGhlIE1JVCBsaWNlbnNlLlxuICpcbiAqIENvbnRyaWJ1dG9yczpcbiAqICAgTWFyayBDYXJ2ZXIgLSBodHRwczovL2dpdGh1Yi5jb20vbWFya2NhcnZlclxuICpcbiAqIExhc3QgYnVpbGQ6IDIwMTktMDQtMjMgMTI6MTg6NTYgUE0gRURUXG4gKi9cbi5ib290c3RyYXAtc2VsZWN0IC5zdGF0dXMge1xuICBiYWNrZ3JvdW5kOiAjZjBmMGYwO1xuICBjbGVhcjogYm90aDtcbiAgY29sb3I6ICM5OTk7XG4gIGZvbnQtc2l6ZTogMTFweDtcbiAgZm9udC1zdHlsZTogaXRhbGljO1xuICBmb250LXdlaWdodDogNTAwO1xuICBsaW5lLWhlaWdodDogMTtcbiAgbWFyZ2luLWJvdHRvbTogLTVweDtcbiAgcGFkZGluZzogMTBweCAyMHB4O1xufVxuIl19 */

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= */

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 */

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 */

RIGS/static/css/ie.css

@@ -1,2 +0,0 @@
-
-/*# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiIsImZpbGUiOiJpZS5jc3MiLCJzb3VyY2VzQ29udGVudCI6W119 */