Further minor fixes to versioning

Indeed, it may not

.codeclimate.yml

@@ -0,0 +1,32 @@
+---
+engines:
+  csslint:
+    enabled: true
+  duplication:
+    enabled: true
+    config:
+      languages:
+      - ruby
+      - javascript
+      - python
+      - php
+  eslint:
+    enabled: true
+  fixme:
+    enabled: true
+  radon:
+    enabled: true
+  rubocop:
+    enabled: true
+ratings:
+  paths:
+  - "**.css"
+  - "**.inc"
+  - "**.js"
+  - "**.jsx"
+  - "**.module"
+  - "**.php"
+  - "**.py"
+  - "**.rb"
+exclude_paths:
+- config/

.coveragerc

@@ -1,5 +1,6 @@
 [run]
-omit = */migrations/*
-       */tests/*
-       */site-packages/*
-       */distutils/*
+source =
+    ./
+
+omit =
+    */migrations/*

.csslintrc

@@ -0,0 +1,2 @@
+--exclude-exts=.min.css
+--ignore=adjoining-classes,box-model,ids,order-alphabetical,unqualified-attributes

.eslintignore

@@ -0,0 +1 @@
+**/*{.,-}min.js

.eslintrc

@@ -0,0 +1,213 @@
+ecmaFeatures:
+  modules: true
+  jsx: true
+
+env:
+  amd: true
+  browser: true
+  es6: true
+  jquery: true
+  node: true
+
+# http://eslint.org/docs/rules/
+rules:
+  # Possible Errors
+  comma-dangle: [2, never]
+  no-cond-assign: 2
+  no-console: 0
+  no-constant-condition: 2
+  no-control-regex: 2
+  no-debugger: 2
+  no-dupe-args: 2
+  no-dupe-keys: 2
+  no-duplicate-case: 2
+  no-empty: 2
+  no-empty-character-class: 2
+  no-ex-assign: 2
+  no-extra-boolean-cast: 2
+  no-extra-parens: 0
+  no-extra-semi: 2
+  no-func-assign: 2
+  no-inner-declarations: [2, functions]
+  no-invalid-regexp: 2
+  no-irregular-whitespace: 2
+  no-negated-in-lhs: 2
+  no-obj-calls: 2
+  no-regex-spaces: 2
+  no-sparse-arrays: 2
+  no-unexpected-multiline: 2
+  no-unreachable: 2
+  use-isnan: 2
+  valid-jsdoc: 0
+  valid-typeof: 2
+
+  # Best Practices
+  accessor-pairs: 2
+  block-scoped-var: 0
+  complexity: [2, 6]
+  consistent-return: 0
+  curly: 0
+  default-case: 0
+  dot-location: 0
+  dot-notation: 0
+  eqeqeq: 2
+  guard-for-in: 2
+  no-alert: 2
+  no-caller: 2
+  no-case-declarations: 2
+  no-div-regex: 2
+  no-else-return: 0
+  no-empty-label: 2
+  no-empty-pattern: 2
+  no-eq-null: 2
+  no-eval: 2
+  no-extend-native: 2
+  no-extra-bind: 2
+  no-fallthrough: 2
+  no-floating-decimal: 0
+  no-implicit-coercion: 0
+  no-implied-eval: 2
+  no-invalid-this: 0
+  no-iterator: 2
+  no-labels: 0
+  no-lone-blocks: 2
+  no-loop-func: 2
+  no-magic-number: 0
+  no-multi-spaces: 0
+  no-multi-str: 0
+  no-native-reassign: 2
+  no-new-func: 2
+  no-new-wrappers: 2
+  no-new: 2
+  no-octal-escape: 2
+  no-octal: 2
+  no-proto: 2
+  no-redeclare: 2
+  no-return-assign: 2
+  no-script-url: 2
+  no-self-compare: 2
+  no-sequences: 0
+  no-throw-literal: 0
+  no-unused-expressions: 2
+  no-useless-call: 2
+  no-useless-concat: 2
+  no-void: 2
+  no-warning-comments: 0
+  no-with: 2
+  radix: 2
+  vars-on-top: 0
+  wrap-iife: 2
+  yoda: 0
+
+  # Strict
+  strict: 0
+
+  # Variables
+  init-declarations: 0
+  no-catch-shadow: 2
+  no-delete-var: 2
+  no-label-var: 2
+  no-shadow-restricted-names: 2
+  no-shadow: 0
+  no-undef-init: 2
+  no-undef: 0
+  no-undefined: 0
+  no-unused-vars: 0
+  no-use-before-define: 0
+
+  # Node.js and CommonJS
+  callback-return: 2
+  global-require: 2
+  handle-callback-err: 2
+  no-mixed-requires: 0
+  no-new-require: 0
+  no-path-concat: 2
+  no-process-exit: 2
+  no-restricted-modules: 0
+  no-sync: 0
+
+  # Stylistic Issues
+  array-bracket-spacing: 0
+  block-spacing: 0
+  brace-style: 0
+  camelcase: 0
+  comma-spacing: 0
+  comma-style: 0
+  computed-property-spacing: 0
+  consistent-this: 0
+  eol-last: 0
+  func-names: 0
+  func-style: 0
+  id-length: 0
+  id-match: 0
+  indent: 0
+  jsx-quotes: 0
+  key-spacing: 0
+  linebreak-style: 0
+  lines-around-comment: 0
+  max-depth: 0
+  max-len: 0
+  max-nested-callbacks: 0
+  max-params: 0
+  max-statements: [2, 30]
+  new-cap: 0
+  new-parens: 0
+  newline-after-var: 0
+  no-array-constructor: 0
+  no-bitwise: 0
+  no-continue: 0
+  no-inline-comments: 0
+  no-lonely-if: 0
+  no-mixed-spaces-and-tabs: 0
+  no-multiple-empty-lines: 0
+  no-negated-condition: 0
+  no-nested-ternary: 0
+  no-new-object: 0
+  no-plusplus: 0
+  no-restricted-syntax: 0
+  no-spaced-func: 0
+  no-ternary: 0
+  no-trailing-spaces: 0
+  no-underscore-dangle: 0
+  no-unneeded-ternary: 0
+  object-curly-spacing: 0
+  one-var: 0
+  operator-assignment: 0
+  operator-linebreak: 0
+  padded-blocks: 0
+  quote-props: 0
+  quotes: 0
+  require-jsdoc: 0
+  semi-spacing: 0
+  semi: 0
+  sort-vars: 0
+  space-after-keywords: 0
+  space-before-blocks: 0
+  space-before-function-paren: 0
+  space-before-keywords: 0
+  space-in-parens: 0
+  space-infix-ops: 0
+  space-return-throw-case: 0
+  space-unary-ops: 0
+  spaced-comment: 0
+  wrap-regex: 0
+
+  # ECMAScript 6
+  arrow-body-style: 0
+  arrow-parens: 0
+  arrow-spacing: 0
+  constructor-super: 0
+  generator-star-spacing: 0
+  no-arrow-condition: 0
+  no-class-assign: 0
+  no-const-assign: 0
+  no-dupe-class-members: 0
+  no-this-before-super: 0
+  no-var: 0
+  object-shorthand: 0
+  prefer-arrow-callback: 0
+  prefer-const: 0
+  prefer-reflect: 0
+  prefer-spread: 0
+  prefer-template: 0
+  require-yield: 0

.github/workflows/combine-prs.yml

@@ -1,151 +0,0 @@
-name: 'Combine PRs'
-
-# Controls when the action will run - in this case triggered manually
-on:
-  workflow_dispatch:
-    inputs:
-      branchPrefix:
-        description: 'Branch prefix to find combinable PRs based on'
-        required: true
-        default: 'dependabot'
-      mustBeGreen:
-        description: 'Only combine PRs that are green (status is success)'
-        required: true
-        default: true
-      combineBranchName:
-        description: 'Name of the branch to combine PRs into'
-        required: true
-        default: 'combine-prs-branch'
-      ignoreLabel:
-        description: 'Exclude PRs with this label'
-        required: true
-        default: 'nocombine'
-
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
-jobs:
-  # This workflow contains a single job called "combine-prs"
-  combine-prs:
-    # The type of runner that the job will run on
-    runs-on: ubuntu-latest
-
-    # Steps represent a sequence of tasks that will be executed as part of the job
-    steps:
-      - uses: actions/github-script@v6
-        id: create-combined-pr
-        name: Create Combined PR
-        with:
-          github-token: ${{secrets.GITHUB_TOKEN}}
-          script: |
-            const pulls = await github.paginate('GET /repos/:owner/:repo/pulls', {
-              owner: context.repo.owner,
-              repo: context.repo.repo
-            });
-            let branchesAndPRStrings = [];
-            let baseBranch = null;
-            let baseBranchSHA = null;
-            for (const pull of pulls) {
-              const branch = pull['head']['ref'];
-              console.log('Pull for branch: ' + branch);
-              if (branch.startsWith('${{ github.event.inputs.branchPrefix }}')) {
-                console.log('Branch matched prefix: ' + branch);
-                let statusOK = true;
-                if(${{ github.event.inputs.mustBeGreen }}) {
-                  console.log('Checking green status: ' + branch);
-                  const stateQuery = `query($owner: String!, $repo: String!, $pull_number: Int!) {
-                    repository(owner: $owner, name: $repo) {
-                      pullRequest(number:$pull_number) {
-                        commits(last: 1) {
-                          nodes {
-                            commit {
-                              statusCheckRollup {
-                                state
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }`
-                  const vars = {
-                    owner: context.repo.owner,
-                    repo: context.repo.repo,
-                    pull_number: pull['number']
-                  };
-                  const result = await github.graphql(stateQuery, vars);
-                  const [{ commit }] = result.repository.pullRequest.commits.nodes;
-                  const state = commit.statusCheckRollup.state
-                  console.log('Validating status: ' + state);
-                  if(state != 'SUCCESS') {
-                    console.log('Discarding ' + branch + ' with status ' + state);
-                    statusOK = false;
-                  }
-                }
-                console.log('Checking labels: ' + branch);
-                const labels = pull['labels'];
-                for(const label of labels) {
-                  const labelName = label['name'];
-                  console.log('Checking label: ' + labelName);
-                  if(labelName == '${{ github.event.inputs.ignoreLabel }}') {
-                    console.log('Discarding ' + branch + ' with label ' + labelName);
-                    statusOK = false;
-                  }
-                }
-                if (statusOK) {
-                  console.log('Adding branch to array: ' + branch);
-                  const prString = '#' + pull['number'] + ' ' + pull['title'];
-                  branchesAndPRStrings.push({ branch, prString });
-                  baseBranch = pull['base']['ref'];
-                  baseBranchSHA = pull['base']['sha'];
-                }
-              }
-            }
-            if (branchesAndPRStrings.length == 0) {
-              core.setFailed('No PRs/branches matched criteria');
-              return;
-            }
-            try {
-              await github.rest.git.createRef({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                ref: 'refs/heads/' + '${{ github.event.inputs.combineBranchName }}',
-                sha: baseBranchSHA
-              });
-            } catch (error) {
-              console.log(error);
-              core.setFailed('Failed to create combined branch - maybe a branch by that name already exists?');
-              return;
-            }
-            
-            let combinedPRs = [];
-            let mergeFailedPRs = [];
-            for(const { branch, prString } of branchesAndPRStrings) {
-              try {
-                await github.rest.repos.merge({
-                  owner: context.repo.owner,
-                  repo: context.repo.repo,
-                  base: '${{ github.event.inputs.combineBranchName }}',
-                  head: branch,
-                });
-                console.log('Merged branch ' + branch);
-                combinedPRs.push(prString);
-              } catch (error) {
-                console.log('Failed to merge branch ' + branch);
-                mergeFailedPRs.push(prString);
-              }
-            }
-            
-            console.log('Creating combined PR');
-            const combinedPRsString = combinedPRs.join('\n');
-            let body = '✅ This PR was created by the Combine PRs action by combining the following PRs:\n' + combinedPRsString;
-            if(mergeFailedPRs.length > 0) {
-              const mergeFailedPRsString = mergeFailedPRs.join('\n');
-              body += '\n\n⚠️ The following PRs were left out due to merge conflicts:\n' + mergeFailedPRsString
-            }
-            await github.rest.pulls.create({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              title: 'Combined PR',
-              head: '${{ github.event.inputs.combineBranchName }}',
-              base: baseBranch,
-              body: body
-            });

.github/workflows/deploy.yml

@@ -1,14 +0,0 @@
-name: Manual Deploy
-
-on: workflow_dispatch
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: akhileshns/heroku-deploy@v3.12.12 # This is the action
-        with:
-          heroku_api_key: ${{secrets.HEROKU_API_KEY}}
-          heroku_app_name: "pyrigs" #Must be unique in Heroku
-          heroku_email: "aj@aronajones.com"

.github/workflows/django.yml

@@ -1,59 +0,0 @@
-name: Django CI
-
-on:
-  push:
-    branches: [master]
-  pull_request:
-    branches: [master]
-
-jobs:
-  build:
-    if: "!contains(github.event.head_commit.message, '[ci skip]')"
-    runs-on: ubuntu-latest
-    env:
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      PYTHONDONTWRITEBYTECODE: 1
-    steps:
-      - uses: actions/checkout@v4
-      - name: Install build dependencies
-        run: |
-          sudo apt-get install libcairo2-dev
-
-      - name: "Set up Python"
-        uses: actions/setup-python@v5
-        with:
-          python-version-file: ".python-version"
-
-      - name: Install uv
-        uses: astral-sh/setup-uv@v6
-
-      - name: Install Dependencies
-        run: uv sync --locked --all-extras --dev
-
-      - name: Cache Static Files
-        id: static-cache
-        uses: actions/cache@v4
-        with:
-            path: 'pipeline/built_assets'
-            key: ${{ hashFiles('package-lock.json') }}-${{ hashFiles('pipeline/source_assets') }}
-
-      - uses: bahmutov/npm-install@v1
-        if: steps.static-cache.outputs.cache-hit != 'true'
-      - run: node node_modules/gulp/bin/gulp build
-        if: steps.static-cache.outputs.cache-hit != 'true'
-      - name: Basic Checks
-        run: |
-              uv run pycodestyle . --exclude=.venv,migrations,node_modules
-              uv run python3 manage.py check
-              uv run python3 manage.py makemigrations --check --dry-run
-              uv run python3 manage.py collectstatic --noinput
-      - name: Run Tests
-        run: uv run pytest -n auto --cov
-      - uses: actions/upload-artifact@v4
-        if: failure()
-        with:
-            name: failure-screenshots ${{ matrix.test-group }}
-            path: screenshots/
-            retention-days: 5
-      - name: Coveralls
-        run: uv run coveralls --service=github

.gitignore

@@ -26,7 +26,6 @@ var/
 .installed.cfg
 *.egg
 node_modules/
-data/
 
 # Continer extras
 .vagrant
@@ -69,9 +68,19 @@ target/
 
 ## Directory-based project format:
 .idea/
+# if you remove the above rule, at least ignore the following:
 
-#Built dependencies
-pipeline/built_assets
+# User-specific stuff:
+# .idea/workspace.xml
+# .idea/tasks.xml
+# .idea/dictionaries
+
+# Sensitive or high-churn files:
+# .idea/dataSources.ids
+# .idea/dataSources.xml
+# .idea/sqlDataSources.xml
+# .idea/dynamic.xml
+# .idea/uiDesigner.xml
 
 # Gradle:
 # .idea/gradle.xml
@@ -101,6 +110,3 @@ crashlytics.properties
 crashlytics-build.properties
 .vscode/
 screenshots/
-
-# Virutal Environments
-.venv/

.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>
+

.python-version

@@ -1 +0,0 @@
-3.10

.slugignore

@@ -1,6 +1,7 @@
 *.sqlite3
+*.scss
 *.md
-**/tests
-conftest.py
-pytest.ini
-Dockerfile
+*.rb
+Vagrantfile
+config/vagrant/*
+config/vagrant.yml

.travis.yml

@@ -0,0 +1,37 @@
+language: python
+python:
+  "3.8"
+cache: pip
+
+addons:
+  chrome: stable
+  
+before_install:
+  - export LANGUAGE=en_GB.UTF-8
+
+install:
+  - |
+    latest=$(wget -qO- https://chromedriver.storage.googleapis.com/LATEST_RELEASE)
+    wget https://chromedriver.storage.googleapis.com/$latest/chromedriver_linux64.zip
+  - unzip chromedriver_linux64.zip
+  - export PATH=$PATH:$(pwd)
+  - chmod +x chromedriver
+  - pip install -r requirements.txt
+  - pip install coveralls codeclimate-test-reporter pycodestyle
+
+before_script:
+  - export PATH=$PATH:/usr/lib/chromium-browser/
+  - python manage.py collectstatic --noinput
+
+script:
+  - pycodestyle . --exclude=migrations,importer*
+  - python manage.py check
+  - python manage.py makemigrations --check --dry-run
+  - coverage run manage.py test --verbosity=2
+
+after_success:
+  - coveralls
+  - codeclimate-test-reporter
+
+notifications:
+  webhooks: https://fathomless-fjord-24024.herokuapp.com/notify

Dockerfile

@@ -0,0 +1,12 @@
+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"]

PyRIGS/decorators.py

@@ -1,7 +1,6 @@
-from django.conf import settings
 from django.contrib.auth import REDIRECT_FIELD_NAME
-from django.http import HttpResponseRedirect
 from django.shortcuts import render
+from django.http import HttpResponseRedirect
 from django.urls import reverse
 
 from RIGS import models
@@ -9,13 +8,18 @@ from RIGS import models
 
 def get_oembed(login_url, request, oembed_view, kwargs):
     context = {}
-    context['oembed_url'] = f"{request.scheme}://{request.META['HTTP_HOST']}{reverse(oembed_view, kwargs=kwargs)}"
-    context['login_url'] = f"{login_url}?{REDIRECT_FIELD_NAME}={request.get_full_path()}"
+    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=settings.LOGIN_URL):
+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:
@@ -24,7 +28,7 @@ def has_oembed(oembed_view, login_url=settings.LOGIN_URL):
                 if oembed_view is not None:
                     return get_oembed(login_url, request, oembed_view, kwargs)
                 else:
-                    return HttpResponseRedirect(f'{login_url}?{REDIRECT_FIELD_NAME}={request.get_full_path()}')
+                    return HttpResponseRedirect('%s?%s=%s' % (login_url, REDIRECT_FIELD_NAME, request.get_full_path()))
 
         _checklogin.__doc__ = view_func.__doc__
         _checklogin.__dict__ = view_func.__dict__
@@ -54,7 +58,7 @@ def user_passes_test_with_403(test_func, login_url=None, oembed_view=None):
                 if oembed_view is not None:
                     return get_oembed(login_url, request, oembed_view, kwargs)
                 else:
-                    return HttpResponseRedirect(f'{login_url}?{REDIRECT_FIELD_NAME}={request.get_full_path()}')
+                    return HttpResponseRedirect('%s?%s=%s' % (login_url, REDIRECT_FIELD_NAME, request.get_full_path()))
             else:
                 resp = render(request, '403.html')
                 resp.status_code = 403
@@ -79,9 +83,7 @@ def api_key_required(function):
     """
     Decorator for views that checks api_pk and api_key.
     Failed users will be given a 403 error.
-    Should only be used for urls which include <api_pk> and <api_key> kwargs.
-
-    Will update the kwargs to include the user object if successful (under the key 'user').
+    Should only be used for urls which include <api_pk> and <api_key> kwargs
     """
 
     def wrap(request, *args, **kwargs):
@@ -99,7 +101,6 @@ def api_key_required(function):
 
         try:
             user_object = models.Profile.objects.get(pk=userid)
-            kwargs = {**kwargs, 'user': user_object}
         except models.Profile.DoesNotExist:
             return error_resp
 

PyRIGS/settings.py

@@ -8,23 +8,27 @@ For the full list of settings and their values, see
 https://docs.djangoproject.com/en/1.7/ref/settings/
 """
 
-import datetime
-from pathlib import Path
+# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
+import os
+import raven
 import secrets
+import datetime
 
-import sentry_sdk
-from sentry_sdk.integrations.django import DjangoIntegration
-from envparse import env
+BASE_DIR = os.path.dirname(os.path.dirname(__file__))
 
-# Build paths inside the project like this: BASE_DIR / 'subdir'.
-BASE_DIR = Path(__file__).resolve(strict=True).parent.parent
+# Quick-start development settings - unsuitable for production
+# 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)
-STAGING = env('STAGING', cast=bool, default=False)
-CI = env('CI', cast=bool, default=False)
+DEBUG = bool(int(os.environ.get('DEBUG'))) if os.environ.get('DEBUG') else True
+
+STAGING = bool(int(os.environ.get('STAGING'))) if os.environ.get('STAGING') else False
+
+CI = bool(int(os.environ.get('CI'))) if os.environ.get('CI') else False
 
 ALLOWED_HOSTS = ['pyrigs.nottinghamtec.co.uk', 'rigs.nottinghamtec.co.uk', 'pyrigs.herokuapp.com']
 
@@ -35,8 +39,6 @@ if DEBUG:
     ALLOWED_HOSTS.append('localhost')
     ALLOWED_HOSTS.append('example.com')
     ALLOWED_HOSTS.append('127.0.0.1')
-    ALLOWED_HOSTS.append('.app.github.dev')
-    CSRF_TRUSTED_ORIGINS = ALLOWED_HOSTS
 
 SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
 if not DEBUG:
@@ -44,15 +46,13 @@ if not DEBUG:
 
 INTERNAL_IPS = ['127.0.0.1']
 
-DOMAIN = env('DOMAIN', default='example.com')
-
-ADMINS = [('IT Manager', f'it@{DOMAIN}'), ('Arona Jones', f'arona.jones@{DOMAIN}')]
+ADMINS = [('Tom Price', 'tomtom5152@gmail.com'), ('IT Manager', 'it@nottinghamtec.co.uk'),
+          ('Arona Jones', 'arona.jones@nottinghamtec.co.uk')]
 if DEBUG:
     ADMINS.append(('Testing Superuser', 'superuser@example.com'))
 
 # Application definition
 INSTALLED_APPS = (
-    'whitenoise.runserver_nostatic',
     'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
@@ -64,20 +64,19 @@ INSTALLED_APPS = (
     'users',
     'RIGS',
     'assets',
-    'training',
 
-    # 'debug_toolbar',
+    'debug_toolbar',
     'registration',
     'reversion',
+    'captcha',
     'widget_tweaks',
-    'hcaptcha',
-    'massadmin',
+    'raven.contrib.django.raven_compat',
 )
 
 MIDDLEWARE = (
+    'raven.contrib.django.raven_compat.middleware.SentryResponseErrorIdMiddleware',
     'django.middleware.security.SecurityMiddleware',
-    'whitenoise.middleware.WhiteNoiseMiddleware',
-    # 'debug_toolbar.middleware.DebugToolbarMiddleware',
+    'debug_toolbar.middleware.DebugToolbarMiddleware',
     'reversion.middleware.RevisionMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
@@ -85,8 +84,6 @@ MIDDLEWARE = (
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
-    'htmlmin.middleware.HtmlMinifyMiddleware',
-    'htmlmin.middleware.MarkRequestMiddleware',
 )
 
 ROOT_URLCONF = 'PyRIGS.urls'
@@ -94,20 +91,18 @@ ROOT_URLCONF = 'PyRIGS.urls'
 WSGI_APPLICATION = 'PyRIGS.wsgi.application'
 
 # Database
+# https://docs.djangoproject.com/en/1.7/ref/settings/#databases
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': str(BASE_DIR / 'db.sqlite3'),
+        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
     }
 }
 
 if not DEBUG:
     import dj_database_url
 
-    if env("FRANKENRIGS_DATABASE_URL") is not None:
-        DATABASES['default'] = dj_database_url.config(env="FRANKENRIGS_DATABASE_URL")
-    else:
-        DATABASES['default'] = dj_database_url.config()
+    DATABASES['default'] = dj_database_url.config()
 
 # Logging
 LOGGING = {
@@ -178,12 +173,12 @@ else:
         }
     }
 
-# Error/performance monitoring
-sentry_sdk.init(
-    dsn=env('SENTRY_DSN', default=""),
-    integrations=[DjangoIntegration()],
-    traces_sample_rate=1.0,
-)
+RAVEN_CONFIG = {
+    '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__))),
+}
 
 # User system
 AUTH_USER_MODEL = 'RIGS.Profile'
@@ -194,21 +189,26 @@ LOGOUT_URL = '/user/logout/'
 
 ACCOUNT_ACTIVATION_DAYS = 7
 
-# CAPTCHA settings
-HCAPTCHA_SITEKEY = env('HCAPTCHA_SITEKEY', '10000000-ffff-ffff-ffff-000000000001')
-HCAPTCHA_SECRET = env('HCAPTCHA_SECRET', '0x0000000000000000000000000000000000000000')
+# reCAPTCHA settings
+RECAPTCHA_PUBLIC_KEY = os.environ.get('RECAPTCHA_PUBLIC_KEY',
+                                      "6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI")  # If not set, use development key
+RECAPTCHA_PRIVATE_KEY = os.environ.get('RECAPTCHA_PRIVATE_KEY',
+                                       "6LeIxAcTAAAAAGG-vFI1TnRWxMZNFuojJ4WifJWe")  # If not set, use development key
+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_PORT = env('EMAIL_PORT', cast=int, default=25)
-    EMAIL_HOST_USER = env('EMAIL_HOST_USER')
-    EMAIL_HOST_PASSWORD = env('EMAIL_HOST_PASSWORD')
-    EMAIL_USE_TLS = env('EMAIL_USE_TLS', cast=bool, default=False)
-    EMAIL_USE_SSL = env('EMAIL_USE_SSL', cast=bool, default=False)
-    DEFAULT_FROM_EMAIL = env('EMAIL_FROM')
+    EMAIL_HOST = os.environ.get('EMAIL_HOST')
+    EMAIL_PORT = int(os.environ.get('EMAIL_PORT', 25))
+    EMAIL_HOST_USER = os.environ.get('EMAIL_HOST_USER')
+    EMAIL_HOST_PASSWORD = os.environ.get('EMAIL_HOST_PASSWORD')
+    EMAIL_USE_TLS = bool(int(os.environ.get('EMAIL_USE_TLS', 0)))
+    EMAIL_USE_SSL = bool(int(os.environ.get('EMAIL_USE_SSL', 0)))
+    DEFAULT_FROM_EMAIL = os.environ.get('EMAIL_FROM')
 else:
     EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
 
@@ -223,28 +223,28 @@ TIME_ZONE = 'Europe/London'
 
 FORMAT_MODULE_PATH = 'PyRIGS.formats'
 
+USE_I18N = True
+
 USE_L10N = True
 
 USE_TZ = True
 
-USE_THOUSAND_SEPARATOR = False
-
 # 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')
 
 # Static files (CSS, JavaScript, Images)
-STATICFILES_STORAGE = 'whitenoise.storage.CompressedManifestStaticFilesStorage'
+STATICFILES_STORAGE = 'django.contrib.staticfiles.storage.ManifestStaticFilesStorage'
 STATIC_URL = '/static/'
-STATIC_ROOT = str(BASE_DIR / 'static/')
-STATICFILES_DIRS = [
-    str(BASE_DIR / 'pipeline/built_assets'),
-]
+STATIC_ROOT = os.path.join(BASE_DIR, 'static/')
+STATIC_DIRS = (
+    os.path.join(BASE_DIR, 'static/')
+)
 
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
         'DIRS': [
-            BASE_DIR / 'templates'
+            os.path.join(BASE_DIR, 'templates')
         ],
         'APP_DIRS': True,
         'OPTIONS': {
@@ -267,12 +267,10 @@ USE_GRAVATAR = True
 
 TERMS_OF_HIRE_URL = "http://www.nottinghamtec.co.uk/terms.pdf"
 AUTHORISATION_NOTIFICATION_ADDRESS = 'productions@nottinghamtec.co.uk'
+RISK_ASSESSMENT_URL = os.environ.get('RISK_ASSESSMENT_URL') if os.environ.get(
+    'RISK_ASSESSMENT_URL') else "http://example.com"
+RISK_ASSESSMENT_SECRET = os.environ.get('RISK_ASSESSMENT_SECRET') if os.environ.get(
+    'RISK_ASSESSMENT_SECRET') else secrets.token_hex(15)
 
-DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
-
-SECURE_HSTS_SECONDS = 3600
-SECURE_HSTS_INCLUDE_SUBDOMAINS = True
-SECURE_CONTENT_TYPE_NOSNIFF = True
-SESSION_COOKIE_SECURE = env('SESSION_COOKIE_SECURE_ENABLED', True)
-CSRF_COOKIE_SECURE = env('CSRF_COOKIE_SECURE_ENABLED', True)
-SECURE_HSTS_PRELOAD = True
+IMGUR_UPLOAD_CLIENT_ID = os.environ.get('IMGUR_UPLOAD_CLIENT_ID', '')
+IMGUR_UPLOAD_CLIENT_SECRET = os.environ.get('IMGUR_UPLOAD_CLIENT_SECRET', '')

PyRIGS/tests/base.py

@@ -1,30 +1,33 @@
-import os
-import pathlib
-import sys
-from datetime import datetime
-
-import pytz
-from django.conf import settings
 from django.test import LiveServerTestCase
 from selenium import webdriver
-from selenium.webdriver.support.wait import WebDriverWait
-
 from RIGS import models as rigsmodels
 from . import pages
-
-from pytest_django.asserts import assertContains
+import os
+import pytz
+from datetime import date, time, datetime, timedelta
+from django.conf import settings
+import imgurpython
+import PyRIGS.settings
+import sys
+import pathlib
+import inspect
 
 
-def create_datetime(year, month, day, hour, minute):
+def create_datetime(year, month, day, hour, min):
     tz = pytz.timezone(settings.TIME_ZONE)
-    return tz.localize(datetime(year, month, day, hour, minute)).astimezone(tz)
+    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")
+    # No caching, please and thank you
+    options.add_argument("--aggressive-cache-discard")
+    options.add_argument("--disk-cache-size=0")
+    # God Save The Queen
+    options.add_argument("--lang=en_GB")
     options.add_argument("--headless")
-    if settings.CI:
+    if os.environ.get('CI', False):
         options.add_argument("--no-sandbox")
     driver = webdriver.Chrome(options=options)
     return driver
@@ -34,7 +37,6 @@ class BaseTest(LiveServerTestCase):
     def setUp(self):
         super().setUpClass()
         self.driver = create_browser()
-        self.wait = WebDriverWait(self.driver, 15)
 
     def tearDown(self):
         super().tearDown()
@@ -48,11 +50,10 @@ class AutoLoginTest(BaseTest):
             username="EventTest", first_name="Event", last_name="Test", initials="ETU", is_superuser=True)
         self.profile.set_password("EventTestPassword")
         self.profile.save()
-        login_page = pages.LoginPage(self.driver, self.live_server_url).open()
-        login_page.login("EventTest", "EventTestPassword")
+        loginPage = pages.LoginPage(self.driver, self.live_server_url).open()
+        loginPage.login("EventTest", "EventTestPassword")
 
 
-# FIXME Refactor as a pytest fixture
 def screenshot_failure(func):
     def wrapper_func(self, *args, **kwargs):
         try:
@@ -63,9 +64,20 @@ def screenshot_failure(func):
             if not pathlib.Path("screenshots").is_dir():
                 os.mkdir("screenshots")
             self.driver.save_screenshot(screenshot_file)
-            print(f"Error in test {screenshot_name} is at path {screenshot_file}", file=sys.stderr)
-            raise e
 
+            if settings.IMGUR_UPLOAD_CLIENT_ID != "":
+                config = {
+                    'album': None,
+                    'name': screenshot_name,
+                    'title': screenshot_name,
+                    'description': ""
+                }
+                client = imgurpython.ImgurClient(settings.IMGUR_UPLOAD_CLIENT_ID, settings.IMGUR_UPLOAD_CLIENT_SECRET)
+                image = client.upload_from_path(screenshot_file, config=config)
+                print("Error in test {} is at url {}".format(screenshot_name, image['link']), file=sys.stderr)
+            else:
+                print("Error in test {} is at path {}".format(screenshot_name, screenshot_file), file=sys.stderr)
+            raise e
     return wrapper_func
 
 
@@ -76,30 +88,12 @@ def screenshot_failure_cls(cls):
     return cls
 
 
-def assert_times_almost_equal(first_time, second_time):
-    assert first_time.replace(microsecond=0, second=0) == second_time.replace(microsecond=0, second=0)
-
-
-def assert_oembed(alt_event_embed_url, alt_oembed_url, client, event_embed_url, event_url, oembed_url):
-    # Test the meta tag is in place
-    response = client.get(event_url, follow=True, HTTP_HOST='example.com')
-    assertContains(response, 'application/json+oembed')
-    assertContains(response, oembed_url)
-    # Test that the JSON exists
-    response = client.get(oembed_url, follow=True, HTTP_HOST='example.com')
-    assert response.status_code == 200
-    assertContains(response, event_embed_url)
-    # Should also work for non-existant events
-    response = client.get(alt_oembed_url, follow=True, HTTP_HOST='example.com')
-    assert response.status_code == 200
-    assertContains(response, alt_event_embed_url)
-
-
-def login(client, django_user_model):
-    pwd = 'testuser'
-    usr = 'TestUser'
-    user = django_user_model.objects.create_user(username=usr, email="TestUser@test.com", password=pwd,
-                                                 is_superuser=True,
-                                                 is_active=True, is_staff=True)
-    assert client.login(username=usr, password=pwd)
-    return user
+# 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,8 +1,8 @@
-from pypom import Page
-from selenium.common.exceptions import NoSuchElementException
+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
 
 
@@ -44,7 +44,6 @@ class FormPage(BasePage):
         submit = self.find_element(*self._submit_locator)
         ActionChains(self.driver).move_to_element(submit).perform()
         submit.click()
-        self.wait.until(animation_is_finished())
         self.wait.until(lambda x: self.errors != previous_errors or self.success)
 
     @property
@@ -74,13 +73,3 @@ class LoginPage(BasePage):
         password_element.send_keys(password)
 
         self.find_element(*self._submit_locator).click()
-
-
-class animation_is_finished():
-    def __call__(self, driver):
-        number_animating = driver.execute_script('return $(":animated").length')
-        finished = number_animating == 0
-        if finished:
-            import time
-            time.sleep(0.1)
-        return finished

PyRIGS/tests/regions.py

@@ -1,12 +1,13 @@
-import datetime
-
-from django.conf import settings
 from pypom import Region
-from selenium.common.exceptions import NoSuchElementException
+from django.utils import timezone
 from selenium.webdriver.common.by import By
-from selenium.webdriver.common.keys import Keys
 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):
@@ -18,22 +19,18 @@ def parse_bool_from_string(string):
     else:
         return False
 
+# 12-Hour vs 24-Hour Time. Affects widget display
+
 
 def get_time_format():
     # Default
-    time_format = "%H%M"
-    if settings.CI:  # The CI is American
-        time_format = "%I%M%p"
+    time_format = "%H:%M"
+    # If system is 12hr
+    if timezone.now().strftime("%p"):
+        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')
@@ -71,11 +68,11 @@ class BootstrapSelectElement(Region):
         self.find_element(*self._deselect_all_locator).click()
 
     def search(self, query):
-        # self.wait.until(expected_conditions.visibility_of_element_located(self._status_locator))
         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
@@ -84,7 +81,7 @@ class BootstrapSelectElement(Region):
         return [self.BootstrapSelectOption(self, i) for i in options]
 
     def set_option(self, name, selected):
-        options = [x for x in self.options if x.name == name]
+        options = list((x for x in self.options if x.name == name))
         assert len(options) == 1
         options[0].set_selected(selected)
 
@@ -117,15 +114,6 @@ class TextBox(Region):
         self.root.send_keys(value)
 
 
-class SimpleMDETextArea(Region):
-    @property
-    def value(self):
-        return self.driver.execute_script("return document.querySelector('#' + arguments[0]).nextSibling.children[1].CodeMirror.getDoc().getValue();", self.root.get_attribute("id"))
-
-    def set_value(self, value):
-        self.driver.execute_script("document.querySelector('#' + arguments[0]).nextSibling.children[1].CodeMirror.getDoc().setValue(arguments[1]);", self.root.get_attribute("id"), value)
-
-
 class CheckBox(Region):
     def toggle(self):
         self.root.click()
@@ -145,7 +133,7 @@ class RadioSelect(Region):  # Currently only works for yes/no radio selects
             value = "0"
         else:
             value = "1"
-        self.find_element(By.XPATH, f"//label[@for='{self.root.get_attribute('id')}_{value}']").click()
+        self.find_element(By.XPATH, "//label[@for='{}_{}']".format(self.root.get_attribute("id"), value)).click()
 
     @property
     def value(self):
@@ -162,13 +150,13 @@ class DatePicker(Region):
 
     def set_value(self, value):
         self.root.clear()
-        self.root.send_keys(value.strftime(get_date_format()))
+        self.root.send_keys(value.strftime("%d%m%Y"))
 
 
 class TimePicker(Region):
     @property
     def value(self):
-        return datetime.datetime.strptime(self.root.get_attribute("value"), "%H:%M")
+        return datetime.datetime.strptime(self.root.get_attribute("value"), get_time_format())
 
     def set_value(self, value):
         self.root.clear()
@@ -178,12 +166,12 @@ class TimePicker(Region):
 class DateTimePicker(Region):
     @property
     def value(self):
-        return datetime.datetime.strptime(self.root.get_attribute("value"), "%Y-%m-%d %H:%M")
+        return datetime.datetime.strptime(self.root.get_attribute("value"), "%Y-%m-%d " + get_time_format())
 
     def set_value(self, value):
         self.root.clear()
 
-        date = value.date().strftime(get_date_format())
+        date = value.date().strftime("%d%m%Y")
         time = value.time().strftime(get_time_format())
 
         self.root.send_keys(date)

PyRIGS/tests/test_unit.py

@@ -1,146 +0,0 @@
-import pytest
-from django.core.management import call_command
-from django.template.defaultfilters import striptags
-from django.urls import URLPattern, URLResolver
-from django.urls import reverse
-from django.urls.exceptions import NoReverseMatch
-from pytest_django.asserts import assertRedirects, assertContains, assertNotContains
-from pytest_django.asserts import assertTemplateUsed, assertInHTML
-
-from PyRIGS import urls
-from RIGS.models import Event, Profile
-from assets.models import Asset
-from training.tests.test_unit import get_response
-from django.db import connection
-from django.template.defaultfilters import striptags
-from django.urls.exceptions import NoReverseMatch
-
-from django.test import TestCase, TransactionTestCase
-from django.test.utils import override_settings
-
-
-def find_urls_recursive(patterns):
-    urls_to_check = []
-    for url in patterns:
-        if isinstance(url, URLResolver):
-            urls_to_check += find_urls_recursive(url.url_patterns)
-        elif isinstance(url, URLPattern):
-            # Skip some things that actually don't need auth (mainly OEmbed JSONs that are essentially just a redirect)
-            if url.name is not None and url.name != "closemodal" and "json" not in str(url):
-                urls_to_check.append(url)
-    return urls_to_check
-
-
-def get_request_url(url):
-    pattern = str(url.pattern)
-    try:
-        kwargz = {}
-        if ":pk>" in pattern:
-            kwargz['pk'] = 1
-        if ":model>" in pattern:
-            kwargz['model'] = "event"
-        return reverse(url.name, kwargs=kwargz)
-    except NoReverseMatch:
-        print("Couldn't test url " + pattern)
-
-
-@pytest.mark.parametrize("command", ['generateSampleAssetsData', 'generateSampleRIGSData', 'generateSampleUserData',
-                                     'deleteSampleData', 'generateSampleTrainingData', 'generate_sample_training_users'])
-def test_production_exception(command):
-    from django.core.management.base import CommandError
-    with pytest.raises(CommandError, match=".*production"):
-        call_command(command)
-
-
-class TestSampleDataGenerator(TestCase):
-    @override_settings(DEBUG=True)
-    def test_sample_data(self):
-        call_command('generateSampleData')
-        assert Asset.objects.all().count() > 50
-        assert Event.objects.all().count() > 100
-        call_command('deleteSampleData')
-        assert not Asset.objects.all().exists()
-        assert not Event.objects.all().exists()
-
-
-@override_settings(DEBUG=True)
-@pytest.mark.skip(reason="broken")
-def test_unauthenticated(client):  # Nothing should be available to the unauthenticated
-    call_command('generateSampleData')
-    for url in find_urls_recursive(urls.urlpatterns):
-        request_url = get_request_url(url)
-        if request_url and 'user' not in request_url:  # User module is full of edge cases
-            response = client.get(request_url, follow=True, HTTP_HOST='example.com')
-            assertContains(response, 'Login')
-            if 'application/json+oembed' in response.content.decode():
-                assertTemplateUsed(response, 'login_redirect.html')
-            else:
-                if "embed" in str(url):
-                    expected_url = f"{reverse('login_embed')}?next={request_url}"
-                else:
-                    expected_url = f"{reverse('login')}?next={request_url}"
-                assertRedirects(response, expected_url)
-    call_command('deleteSampleData')
-
-
-@override_settings(DEBUG=True)
-@pytest.mark.skip(reason="broken")
-def test_basic_access(client):
-    call_command('generateSampleData')
-    assert client.login(username="basic", password="basic")
-
-    url = reverse('asset_list')
-    response = client.get(url)
-    # Check edit and duplicate buttons NOT shown in list
-    assertNotContains(response, 'Edit')
-    assertNotContains(response,
-                      'Duplicate')  # If this line is randomly failing, check the debug toolbar HTML hasn't crept in
-
-    url = reverse('asset_detail', kwargs={'pk': Asset.objects.first().asset_id})
-    response = client.get(url)
-    assertNotContains(response, 'Purchase Details')
-    assertNotContains(response, 'View Revision History')
-
-    urlz = {'asset_history', 'asset_update', 'asset_duplicate'}
-    for url_name in urlz:
-        request_url = reverse(url_name, kwargs={'pk': Asset.objects.first().asset_id})
-        response = client.get(request_url, follow=True)
-        assert response.status_code == 403
-
-    request_url = reverse('supplier_create')
-    response = client.get(request_url, follow=True)
-    assert response.status_code == 403
-
-    request_url = reverse('supplier_update', kwargs={'pk': 1})
-    response = client.get(request_url, follow=True)
-    assert response.status_code == 403
-    client.logout()
-    call_command('deleteSampleData')
-
-
-@override_settings(DEBUG=True)
-@pytest.mark.skip(reason="broken")
-def test_keyholder_access(client):
-    call_command('generateSampleData')
-    assert client.login(username="keyholder", password="keyholder")
-
-    url = reverse('asset_list')
-    response = client.get(url)
-    # Check edit and duplicate buttons shown in list
-    assertContains(response, 'Edit')
-    assertContains(response, 'Duplicate')
-
-    url = reverse('asset_detail', kwargs={'pk': Asset.objects.first().asset_id})
-    response = client.get(url)
-    assertContains(response, 'Purchase Details')
-    assertContains(response, 'View Revision History')
-    client.logout()
-    call_command('deleteSampleData')
-
-
-def test_search(admin_client, admin_user):
-    url = reverse('search')
-    response = admin_client.get(url, {'q': "Definetelynothingfoundifwesearchthis"})
-    assertContains(response, "No results found")
-    response = admin_client.get(url, {'q': admin_user.first_name})
-    assertContains(response, admin_user.first_name)

PyRIGS/urls.py

@@ -1,18 +1,22 @@
-from django.conf import settings
-from django.conf.urls import include
-from django.contrib import admin
-from django.contrib.auth.decorators import login_required
-from django.contrib.staticfiles.urls import staticfiles_urlpatterns
 from django.urls import path
+from django.conf.urls import include, url
+from django.contrib import admin
+from django.contrib.staticfiles.urls import staticfiles_urlpatterns
+from django.contrib.auth.decorators import login_required
+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 = [
     path('', include('versioning.urls')),
     path('', include('RIGS.urls')),
     path('assets/', include('assets.urls')),
-    path('training/', include('training.urls')),
 
     path('', login_required(views.Index.as_view()), name='index'),
 
@@ -23,21 +27,18 @@ urlpatterns = [
          name="api_secure"),
 
     path('closemodal/', views.CloseModal.as_view(), name='closemodal'),
-    path('search/', login_required(views.Search.as_view()), name='search'),
-    path('search_help/', login_required(views.SearchHelp.as_view()), name='search_help'),
+    path('search_help/', views.SearchHelp.as_view(), name='search_help'),
 
     path('', include('users.urls')),
 
-    path('admin/', include('massadmin.urls')),
     path('admin/', admin.site.urls),
-    path("robots.txt", TemplateView.as_view(template_name="robots.txt", content_type="text/plain")),
 ]
 
 if settings.DEBUG:
     urlpatterns += staticfiles_urlpatterns()
 
     import debug_toolbar
-    urlpatterns += [
-        path('__debug__/', include(debug_toolbar.urls)),
+    urlpatterns = [
+        url(r'^__debug__/', include(debug_toolbar.urls)),
         path('bootstrap/', TemplateView.as_view(template_name="bootstrap.html")),
-    ]
+    ] + urlpatterns

PyRIGS/views.py

@@ -1,54 +1,36 @@
-import datetime
-import operator
-import re
-import urllib.error
-import urllib.parse
-import urllib.request
-
-from functools import reduce
-from itertools import chain
-from io import BytesIO
-
-from PyPDF2 import PdfFileMerger, PdfFileReader
-from z3c.rml import rml2pdf
-
-from django.conf import settings
-from django.contrib.auth.decorators import login_required
-from django.contrib import messages
-from django.core import serializers
 from django.core.exceptions import PermissionDenied
-from django.db.models import Q
-from django.http import HttpResponse, JsonResponse
-from django.shortcuts import get_object_or_404
+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.views.decorators.clickjacking import xframe_options_exempt
-from django.template.loader import get_template
-from django.utils import timezone
+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
+from RIGS import models, forms
 from assets import models as asset_models
-from training import models as training_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'
-
-
-def get_related(form, context):  # 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)
-
-
-class Index(generic.TemplateView):  # Displays the current rig count along with a few other bits and pieces
+# Displays the current rig count along with a few other bits and pieces
+class Index(generic.TemplateView):
     template_name = 'index.html'
 
     def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
+        context = super(Index, self).get_context_data(**kwargs)
         context['rig_count'] = models.Event.objects.rig_count()
-        context['now'] = models.Event.objects.events_in_bounds(timezone.now(), timezone.now()).exclude(status=models.Event.CANCELLED).filter(is_rig=True, dry_hire=False)
         return context
 
 
@@ -59,9 +41,7 @@ class SecureAPIRequest(generic.View):
         'organisation': models.Organisation,
         'profile': models.Profile,
         'event': models.Event,
-        'asset': asset_models.Asset,
-        'supplier': asset_models.Supplier,
-        'training_item': training_models.TrainingItem,
+        'supplier': asset_models.Supplier
     }
 
     perms = {
@@ -70,9 +50,7 @@ class SecureAPIRequest(generic.View):
         'organisation': 'RIGS.view_organisation',
         'profile': 'RIGS.view_profile',
         'event': None,
-        'asset': None,
-        'supplier': None,
-        'training_item': None,
+        'supplier': None
     }
 
     '''
@@ -100,9 +78,6 @@ class SecureAPIRequest(generic.View):
         fields = request.GET.get('fields', None)
         if fields:
             fields = fields.split(",")
-        filters = request.GET.get('filters', [])
-        if filters:
-            filters = filters.split(",")
 
         # Supply data for one record
         if pk:
@@ -123,35 +98,27 @@ class SecureAPIRequest(generic.View):
                 for field in fields:
                     q = Q(**{field + "__icontains": part})
                     qs.append(q)
-
                 queries.append(reduce(operator.or_, qs))
 
-            for f in filters:
-                q = Q(**{f: True})
-                queries.append(q)
-
             # Build the data response list
             results = []
             query = reduce(operator.and_, queries)
             objects = self.models[model].objects.filter(query)
-            # Returning unactivated or unapproved users when they are elsewhere filtered out of the default queryset leads to some *very* unexpected results
-            if model == "profile":
-                objects = objects.filter(is_active=True, is_approved=True)
             for o in objects:
-                name = o.display_name if hasattr(o, 'display_name') else o.name
                 data = {
                     'pk': o.pk,
                     'value': o.pk,
-                    'text': name,
+                    'text': o.name,
                 }
                 try:  # See if there is a valid update URL
-                    data['update'] = reverse(f"{model}_update", kwargs={'pk': o.pk})
+                    data['update'] = reverse("%s_update" % model, kwargs={'pk': o.pk})
                 except NoReverseMatch:
                     pass
                 results.append(data)
 
             # return a data response
-            return JsonResponse(results, safe=False)
+            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)
@@ -176,18 +143,19 @@ class SecureAPIRequest(generic.View):
                 }
 
                 results.append(data)
-            return JsonResponse(results, safe=False)
+            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):
+        if self.request.is_ajax():
             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, f"modalobject[0]['update_url']='{update_url}'")
+            messages.info(self.request, "modalobject[0]['update_url']='" + update_url + "'")
         else:
             url = reverse_lazy(detail, kwargs={
                 'pk': self.object.pk,
@@ -200,14 +168,27 @@ class GenericListView(generic.ListView):
     paginate_by = 20
 
     def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
+        context = super(GenericListView, self).get_context_data(**kwargs)
         context['page_title'] = self.model.__name__ + "s"
-        if is_ajax(self.request):
+        if self.request.is_ajax():
             context['override'] = "base_ajax.html"
         return context
 
     def get_queryset(self):
-        object_list = self.model.objects.search(query=self.request.GET.get('q', ""))
+        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 != "":
@@ -219,9 +200,9 @@ class GenericDetailView(generic.DetailView):
     template_name = "generic_detail.html"
 
     def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        context['page_title'] = f"{self.model.__name__} | {self.object.name}"
-        if is_ajax(self.request):
+        context = super(GenericDetailView, self).get_context_data(**kwargs)
+        context['page_title'] = "{} | {}".format(self.model.__name__, self.object.name)
+        if self.request.is_ajax():
             context['override'] = "base_ajax.html"
         return context
 
@@ -230,9 +211,9 @@ class GenericUpdateView(generic.UpdateView):
     template_name = "generic_form.html"
 
     def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        context['page_title'] = f"Edit {self.model.__name__}"
-        if is_ajax(self.request):
+        context = super(GenericUpdateView, self).get_context_data(**kwargs)
+        context['page_title'] = "Edit {}".format(self.model.__name__)
+        if self.request.is_ajax():
             context['override'] = "base_ajax.html"
         return context
 
@@ -241,145 +222,26 @@ class GenericCreateView(generic.CreateView):
     template_name = "generic_form.html"
 
     def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        context['page_title'] = f"Create {self.model.__name__}"
-        if is_ajax(self.request):
+        context = super(GenericCreateView, self).get_context_data(**kwargs)
+        context['page_title'] = "Create {}".format(self.model.__name__)
+        if self.request.is_ajax():
             context['override'] = "base_ajax.html"
         return context
 
 
-class Search(generic.ListView):
-    template_name = 'search_results.html'
-    paginate_by = 20
-    count = 0
-
-    def get_context_data(self, *args, **kwargs):
-        context = super().get_context_data(*args, **kwargs)
-        context['count'] = self.count or 0
-        context['query'] = self.request.GET.get('q')
-        context['page_title'] = f"{context['count']} search results for <b>{context['query']}</b>"
-        return context
-
-    def get_queryset(self):
-        request = self.request
-        query = request.GET.get('q', None)
-
-        if query is not None:
-            event_results = models.Event.objects.search(query)
-            person_results = models.Person.objects.search(query)
-            organisation_results = models.Organisation.objects.search(query)
-            venue_results = models.Venue.objects.search(query)
-            invoice_results = models.Invoice.objects.search(query)
-            asset_results = asset_models.Asset.objects.search(query)
-            supplier_results = asset_models.Supplier.objects.search(query)
-            trainee_results = training_models.Trainee.objects.search(query)
-            training_item_results = training_models.TrainingItem.objects.search(query)
-
-            # combine querysets
-            queryset_chain = chain(
-                event_results,
-                person_results,
-                organisation_results,
-                venue_results,
-                invoice_results,
-                asset_results,
-                supplier_results,
-                trainee_results,
-                training_item_results,
-            )
-            qs = sorted(queryset_chain,
-                        key=lambda instance: instance.pk,
-                        reverse=True)
-            self.count = len(qs)  # since qs is actually a list
-            return qs
-        return models.Event.objects.none()  # just an empty queryset as default
-
-
 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):
-    """
-    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.
-    """
     template_name = 'closemodal.html'
 
     def get_context_data(self, **kwargs):
         return {'messages': messages.get_messages(self.request)}
-
-
-class OEmbedView(generic.View):
-    def get(self, request, pk=None):
-        embed_url = reverse(self.url_name, args=[pk])
-        full_url = f"{request.scheme}://{request.META['HTTP_HOST']}{embed_url}"
-
-        data = {
-            'html': f'<iframe src="{full_url}" frameborder="0" width="100%" height="250"></iframe>',
-            'version': '1.0',
-            'type': 'rich',
-            'height': '250'
-        }
-
-        return JsonResponse(data)
-
-
-def get_info_string(user):
-    user_str = f"by {user.name} " if user else ""
-    time = timezone.now().strftime('%d/%m/%Y %H:%I')
-    return f"[Paperwork generated {user_str}on {time}"
-
-
-def render_pdf_response(template, context, append_terms):
-    merger = PdfFileMerger()
-    rml = template.render(context)
-    buffer = rml2pdf.parseString(rml)
-    merger.append(PdfFileReader(buffer))
-    buffer.close()
-
-    if append_terms:
-        terms = urllib.request.urlopen(settings.TERMS_OF_HIRE_URL)
-        merger.append(BytesIO(terms.read()))
-
-    merged = BytesIO()
-    merger.write(merged)
-
-    response = HttpResponse(content_type='application/pdf')
-    f = context['filename']
-    response['Content-Disposition'] = f'filename="{f}"'
-    response.write(merged.getvalue())
-    return response
-
-
-class PrintView(generic.View):
-    append_terms = False
-
-    def get_context_data(self, **kwargs):
-        obj = get_object_or_404(self.model, pk=self.kwargs['pk'])
-        object_name = re.sub(r'[^a-zA-Z0-9 \n\.]', '', obj.name)
-
-        context = {
-            'object': obj,
-            'current_user': self.request.user,
-            'object_name': object_name,
-            'info_string': get_info_string(self.request.user) + f"- {obj.current_version_id}]",
-        }
-
-        return context
-
-    def get(self, request, pk):
-        return render_pdf_response(get_template(self.template_name), self.get_context_data(), self.append_terms)
-
-
-class PrintListView(generic.ListView):
-    def get_context_data(self, *args, **kwargs):
-        context = super().get_context_data(*args, **kwargs)
-        context['current_user'] = self.request.user
-        context['info_string'] = get_info_string(self.request.user) + "]"
-        return context
-
-    def get(self, request):
-        self.object_list = self.get_queryset()
-        return render_pdf_response(get_template(self.template_name), self.get_context_data(), False)

README.md

@@ -1,7 +1,6 @@
 # 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=master)](https://travis-ci.org/nottinghamtec/PyRIGS)
 [![Coverage Status](https://coveralls.io/repos/github/nottinghamtec/PyRIGS/badge.svg)](https://coveralls.io/github/nottinghamtec/PyRIGS)
-[![Maintainability](https://api.codeclimate.com/v1/badges/79ca3b8106911a1d143f/maintainability)](https://codeclimate.com/github/nottinghamtec/PyRIGS/maintainability)
 
 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.
 
@@ -11,9 +10,8 @@ For setup information and other such helpful stuff check the [Wiki](https://gith
 - PyRIGS: Base app, stores 'global' information
 - RIGS: Rigboard stuff - event calendar etc
 - assets: Database of our kit, testing data etc
-- training: Logs in-house training within various "departments" (sound, lighting 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)

RIGS/__init__.py

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

RIGS/admin.py

@@ -1,162 +1,38 @@
 from django.contrib import admin
-from django.contrib import messages
-from django.contrib.admin import helpers
+from RIGS import models, forms
+from users import forms as user_forms
 from django.contrib.auth.admin import UserAdmin
-from django.core.exceptions import ObjectDoesNotExist
-from django.db import transaction
-from django.db.models import Count
-from django.forms import ModelForm
-from django.template.response import TemplateResponse
 from django.utils.translation import gettext_lazy as _
-from django.db import IntegrityError
-from reversion import revisions as reversion
 from reversion.admin import VersionAdmin
 
-from RIGS import models
-from users import forms as user_forms
+from django.contrib.admin import helpers
+from django.template.response import TemplateResponse
+from django.contrib import messages
+from django.db import transaction
+from django.core.exceptions import ObjectDoesNotExist
+from django.db.models import Count
+from django.forms import ModelForm
 
+from reversion import revisions as reversion
 
+# Register your models here.
 admin.site.register(models.VatRate, VersionAdmin)
 admin.site.register(models.Event, VersionAdmin)
 admin.site.register(models.EventItem, VersionAdmin)
 admin.site.register(models.Invoice, VersionAdmin)
-admin.site.register(models.EventCheckIn)
 
 
-@transaction.atomic()  # Copied from django-extensions. GenericForeignKey support removed as unnecessary.
-def merge_model_instances(primary_object, alias_objects):
-    """
-    Merge several model instances into one, the `primary_object`.
-    Use this function to merge model objects and migrate all of the related
-    fields from the alias objects the primary object.
-    """
-
-    # get related fields
-    related_fields = list(filter(
-        lambda x: x.is_relation is True,
-        primary_object._meta.get_fields()))
-
-    many_to_many_fields = list(filter(
-        lambda x: x.many_to_many is True, related_fields))
-
-    related_fields = list(filter(
-        lambda x: x.many_to_many is False, related_fields))
-
-    # Loop through all alias objects and migrate their references to the
-    # primary object
-    deleted_objects = []
-    deleted_objects_count = 0
-    for alias_object in alias_objects:
-        # Migrate all foreign key references from alias object to primary
-        # object.
-        for many_to_many_field in many_to_many_fields:
-            alias_varname = many_to_many_field.name
-            related_objects = getattr(alias_object, alias_varname)
-            for obj in related_objects.all():
-                try:
-                    # Handle regular M2M relationships.
-                    getattr(alias_object, alias_varname).remove(obj)
-                    getattr(primary_object, alias_varname).add(obj)
-                except AttributeError:
-                    # Handle M2M relationships with a 'through' model.
-                    # This does not delete the 'through model.
-                    # TODO: Allow the user to delete a duplicate 'through' model.
-                    through_model = getattr(alias_object, alias_varname).through
-                    kwargs = {
-                        many_to_many_field.m2m_reverse_field_name(): obj,
-                        many_to_many_field.m2m_field_name(): alias_object,
-                    }
-                    through_model_instances = through_model.objects.filter(**kwargs)
-                    for instance in through_model_instances:
-                        # Re-attach the through model to the primary_object
-                        setattr(
-                            instance,
-                            many_to_many_field.m2m_field_name(),
-                            primary_object)
-                        instance.save()
-                        # TODO: Here, try to delete duplicate instances that are
-                        # disallowed by a unique_together constraint
-
-        for related_field in related_fields:
-            if related_field.one_to_many:
-                with transaction.atomic():
-                    try:
-                        alias_varname = related_field.get_accessor_name()
-                        related_objects = getattr(alias_object, alias_varname)
-                        for obj in related_objects.all():
-                            field_name = related_field.field.name
-                            setattr(obj, field_name, primary_object)
-                            obj.save()
-                    except IntegrityError:
-                        pass  # Skip to avoid integrity error from unique_together
-            elif related_field.one_to_one or related_field.many_to_one:
-                alias_varname = related_field.name
-                if hasattr(alias_object, alias_varname):
-                    related_object = getattr(alias_object, alias_varname)
-                    primary_related_object = getattr(primary_object, alias_varname)
-                    if primary_related_object is None:
-                        setattr(primary_object, alias_varname, related_object)
-                        primary_object.save()
-                    elif related_field.one_to_one:
-                        related_object.delete()
-
-        if alias_object.id:
-            deleted_objects += [alias_object]
-            alias_object.delete()
-            deleted_objects_count += 1
-
-    return primary_object, deleted_objects, deleted_objects_count
+def approve_user(modeladmin, request, queryset):
+    queryset.update(is_approved=True)
 
 
-class AssociateAdmin(VersionAdmin):
-    search_fields = ['id', 'name']
-    list_display_links = ['id', 'name']
-    actions = ['merge']
-
-    def get_queryset(self, request):
-        return super().get_queryset(request).annotate(event_count=Count('event'))
-
-    def number_of_events(self, obj):
-        return obj.latest_events.count()
-
-    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?
-            try:
-                master_object_pk = request.POST.get('master')
-                master_object = queryset.get(pk=master_object_pk)
-            except ObjectDoesNotExist:
-                self.message_user(request, "An error occured. Did you select a 'master' record?", level=messages.ERROR)
-                return
-
-            primary_object, deleted_objects, deleted_objects_count = merge_model_instances(master_object, queryset.exclude(pk=master_object_pk).all())
-            reversion.set_comment('Merging Objects')
-            self.message_user(request, f"Objects successfully merged. {deleted_objects_count} old objects deleted.")
-        else:  # Present the confirmation screen
-            class TempForm(ModelForm):
-                class Meta:
-                    model = queryset.model
-                    fields = self.merge_fields
-
-            forms = []
-            for obj in queryset:
-                forms.append(TempForm(instance=obj))
-
-            context = {
-                'title': _("Are you sure?"),
-                'queryset': queryset,
-                'action_checkbox_name': helpers.ACTION_CHECKBOX_NAME,
-                'forms': forms
-            }
-            return TemplateResponse(request, 'admin_associate_merge.html', context)
+approve_user.short_description = "Approve selected users"
 
 
 @admin.register(models.Profile)
-class ProfileAdmin(UserAdmin, AssociateAdmin):
-    list_display = ('username', 'name', 'is_approved', 'is_superuser', 'is_supervisor', 'number_of_events', 'last_login', 'date_joined')
-    list_display_links = ['username']
-    list_filter = UserAdmin.list_filter + ('is_approved', 'date_joined')
+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'), {
@@ -174,12 +50,62 @@ class ProfileAdmin(UserAdmin, AssociateAdmin):
     )
     form = user_forms.ProfileChangeForm
     add_form = user_forms.ProfileCreationForm
-    actions = ['approve_user', 'merge']
+    actions = [approve_user]
 
-    merge_fields = ['username', 'first_name', 'last_name', 'initials', 'email', 'phone', 'is_supervisor']
 
-    def approve_user(modeladmin, request, queryset):
-        queryset.update(is_approved=True)
+class AssociateAdmin(VersionAdmin):
+    list_display = ('id', 'name', 'number_of_events')
+    search_fields = ['id', 'name']
+    list_display_links = ['id', 'name']
+    actions = ['merge']
+
+    merge_fields = ['name']
+
+    def get_queryset(self, request):
+        return super(AssociateAdmin, self).get_queryset(request).annotate(event_count=Count('event'))
+
+    def number_of_events(self, obj):
+        return obj.latest_events.count()
+
+    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?
+            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)
+                return
+
+            with transaction.atomic(), reversion.create_revision():
+                for obj in queryset.exclude(pk=masterObjectPk):
+                    events = obj.event_set.all()
+                    for event in events:
+                        masterObject.event_set.add(event)
+                    obj.delete()
+                reversion.set_comment('Merging Objects')
+
+            self.message_user(request, "Objects successfully merged.")
+            return
+        else:  # Present the confirmation screen
+
+            class TempForm(ModelForm):
+                class Meta:
+                    model = queryset.model
+                    fields = self.merge_fields
+
+            forms = []
+            for obj in queryset:
+                forms.append(TempForm(instance=obj))
+
+            context = {
+                'title': _("Are you sure?"),
+                'queryset': queryset,
+                'action_checkbox_name': helpers.ACTION_CHECKBOX_NAME,
+                'forms': forms
+            }
+            return TemplateResponse(request, 'admin_associate_merge.html', context)
 
 
 @admin.register(models.Person)
@@ -208,8 +134,3 @@ class RiskAssessmentAdmin(VersionAdmin):
 @admin.register(models.EventChecklist)
 class EventChecklistAdmin(VersionAdmin):
     list_display = ('id', 'event', 'reviewed_at', 'reviewed_by')
-
-
-@admin.register(models.PowerTestRecord)
-class EventChecklistAdmin(VersionAdmin):
-    list_display = ('id', 'event', 'reviewed_at', 'reviewed_by')

RIGS/finance.py

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

RIGS/forms.py

@@ -1,15 +1,19 @@
-from datetime import datetime, timedelta
-
-import simplejson
 from django import forms
+from django.utils import formats
 from django.conf import settings
 from django.core import serializers
-from django.utils import timezone
-from django.utils.html import format_html
+from django.core.mail import EmailMessage, EmailMultiAlternatives
+from django.contrib.auth.forms import UserCreationForm, UserChangeForm, AuthenticationForm, PasswordResetForm
+from django.db import transaction
+from registration.forms import RegistrationFormUniqueEmail
+from django.contrib.auth.forms import AuthenticationForm
+from captcha.fields import ReCaptchaField
 from reversion import revisions as reversion
+import simplejson
+from datetime import datetime
+from django.utils import timezone
 
 from RIGS import models
-from training.models import TrainingLevel
 
 # Override the django form defaults to use the HTML date/time/datetime UI elements
 forms.DateField.widget = forms.DateInput(attrs={'type': 'date'})
@@ -22,7 +26,6 @@ class EventForm(forms.ModelForm):
     datetime_input_formats = list(settings.DATETIME_INPUT_FORMATS)
     meet_at = forms.DateTimeField(input_formats=datetime_input_formats, required=False)
     access_at = forms.DateTimeField(input_formats=datetime_input_formats, required=False)
-    parking_and_access = forms.BooleanField(label="Additional parking or access requirements (i.e. campus parking permits, wristbands)?", required=False)
 
     items_json = forms.CharField()
 
@@ -46,7 +49,7 @@ class EventForm(forms.ModelForm):
         return simplejson.dumps(items)
 
     def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
+        super(EventForm, self).__init__(*args, **kwargs)
 
         self.fields['items_json'].initial = self._get_items_json
         self.fields['start_date'].widget.format = '%Y-%m-%d'
@@ -99,13 +102,10 @@ class EventForm(forms.ModelForm):
             raise forms.ValidationError(
                 'You haven\'t provided any client contact details. Please add a person or organisation.',
                 code='contact')
-        access = self.cleaned_data.get("access_at")
-        if 'warn-access' not in self.data and access is not None and access.date() < (self.cleaned_data.get("start_date") - timedelta(days=7)):
-            raise forms.ValidationError(format_html("Are you sure about that? Your access time seems a bit optimistic. If you're sure, save again. <input type='hidden' id='warn-access' name='warn-access' value='0'/>"), code='access_sanity')
-        return super().clean()
+        return super(EventForm, self).clean()
 
     def save(self, commit=True):
-        m = super().save(commit=False)
+        m = super(EventForm, self).save(commit=False)
 
         if (commit):
             m.save()
@@ -126,7 +126,7 @@ 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', 'forum_url', 'parking_and_access']
+                  'purchase_order', 'collector']
 
 
 class BaseClientEventAuthorisationForm(forms.ModelForm):
@@ -136,7 +136,7 @@ class BaseClientEventAuthorisationForm(forms.ModelForm):
     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().clean()
+        return super(BaseClientEventAuthorisationForm, self).clean()
 
     class Meta:
         abstract = True
@@ -144,7 +144,7 @@ class BaseClientEventAuthorisationForm(forms.ModelForm):
 
 class InternalClientEventAuthorisationForm(BaseClientEventAuthorisationForm):
     def __init__(self, **kwargs):
-        super().__init__(**kwargs)
+        super(InternalClientEventAuthorisationForm, self).__init__(**kwargs)
         self.fields['uni_id'].required = True
         self.fields['account_code'].required = True
 
@@ -158,12 +158,8 @@ class EventAuthorisationRequestForm(forms.Form):
 
 
 class EventRiskAssessmentForm(forms.ModelForm):
-    related_models = {
-        'power_mic': models.Profile,
-    }
-
     def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
+        super(EventRiskAssessmentForm, self).__init__(*args, **kwargs)
         for name, field in self.fields.items():
             if str(name) == 'supervisor_consulted':
                 field.widget = forms.CheckboxInput()
@@ -174,17 +170,14 @@ class EventRiskAssessmentForm(forms.ModelForm):
                 ], attrs={'class': 'custom-control-input', 'required': 'true'})
 
     def clean(self):
-        if self.cleaned_data.get('big_power'):
-            if not self.cleaned_data.get('power_mic').level_qualifications.filter(level__department=TrainingLevel.POWER).exists():
-                self.add_error('power_mic', forms.ValidationError("Your Power MIC must be a Power Technician.", code="power_tech_required"))
         # Check expected values
         unexpected_values = []
         for field, value in models.RiskAssessment.expected_values.items():
             if self.cleaned_data.get(field) != value:
-                unexpected_values.append(f"<li>{self._meta.model._meta.get_field(field).help_text}</li>")
+                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(f"Your answers to these questions: <ul>{''.join([str(elem) for elem in unexpected_values])}</ul> require consulting with a supervisor.", code='unusual_answers')
-        return super().clean()
+            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
@@ -194,55 +187,97 @@ class EventRiskAssessmentForm(forms.ModelForm):
 
 class EventChecklistForm(forms.ModelForm):
     def __init__(self, *args, **kwargs):
-        super().__init__(*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()
-
-    related_models = {
-        'venue': models.Venue,
-    }
-
-    class Meta:
-        model = models.EventChecklist
-        fields = '__all__'
-        exclude = ['reviewed_at', 'reviewed_by']
-
-
-class PowerTestRecordForm(forms.ModelForm):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        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.PowerTestRecord
+        model = models.EventChecklist
         fields = '__all__'
         exclude = ['reviewed_at', 'reviewed_by']
-
-
-class EventCheckInForm(forms.ModelForm):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.fields['time'].initial = timezone.now()
-        self.fields['role'].initial = "Crew"
-
-    class Meta:
-        model = models.EventCheckIn
-        fields = '__all__'
-        exclude = ['end_time']
-
-
-class EditCheckInForm(forms.ModelForm):
-    class Meta:
-        model = models.EventCheckIn
-        fields = '__all__'

RIGS/hs.py

@@ -0,0 +1,217 @@
+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,11 +1,12 @@
-import datetime
-
-import pytz
-from django.conf import settings
-from django.db.models import Q
+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
 
-from RIGS import models
+import datetime
+import pytz
 
 
 class CalendarICS(ICalFeed):
@@ -24,7 +25,6 @@ class CalendarICS(ICalFeed):
     # Rig = 'rig' = True
     # Provisional = 'provisional' = True
     # Confirmed/Booked = 'confirmed' = True
-    # Only MIC = 'mic' = False
 
     def get_object(self, request, *args, **kwargs):
         params = {}
@@ -36,9 +36,6 @@ class CalendarICS(ICalFeed):
         params['cancelled'] = request.GET.get('cancelled', 'false') == 'true'
         params['provisional'] = request.GET.get('provisional', 'true') == 'true'
         params['confirmed'] = request.GET.get('confirmed', 'true') == 'true'
-        params['only_mic'] = request.GET.get('only_mic', 'false') == 'true'
-
-        params['user'] = kwargs['user']
 
         return params
 
@@ -77,9 +74,6 @@ class CalendarICS(ICalFeed):
 
         filter = filter & typeFilters & statusFilters
 
-        if params['only_mic']:
-            filter = filter & Q(mic=params['user'])
-
         return models.Event.objects.filter(filter).order_by('-start_date').select_related('person', 'organisation',
                                                                                           'venue', 'mic')
 
@@ -100,7 +94,7 @@ class CalendarICS(ICalFeed):
         title += item.name
 
         # Add the status
-        title += f' ({item.get_status_display()})'
+        title += ' (' + str(item.get_status_display()) + ')'
 
         return title
 
@@ -108,8 +102,9 @@ 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
-        #    return item.latest_time + datetime.timedelta(days=1)
+        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
 
     def item_location(self, item):
@@ -121,13 +116,13 @@ class CalendarICS(ICalFeed):
 
         tz = pytz.timezone(self.timezone)
 
-        desc = f'Rig ID = {item.display_id}\n'
-        desc += f'Event = {item.name}\n'
+        desc = 'Rig ID = ' + str(item.pk) + '\n'
+        desc += 'Event = ' + item.name + '\n'
         desc += 'Venue = ' + (item.venue.name if item.venue else '---') + '\n'
         if item.is_rig and item.person:
             desc += 'Client = ' + item.person.name + (
                 (' for ' + item.organisation.name) if item.organisation else '') + '\n'
-        desc += f'Status = {item.get_status_display()}\n'
+        desc += 'Status = ' + str(item.get_status_display()) + '\n'
         desc += 'MIC = ' + (item.mic.name if item.mic else '---') + '\n'
 
         desc += '\n'
@@ -146,18 +141,23 @@ class CalendarICS(ICalFeed):
 
         desc += '\n'
         if item.description:
-            desc += f'Event Description:\n{item.description}\n\n'
+            desc += 'Event Description:\n' + item.description + '\n\n'
         # if item.notes:  // Need to add proper keyholder checks before this gets put back
         #     desc += 'Notes:\n'+item.notes+'\n\n'
 
-        desc += f'URL = https://rigs.nottinghamtec.co.uk{item.get_absolute_url()}'
+        base_url = "https://rigs.nottinghamtec.co.uk"
+        desc += 'URL = ' + base_url + str(item.get_absolute_url())
 
         return desc
 
     def item_link(self, item):
         # Make a link to the event in the web interface
+        # base_url = "https://pyrigs.nottinghamtec.co.uk"
         return item.get_absolute_url()
 
+    # def item_created(self, item):  #TODO - Implement created date-time (using django-reversion?) - not really necessary though
+    #     return ''
+
     def item_updated(self, item):  # some ical clients will display this
         return item.last_edited_at
 

RIGS/management/commands/deleteSampleData.py

@@ -1,43 +0,0 @@
-from django.core.management.base import BaseCommand, CommandError
-
-from django.contrib.auth.models import Group
-from assets import models
-from RIGS import models as rigsmodels
-from training import models as tmodels
-
-
-class Command(BaseCommand):
-    help = 'Deletes testing sample data'
-
-    def handle(self, *args, **kwargs):
-        from django.conf import settings
-
-        if not settings.DEBUG:
-            raise CommandError('You cannot run this command in production')
-
-        self.delete_objects(models.AssetCategory)
-        self.delete_objects(models.AssetStatus)
-        self.delete_objects(models.Supplier)
-        self.delete_objects(models.Connector)
-        self.delete_objects(models.Asset)
-        self.delete_objects(rigsmodels.VatRate)
-        self.delete_objects(rigsmodels.Profile)
-        self.delete_objects(rigsmodels.Person)
-        self.delete_objects(rigsmodels.Organisation)
-        self.delete_objects(rigsmodels.Venue)
-        self.delete_objects(Group)
-        self.delete_objects(rigsmodels.Event)
-        self.delete_objects(rigsmodels.EventItem)
-        self.delete_objects(rigsmodels.Invoice)
-        self.delete_objects(rigsmodels.Payment)
-        self.delete_objects(rigsmodels.RiskAssessment)
-        self.delete_objects(rigsmodels.EventChecklist)
-        self.delete_objects(tmodels.TrainingCategory)
-        self.delete_objects(tmodels.TrainingItem)
-        self.delete_objects(tmodels.TrainingLevel)
-        self.delete_objects(tmodels.TrainingItemQualification)
-        self.delete_objects(tmodels.TrainingLevelRequirement)
-
-    def delete_objects(self, model):
-        for obj in model.objects.all():
-            obj.delete()

RIGS/management/commands/generateSampleData.py

@@ -1,7 +1,5 @@
+from django.core.management.base import BaseCommand, CommandError
 from django.core.management import call_command
-from django.core.management.base import BaseCommand
-
-from RIGS import models
 
 
 class Command(BaseCommand):
@@ -9,7 +7,5 @@ class Command(BaseCommand):
     can_import_settings = True
 
     def handle(self, *args, **options):
-        call_command('generateSampleUserData')
         call_command('generateSampleRIGSData')
         call_command('generateSampleAssetsData')
-        call_command('generateSampleTrainingData')

RIGS/management/commands/generateSampleRIGSData.py

@@ -1,12 +1,11 @@
+from django.core.management.base import BaseCommand, CommandError
+from django.contrib.auth.models import Group, Permission
+from django.db import transaction
+from reversion import revisions as reversion
+
 import datetime
 import random
 
-from django.contrib.auth.models import Group, Permission
-from django.core.management.base import BaseCommand, CommandError
-from django.db import transaction
-from django.utils import timezone
-from reversion import revisions as reversion
-
 from RIGS import models
 
 
@@ -17,11 +16,13 @@ class Command(BaseCommand):
     people = []
     organisations = []
     venues = []
-    events = []
-    profiles = models.Profile.objects.all()
+    profiles = []
+
+    keyholder_group = None
+    finance_group = None
+    hs_group = None
 
     def handle(self, *args, **options):
-        print("Generating rigboard data")
         from django.conf import settings
 
         if not (settings.DEBUG or settings.STAGING):
@@ -32,13 +33,20 @@ class Command(BaseCommand):
 
         with transaction.atomic():
             models.VatRate.objects.create(start_at='2014-03-05', rate=0.20, comment='test1')
-            self.setup_people()
-            self.setup_organisations()
-            self.setup_venues()
-            self.setup_events()
-        print("Done generating rigboard data")
 
-    def setup_people(self):
+            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",
@@ -53,25 +61,25 @@ class Command(BaseCommand):
                  "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(models.Profile.objects.all()))
-                person = models.Person.objects.create(name=name)
+                reversion.set_user(random.choice(self.profiles))
 
+                newPerson = models.Person.objects.create(name=name)
                 if i % 3 == 0:
-                    person.email = "address@person.com"
+                    newPerson.email = "address@person.com"
 
                 if i % 5 == 0:
-                    person.notes = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua"
+                    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:
-                    person.address = "1 Person Test Street \n Demoton \n United States of TEC \n RMRF 567"
+                    newPerson.address = "1 Person Test Street \n Demoton \n United States of TEC \n RMRF 567"
 
                 if i % 9 == 0:
-                    person.phone = "01234 567894"
+                    newPerson.phone = "01234 567894"
 
-                person.save()
-                self.people.append(person)
+                newPerson.save()
+                self.people.append(newPerson)
 
-    def setup_organisations(self):
+    def setupOrganisations(self):
         names = ["Acme, inc.", "Widget Corp", "123 Warehousing", "Demo Company", "Smith and Co.", "Foo Bars",
                  "ABC Telecom", "Fake Brothers", "QWERTY Logistics", "Demo, inc.", "Sample Company", "Sample, inc",
                  "Acme Corp", "Allied Biscuit", "Ankh-Sto Associates", "Extensive Enterprise", "Galaxy Corp",
@@ -100,28 +108,27 @@ class Command(BaseCommand):
                  "Tip Top Cafe", "Moes Tavern", "Central Perk", "Chasers"]  # noqa
         for i, name in enumerate(names):
             with reversion.create_revision():
-                reversion.set_user(random.choice(models.Profile.objects.all()))
-                new_organisation = models.Organisation.objects.create(name=name)
-
+                reversion.set_user(random.choice(self.profiles))
+                newOrganisation = models.Organisation.objects.create(name=name)
                 if i % 2 == 0:
-                    new_organisation.has_su_account = True
+                    newOrganisation.has_su_account = True
 
                 if i % 3 == 0:
-                    new_organisation.email = "address@organisation.com"
+                    newOrganisation.email = "address@organisation.com"
 
                 if i % 5 == 0:
-                    new_organisation.notes = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua"
+                    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:
-                    new_organisation.address = "1 Organisation Test Street \n Demoton \n United States of TEC \n RMRF 567"
+                    newOrganisation.address = "1 Organisation Test Street \n Demoton \n United States of TEC \n RMRF 567"
 
                 if i % 9 == 0:
-                    new_organisation.phone = "01234 567894"
+                    newOrganisation.phone = "01234 567894"
 
-                new_organisation.save()
-                self.organisations.append(new_organisation)
+                newOrganisation.save()
+                self.organisations.append(newOrganisation)
 
-    def setup_venues(self):
+    def setupVenues(self):
         names = ["Bear Island", "Crossroads Inn", "Deepwood Motte", "The Dreadfort", "The Eyrie", "Greywater Watch",
                  "The Iron Islands", "Karhold", "Moat Cailin", "Oldstones", "Raventree Hall", "Riverlands",
                  "The Ruby Ford", "Saltpans", "Seagard", "Torrhen's Square", "The Trident", "The Twins",
@@ -137,27 +144,108 @@ class Command(BaseCommand):
         for i, name in enumerate(names):
             with reversion.create_revision():
                 reversion.set_user(random.choice(self.profiles))
-                new_venue = models.Venue.objects.create(name=name)
-
+                newVenue = models.Venue.objects.create(name=name)
                 if i % 2 == 0:
-                    new_venue.three_phase_available = True
+                    newVenue.three_phase_available = True
 
                 if i % 3 == 0:
-                    new_venue.email = "address@venue.com"
+                    newVenue.email = "address@venue.com"
 
                 if i % 5 == 0:
-                    new_venue.notes = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua"
+                    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:
-                    new_venue.address = "1 Venue Test Street \n Demoton \n United States of TEC \n RMRF 567"
+                    newVenue.address = "1 Venue Test Street \n Demoton \n United States of TEC \n RMRF 567"
 
                 if i % 9 == 0:
-                    new_venue.phone = "01234 567894"
+                    newVenue.phone = "01234 567894"
 
-                new_venue.save()
-                self.venues.append(new_venue)
+                newVenue.save()
+                self.venues.append(newVenue)
 
-    def setup_events(self):
+    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",
@@ -168,7 +256,7 @@ class Command(BaseCommand):
         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!"]
 
-        item_options = [
+        itemOptions = [
             {'name': 'Speakers', 'description': 'Some really really big speakers \n these are very loud', 'quantity': 2,
              'cost': 200.00},
             {'name': 'Projector',
@@ -185,7 +273,7 @@ class Command(BaseCommand):
             {'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}]
 
-        day_delta = -120  # start adding events from 4 months ago
+        dayDelta = -120  # start adding events from 4 months ago
 
         for i in range(150):  # Let's add 100 events
             with reversion.create_revision():
@@ -193,99 +281,65 @@ class Command(BaseCommand):
 
                 name = names[i % len(names)]
 
-                start_date = datetime.date.today() + datetime.timedelta(days=day_delta)
-                day_delta = day_delta + random.randint(0, 3)
+                startDate = datetime.date.today() + datetime.timedelta(days=dayDelta)
+                dayDelta = dayDelta + random.randint(0, 3)
 
-                new_event = models.Event.objects.create(name=name, start_date=start_date)
+                newEvent = models.Event.objects.create(name=name, start_date=startDate)
 
                 if random.randint(0, 2) > 1:  # 1 in 3 have a start time
-                    new_event.start_time = datetime.time(random.randint(15, 20))
+                    newEvent.start_time = datetime.time(random.randint(15, 20))
                     if random.randint(0, 2) > 1:  # of those, 1 in 3 have an end time on the same day
-                        new_event.end_time = datetime.time(random.randint(21, 23))
+                        newEvent.end_time = datetime.time(random.randint(21, 23))
                     elif random.randint(0, 1) > 0:  # half of the others finish early the next day
-                        new_event.end_date = new_event.start_date + datetime.timedelta(days=1)
-                        new_event.end_time = datetime.time(random.randint(0, 5))
+                        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
-                    new_event.end_date = new_event.start_date + datetime.timedelta(days=random.randint(1, 4))
+                    newEvent.end_date = newEvent.start_date + datetime.timedelta(days=random.randint(1, 4))
 
                 if random.randint(0, 6) > 0:  # 5 in 6 have MIC
-                    new_event.mic = random.choice(self.profiles)
+                    newEvent.mic = random.choice(self.profiles)
 
                 if random.randint(0, 6) > 0:  # 5 in 6 have organisation
-                    new_event.organisation = random.choice(self.organisations)
+                    newEvent.organisation = random.choice(self.organisations)
 
                 if random.randint(0, 6) > 0:  # 5 in 6 have person
-                    new_event.person = random.choice(self.people)
+                    newEvent.person = random.choice(self.people)
 
                 if random.randint(0, 6) > 0:  # 5 in 6 have venue
-                    new_event.venue = random.choice(self.venues)
+                    newEvent.venue = random.choice(self.venues)
 
                 # Could have any status, equally weighted
-                new_event.status = random.choice(
+                newEvent.status = random.choice(
                     [models.Event.BOOKED, models.Event.CONFIRMED, models.Event.PROVISIONAL, models.Event.CANCELLED])
 
-                new_event.dry_hire = (random.randint(0, 7) == 0)  # 1 in 7 are dry hire
+                newEvent.dry_hire = (random.randint(0, 7) == 0)  # 1 in 7 are dry hire
 
                 if random.randint(0, 1) > 0:  # 1 in 2 have description
-                    new_event.description = random.choice(descriptions)
+                    newEvent.description = random.choice(descriptions)
 
                 if random.randint(0, 1) > 0:  # 1 in 2 have notes
-                    new_event.notes = random.choice(notes)
+                    newEvent.notes = random.choice(notes)
 
-                new_event.save()
+                newEvent.save()
 
                 # Now add some items
                 for j in range(random.randint(1, 5)):
-                    item_data = item_options[random.randint(0, len(item_options) - 1)]
-                    new_item = models.EventItem.objects.create(event=new_event, order=j, **item_data)
-                    new_item.save()
+                    itemData = itemOptions[random.randint(0, len(itemOptions) - 1)]
+                    newItem = models.EventItem.objects.create(event=newEvent, order=j, **itemData)
+                    newItem.save()
 
-                while new_event.sum_total < 0:
-                    item_data = item_options[random.randint(0, len(item_options) - 1)]
-                    new_item = models.EventItem.objects.create(event=new_event, order=j, **item_data)
-                    new_item.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 new_event.start_date < datetime.date.today():  # think about adding an invoice
+                if newEvent.start_date < datetime.date.today():  # think about adding an invoice
                     if random.randint(0, 2) > 0:  # 2 in 3 have had paperwork sent to treasury
-                        new_invoice = models.Invoice.objects.create(event=new_event)
-                        if new_event.status is models.Event.CANCELLED:  # void cancelled events
-                            new_invoice.void = True
+                        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=new_invoice, amount=new_invoice.balance,
-                                                          date=datetime.date.today(), method=random.choice(models.Payment.METHODS)[0])
-            if i == 1 or random.randint(0, 5) > 0:  # Event 1 and 1 in 5 have a RA
-                models.RiskAssessment.objects.create(event=new_event, supervisor_consulted=bool(random.getrandbits(1)),
-                                                     nonstandard_equipment=bool(random.getrandbits(1)),
-                                                     nonstandard_use=bool(random.getrandbits(1)),
-                                                     contractors=bool(random.getrandbits(1)),
-                                                     other_companies=bool(random.getrandbits(1)),
-                                                     crew_fatigue=bool(random.getrandbits(1)),
-                                                     big_power=bool(random.getrandbits(1)),
-                                                     generators=bool(random.getrandbits(1)),
-                                                     other_companies_power=bool(random.getrandbits(1)),
-                                                     nonstandard_equipment_power=bool(random.getrandbits(1)),
-                                                     multiple_electrical_environments=bool(random.getrandbits(1)),
-                                                     noise_monitoring=bool(random.getrandbits(1)),
-                                                     known_venue=bool(random.getrandbits(1)),
-                                                     safe_loading=bool(random.getrandbits(1)),
-                                                     safe_storage=bool(random.getrandbits(1)),
-                                                     area_outside_of_control=bool(random.getrandbits(1)),
-                                                     barrier_required=bool(random.getrandbits(1)),
-                                                     nonstandard_emergency_procedure=bool(random.getrandbits(1)),
-                                                     special_structures=bool(random.getrandbits(1)),
-                                                     suspended_structures=bool(random.getrandbits(1)),
-                                                     parking_and_access=bool(random.getrandbits(1)),
-                                                     outside=bool(random.getrandbits(1)))
-                if i == 0 or random.randint(0, 1) > 0:  # Event 1 and 1 in 10 have a Checklist
-                    models.EventChecklist.objects.create(event=new_event,
-                                                         safe_parking=bool(random.getrandbits(1)),
-                                                         safe_packing=bool(random.getrandbits(1)),
-                                                         exits=bool(random.getrandbits(1)),
-                                                         trip_hazard=bool(random.getrandbits(1)),
-                                                         warning_signs=bool(random.getrandbits(1)),
-                                                         ear_plugs=bool(random.getrandbits(1)),
-                                                         hs_location="Locked away safely",
-                                                         extinguishers_location="Somewhere, I forgot",
-                                                         date=timezone.now(), venue=random.choice(self.venues))
+                            models.Payment.objects.create(invoice=newInvoice, amount=newInvoice.balance,
+                                                          date=datetime.date.today())

RIGS/management/commands/send_reminders.py

@@ -1,38 +0,0 @@
-import premailer
-import datetime
-
-from django.template.loader import get_template
-from django.contrib.staticfiles import finders
-from django.conf import settings
-from django.core.management.base import BaseCommand, CommandError
-from django.core.mail import EmailMultiAlternatives
-from django.utils import timezone
-from django.urls import reverse
-
-from RIGS import models
-
-
-class Command(BaseCommand):
-    help = 'Sends email reminders as required. Triggered daily through heroku-scheduler in production.'
-
-    def handle(self, *args, **options):
-        events = models.Event.objects.current_events().select_related('riskassessment')
-        for event in events:
-            earliest_time = event.earliest_time if isinstance(event.earliest_time, datetime.datetime) else timezone.make_aware(datetime.datetime.combine(event.earliest_time, datetime.time(00, 00)))
-            # 48 hours = 172800 seconds
-            if event.is_rig and not event.cancelled and not event.dry_hire and (earliest_time - timezone.now()).total_seconds() <= 172800 and not hasattr(event, 'riskassessment'):
-                context = {
-                    "event": event,
-                    "url": "https://" + settings.DOMAIN + reverse('event_ra', kwargs={'pk': event.pk})
-                }
-                target = event.mic.email if event.mic else f"productions@{settings.DOMAIN}"
-                msg = EmailMultiAlternatives(
-                    f"{event} - Risk Assessment Incomplete",
-                    get_template("email/ra_reminder.txt").render(context),
-                    to=[target],
-                    reply_to=[f"h.s.manager@{settings.DOMAIN}"],
-                )
-                css = finders.find('css/email.css')
-                html = premailer.Premailer(get_template("email/ra_reminder.html").render(context), external_styles=css).transform()
-                msg.attach_alternative(html, 'text/html')
-                msg.send()

RIGS/migrations/0004_organisation.py

@@ -3,7 +3,6 @@
 
 from django.db import models, migrations
 import RIGS.models
-import versioning
 
 
 class Migration(migrations.Migration):
@@ -26,6 +25,6 @@ class Migration(migrations.Migration):
             ],
             options={
             },
-            bases=(models.Model, versioning.versioning.RevisionMixin),
+            bases=(models.Model, RIGS.models.RevisionMixin),
         ),
     ]

RIGS/migrations/0007_vatrate.py

@@ -3,7 +3,6 @@
 
 from django.db import models, migrations
 import RIGS.models
-import versioning
 
 
 class Migration(migrations.Migration):
@@ -22,6 +21,6 @@ class Migration(migrations.Migration):
             ],
             options={
             },
-            bases=(models.Model, versioning.versioning.RevisionMixin),
+            bases=(models.Model, RIGS.models.RevisionMixin),
         ),
     ]

RIGS/migrations/0008_auto_20141105_1908.py

@@ -4,7 +4,6 @@
 from django.db import models, migrations
 from django.conf import settings
 import RIGS.models
-import versioning
 
 
 class Migration(migrations.Migration):
@@ -42,7 +41,7 @@ class Migration(migrations.Migration):
             ],
             options={
             },
-            bases=(models.Model, versioning.versioning.RevisionMixin),
+            bases=(models.Model, RIGS.models.RevisionMixin),
         ),
         migrations.CreateModel(
             name='EventItem',
@@ -71,7 +70,7 @@ class Migration(migrations.Migration):
             ],
             options={
             },
-            bases=(models.Model, versioning.versioning.RevisionMixin),
+            bases=(models.Model, RIGS.models.RevisionMixin),
         ),
         migrations.AddField(
             model_name='event',

RIGS/migrations/0037_approve_legacy.py

@@ -1,5 +1,5 @@
 # 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
+# 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):
@@ -15,5 +15,5 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunPython(approve_legacy, migrations.RunPython.noop)
+        migrations.RunPython(approve_legacy)
     ]

RIGS/migrations/0039_auto_20200915_0937.py

@@ -1,10 +1,9 @@
-# Generated by Django 3.1.2 on 2021-01-23 19:10
+# Generated by Django 3.1 on 2020-09-15 08:37
 
 import RIGS.models
 from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion
-import versioning
 
 
 class Migration(migrations.Migration):
@@ -18,19 +17,19 @@ class Migration(migrations.Migration):
             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)),
+                ('safe_parking', models.BooleanField(help_text='Vehicles parked safely?<br><small>(does not obstruct venue access)</small>')),
+                ('safe_packing', models.BooleanField(help_text='Equipment packed away safely?<br><small>(including flightcases)</small>')),
+                ('exits', models.BooleanField(help_text='Emergency exits clear?')),
+                ('trip_hazard', models.BooleanField(help_text='Appropriate barriers around kit and cabling secured?')),
+                ('warning_signs', models.BooleanField(help_text='Warning signs in place?<br><small>(strobe, smoke, power etc.)</small>')),
+                ('ear_plugs', models.BooleanField(help_text='Ear plugs issued to crew where needed?')),
+                ('hs_location', models.CharField(help_text='Location of Safety Bag/Box', max_length=255)),
+                ('extinguishers_location', models.CharField(help_text='Location of fire extinguishers', max_length=255)),
                 ('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)),
+                ('earthing', models.BooleanField(help_text='Equipment appropriately earthed?<br><small>(truss, stage, generators etc)</small>')),
+                ('pat', models.BooleanField(help_text='All equipment in PAT period?')),
+                ('medium_event', models.BooleanField()),
                 ('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')),
@@ -59,7 +58,7 @@ class Migration(migrations.Migration):
                 'ordering': ['event'],
                 'permissions': [('review_eventchecklist', 'Can review Event Checklists')],
             },
-            bases=(models.Model, versioning.versioning.RevisionMixin),
+            bases=(models.Model, RIGS.models.RevisionMixin),
         ),
         migrations.CreateModel(
             name='EventChecklistCrew',
@@ -70,7 +69,7 @@ class Migration(migrations.Migration):
                 ('end', models.DateTimeField()),
                 ('checklist', models.ForeignKey(blank=True, on_delete=django.db.models.deletion.CASCADE, related_name='crew', to='RIGS.eventchecklist')),
             ],
-            bases=(models.Model, versioning.versioning.RevisionMixin),
+            bases=(models.Model, RIGS.models.RevisionMixin),
         ),
         migrations.CreateModel(
             name='EventChecklistVehicle',
@@ -79,46 +78,42 @@ class Migration(migrations.Migration):
                 ('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, versioning.versioning.RevisionMixin),
+            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_equipment', models.BooleanField(help_text="Does the event require any hired in equipment or use of equipment that is not covered by TEC's standard risk assessments and method statements?")),
                 ('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>')),
+                ('contractors', models.BooleanField(help_text='Are you using any external contractors?')),
+                ('other_companies', models.BooleanField(help_text='Are TEC working with any other companies on site?')),
                 ('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?')),
+                ('known_venue', models.BooleanField(help_text='Is the event in a venue that you and/or TEC have experience working in?')),
+                ('safe_loading', models.BooleanField(help_text='Is there a safe load in/out?<br><small>e.g. sufficient lighting, flat, not in a crowded area etc.</small>')),
+                ('safe_storage', models.BooleanField(help_text='Are there areas to safely store equipment?')),
                 ('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])),
+                ('suspended_structures', models.BooleanField(help_text="Are any structures (excluding projector screens and IWBs) being suspended from TEC's structures?")),
                 ('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, versioning.versioning.RevisionMixin),
+            bases=(models.Model, RIGS.models.RevisionMixin),
         ),
         migrations.RemoveField(
             model_name='eventcrew',
@@ -151,7 +146,7 @@ class Migration(migrations.Migration):
         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'),
+            field=models.ForeignKey(blank=True, help_text='Who is the Power MIC?', 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',
@@ -171,21 +166,16 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='eventchecklist',
             name='event',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='checklists', to='RIGS.event'),
+            field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, 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'),
+            field=models.ForeignKey(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/migrations/0040_auto_20200925_2141.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.1 on 2020-09-25 20:41
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('RIGS', '0039_auto_20200915_0937'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='eventchecklist',
+            name='medium_event',
+        ),
+        migrations.AddField(
+            model_name='eventchecklist',
+            name='event_size',
+            field=models.IntegerField(choices=[(0, 'Small'), (1, 'Medium'), (2, 'Large')], default=0),
+            preserve_default=False,
+        ),
+    ]

RIGS/migrations/0040_auto_20210302_1148.py

@@ -1,67 +0,0 @@
-# Generated by Django 3.1.7 on 2021-03-02 11:48
-
-from django.db import migrations
-
-
-def postgres_migration_prep(apps, schema_editor):
-    model = apps.get_model("RIGS", "Event")
-    for field in ["auth_request_to", "collector", "description", "notes", "purchase_order"]:
-        filter_param = {"{}__isnull".format(field): True}
-        update_param = {field: ""}
-        model.objects.filter(**filter_param).update(**update_param)
-    model = apps.get_model("RIGS", "EventAuthorisation")
-    for field in ["account_code", "uni_id"]:
-        filter_param = {"{}__isnull".format(field): True}
-        update_param = {field: ""}
-        model.objects.filter(**filter_param).update(**update_param)
-    model = apps.get_model("RIGS", "EventChecklist")
-    for field in ["extinguishers_location", "hs_location", "w1_description", "w2_description", "w3_description"]:
-        filter_param = {"{}__isnull".format(field): True}
-        update_param = {field: ""}
-        model.objects.filter(**filter_param).update(**update_param)
-    model = apps.get_model("RIGS", "EventItem")
-    for field in ["description"]:
-        filter_param = {"{}__isnull".format(field): True}
-        update_param = {field: ""}
-        model.objects.filter(**filter_param).update(**update_param)
-    model = apps.get_model("RIGS", "Organisation")
-    for field in ["address", "email", "notes", "phone"]:
-        filter_param = {"{}__isnull".format(field): True}
-        update_param = {field: ""}
-        model.objects.filter(**filter_param).update(**update_param)
-    model = apps.get_model("RIGS", "Payment")
-    for field in ["method"]:
-        filter_param = {"{}__isnull".format(field): True}
-        update_param = {field: ""}
-        model.objects.filter(**filter_param).update(**update_param)
-    model = apps.get_model("RIGS", "Person")
-    for field in ["address", "email", "notes", "phone"]:
-        filter_param = {"{}__isnull".format(field): True}
-        update_param = {field: ""}
-        model.objects.filter(**filter_param).update(**update_param)
-    model = apps.get_model("RIGS", "Profile")
-    for field in ["phone"]:
-        filter_param = {"{}__isnull".format(field): True}
-        update_param = {field: ""}
-        model.objects.filter(**filter_param).update(**update_param)
-    model = apps.get_model("RIGS", "RiskAssessment")
-    for field in ["general_notes", "persons_responsible_structures", "power_notes", "rigging_plan", "sound_notes"]:
-        filter_param = {"{}__isnull".format(field): True}
-        update_param = {field: ""}
-        model.objects.filter(**filter_param).update(**update_param)
-    model = apps.get_model("RIGS", "Venue")
-    for field in ["address", "email", "notes", "phone"]:
-        filter_param = {"{}__isnull".format(field): True}
-        update_param = {field: ""}
-        model.objects.filter(**filter_param).update(**update_param)
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('RIGS', '0039_auto_20210123_1910'),
-    ]
-
-    operations = [
-        migrations.RunPython(postgres_migration_prep, migrations.RunPython.noop)
-    ]

RIGS/migrations/0041_auto_20200929_1749.py

@@ -0,0 +1,80 @@
+# Generated by Django 3.1 on 2020-09-29 16:49
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('RIGS', '0040_auto_20200925_2141'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='eventchecklist',
+            name='ear_plugs',
+            field=models.BooleanField(blank=True, help_text='Ear plugs issued to crew where needed?', null=True),
+        ),
+        migrations.AlterField(
+            model_name='eventchecklist',
+            name='earthing',
+            field=models.BooleanField(blank=True, help_text='Equipment appropriately earthed?<br><small>(truss, stage, generators etc)</small>', null=True),
+        ),
+        migrations.AlterField(
+            model_name='eventchecklist',
+            name='event',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='checklists', to='RIGS.event'),
+        ),
+        migrations.AlterField(
+            model_name='eventchecklist',
+            name='event_size',
+            field=models.IntegerField(blank=True, choices=[(0, 'Small'), (1, 'Medium'), (2, 'Large')], null=True),
+        ),
+        migrations.AlterField(
+            model_name='eventchecklist',
+            name='exits',
+            field=models.BooleanField(blank=True, help_text='Emergency exits clear?', null=True),
+        ),
+        migrations.AlterField(
+            model_name='eventchecklist',
+            name='extinguishers_location',
+            field=models.CharField(blank=True, help_text='Location of fire extinguishers', max_length=255, null=True),
+        ),
+        migrations.AlterField(
+            model_name='eventchecklist',
+            name='hs_location',
+            field=models.CharField(blank=True, help_text='Location of Safety Bag/Box', max_length=255, null=True),
+        ),
+        migrations.AlterField(
+            model_name='eventchecklist',
+            name='pat',
+            field=models.BooleanField(blank=True, help_text='All equipment in PAT period?', null=True),
+        ),
+        migrations.AlterField(
+            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.AlterField(
+            model_name='eventchecklist',
+            name='safe_packing',
+            field=models.BooleanField(blank=True, help_text='Equipment packed away safely?<br><small>(including flightcases)</small>', null=True),
+        ),
+        migrations.AlterField(
+            model_name='eventchecklist',
+            name='safe_parking',
+            field=models.BooleanField(blank=True, help_text='Vehicles parked safely?<br><small>(does not obstruct venue access)</small>', null=True),
+        ),
+        migrations.AlterField(
+            model_name='eventchecklist',
+            name='trip_hazard',
+            field=models.BooleanField(blank=True, help_text='Appropriate barriers around kit and cabling secured?', null=True),
+        ),
+        migrations.AlterField(
+            model_name='eventchecklist',
+            name='warning_signs',
+            field=models.BooleanField(blank=True, help_text='Warning signs in place?<br><small>(strobe, smoke, power etc.)</small>'),
+        ),
+    ]

RIGS/migrations/0041_auto_20210302_1204.py

@@ -1,201 +0,0 @@
-# Generated by Django 3.1.7 on 2021-03-02 12:04
-
-import RIGS.models
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('RIGS', '0040_auto_20210302_1148'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='event',
-            name='meet_info',
-        ),
-        migrations.RemoveField(
-            model_name='event',
-            name='payment_method',
-        ),
-        migrations.RemoveField(
-            model_name='event',
-            name='payment_received',
-        ),
-        migrations.AddField(
-            model_name='profile',
-            name='dark_theme',
-            field=models.BooleanField(default=False),
-        ),
-        migrations.AlterField(
-            model_name='event',
-            name='auth_request_to',
-            field=models.EmailField(blank=True, default='', max_length=254),
-        ),
-        migrations.AlterField(
-            model_name='event',
-            name='collector',
-            field=models.CharField(blank=True, default='', max_length=255, verbose_name='collected by'),
-        ),
-        migrations.AlterField(
-            model_name='event',
-            name='description',
-            field=models.TextField(blank=True, default=''),
-        ),
-        migrations.AlterField(
-            model_name='event',
-            name='notes',
-            field=models.TextField(blank=True, default=''),
-        ),
-        migrations.AlterField(
-            model_name='event',
-            name='purchase_order',
-            field=models.CharField(blank=True, default='', max_length=255, verbose_name='PO'),
-        ),
-        migrations.AlterField(
-            model_name='eventauthorisation',
-            name='account_code',
-            field=models.CharField(blank=True, default='', max_length=50),
-        ),
-        migrations.AlterField(
-            model_name='eventauthorisation',
-            name='uni_id',
-            field=models.CharField(blank=True, default='', max_length=10, verbose_name='University ID'),
-        ),
-        migrations.AlterField(
-            model_name='eventchecklist',
-            name='extinguishers_location',
-            field=models.CharField(blank=True, default='', help_text='Location of fire extinguishers', max_length=255),
-        ),
-        migrations.AlterField(
-            model_name='eventchecklist',
-            name='hs_location',
-            field=models.CharField(blank=True, default='', help_text='Location of Safety Bag/Box', max_length=255),
-        ),
-        migrations.AlterField(
-            model_name='eventchecklist',
-            name='w1_description',
-            field=models.CharField(blank=True, default='', help_text='Description', max_length=255),
-        ),
-        migrations.AlterField(
-            model_name='eventchecklist',
-            name='w2_description',
-            field=models.CharField(blank=True, default='', help_text='Description', max_length=255),
-        ),
-        migrations.AlterField(
-            model_name='eventchecklist',
-            name='w3_description',
-            field=models.CharField(blank=True, default='', help_text='Description', max_length=255),
-        ),
-        migrations.AlterField(
-            model_name='eventitem',
-            name='description',
-            field=models.TextField(blank=True, default=''),
-        ),
-        migrations.AlterField(
-            model_name='organisation',
-            name='address',
-            field=models.TextField(blank=True, default=''),
-        ),
-        migrations.AlterField(
-            model_name='organisation',
-            name='email',
-            field=models.EmailField(blank=True, default='', max_length=254),
-        ),
-        migrations.AlterField(
-            model_name='organisation',
-            name='notes',
-            field=models.TextField(blank=True, default=''),
-        ),
-        migrations.AlterField(
-            model_name='organisation',
-            name='phone',
-            field=models.CharField(blank=True, default='', max_length=15),
-        ),
-        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')], default='', max_length=2),
-        ),
-        migrations.AlterField(
-            model_name='person',
-            name='address',
-            field=models.TextField(blank=True, default=''),
-        ),
-        migrations.AlterField(
-            model_name='person',
-            name='email',
-            field=models.EmailField(blank=True, default='', max_length=254),
-        ),
-        migrations.AlterField(
-            model_name='person',
-            name='notes',
-            field=models.TextField(blank=True, default=''),
-        ),
-        migrations.AlterField(
-            model_name='person',
-            name='phone',
-            field=models.CharField(blank=True, default='', max_length=15),
-        ),
-        migrations.AlterField(
-            model_name='profile',
-            name='api_key',
-            field=models.CharField(blank=True, default='', editable=False, max_length=40),
-        ),
-        migrations.AlterField(
-            model_name='profile',
-            name='phone',
-            field=models.CharField(blank=True, default='', max_length=13),
-        ),
-        migrations.AlterField(
-            model_name='riskassessment',
-            name='general_notes',
-            field=models.TextField(blank=True, default='', 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?'),
-        ),
-        migrations.AlterField(
-            model_name='riskassessment',
-            name='persons_responsible_structures',
-            field=models.TextField(blank=True, default='', help_text='Who are the persons on site responsible for their use?'),
-        ),
-        migrations.AlterField(
-            model_name='riskassessment',
-            name='power_notes',
-            field=models.TextField(blank=True, default='', 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?'),
-        ),
-        migrations.AlterField(
-            model_name='riskassessment',
-            name='power_plan',
-            field=models.URLField(blank=True, default='', help_text="Upload your power plan to the <a href='https://nottinghamtec.sharepoint.com/'>Sharepoint</a> and submit a link", validators=[RIGS.models.validate_url]),
-        ),
-        migrations.AlterField(
-            model_name='riskassessment',
-            name='rigging_plan',
-            field=models.URLField(blank=True, default='', help_text="Upload your rigging plan to the <a href='https://nottinghamtec.sharepoint.com/'>Sharepoint</a> and submit a link", validators=[RIGS.models.validate_url]),
-        ),
-        migrations.AlterField(
-            model_name='riskassessment',
-            name='sound_notes',
-            field=models.TextField(blank=True, default='', 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?'),
-        ),
-        migrations.AlterField(
-            model_name='venue',
-            name='address',
-            field=models.TextField(blank=True, default=''),
-        ),
-        migrations.AlterField(
-            model_name='venue',
-            name='email',
-            field=models.EmailField(blank=True, default='', max_length=254),
-        ),
-        migrations.AlterField(
-            model_name='venue',
-            name='notes',
-            field=models.TextField(blank=True, default=''),
-        ),
-        migrations.AlterField(
-            model_name='venue',
-            name='phone',
-            field=models.CharField(blank=True, default='', max_length=15),
-        ),
-    ]

RIGS/migrations/0042_auto_20211007_2338.py

@@ -1,34 +0,0 @@
-# Generated by Django 3.1.13 on 2021-10-07 22:38
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('RIGS', '0041_auto_20210302_1204'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='eventchecklist',
-            name='fd_earth_fault',
-            field=models.DecimalField(blank=True, decimal_places=2, help_text='Earth Fault Loop Impedance (Z<small>S</small>)', max_digits=5, null=True, verbose_name='Earth Fault Loop Impedance'),
-        ),
-        migrations.AlterField(
-            model_name='eventchecklist',
-            name='w1_earth_fault',
-            field=models.DecimalField(blank=True, decimal_places=2, help_text='Earth Fault Loop Impedance (Z<small>S</small>)', max_digits=5, null=True, verbose_name='Earth Fault Loop Impedance'),
-        ),
-        migrations.AlterField(
-            model_name='eventchecklist',
-            name='w2_earth_fault',
-            field=models.DecimalField(blank=True, decimal_places=2, help_text='Earth Fault Loop Impedance (Z<small>S</small>)', max_digits=5, null=True, verbose_name='Earth Fault Loop Impedance'),
-        ),
-        migrations.AlterField(
-            model_name='eventchecklist',
-            name='w3_earth_fault',
-            field=models.DecimalField(blank=True, decimal_places=2, help_text='Earth Fault Loop Impedance (Z<small>S</small>)', max_digits=5, null=True, verbose_name='Earth Fault Loop Impedance'),
-        ),
-    ]
-

RIGS/migrations/0042_riskassessment_supervisor_consulted.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.1.2 on 2020-10-10 11:39
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('RIGS', '0041_auto_20200929_1749'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='riskassessment',
+            name='supervisor_consulted',
+            field=models.BooleanField(null=True),
+        ),
+    ]

RIGS/migrations/0043_auto_20201010_1320.py

@@ -0,0 +1,27 @@
+# Generated by Django 3.1.2 on 2020-10-10 12:20
+
+from django.db import migrations, models
+import django.db.models.deletion
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('RIGS', '0042_riskassessment_supervisor_consulted'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='eventchecklist',
+            name='date',
+            field=models.DateField(default=django.utils.timezone.now),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='eventchecklist',
+            name='venue',
+            field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='RIGS.venue'),
+            preserve_default=False,
+        ),
+    ]

RIGS/migrations/0043_auto_20211027_1519.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.1.13 on 2021-10-27 14:19
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('RIGS', '0042_auto_20211007_2338'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='profile',
-            name='initials',
-            field=models.CharField(max_length=5, null=True),
-        ),
-    ]

RIGS/migrations/0044_auto_20201024_2031.py

@@ -0,0 +1,28 @@
+# Generated by Django 3.1.2 on 2020-10-24 19:31
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('RIGS', '0043_auto_20201010_1320'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='riskassessment',
+            name='known_venue',
+            field=models.BooleanField(help_text='Is this venue new to you (the MIC) or new to TEC?'),
+        ),
+        migrations.AlterField(
+            model_name='riskassessment',
+            name='safe_loading',
+            field=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.)'),
+        ),
+        migrations.AlterField(
+            model_name='riskassessment',
+            name='safe_storage',
+            field=models.BooleanField(help_text='Are there any problems with safe and secure equipment storage?'),
+        ),
+    ]

RIGS/migrations/0044_profile_is_supervisor.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.2.11 on 2022-01-09 14:56
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('RIGS', '0043_auto_20211027_1519'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='profile',
-            name='is_supervisor',
-            field=models.BooleanField(default=False),
-        ),
-    ]

RIGS/migrations/0045_alter_profile_is_approved.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.2.12 on 2022-10-20 23:02
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('RIGS', '0044_profile_is_supervisor'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='profile',
-            name='is_approved',
-            field=models.BooleanField(default=False, help_text='Designates whether a staff member has approved this user.', verbose_name='Approval Status'),
-        ),
-    ]

RIGS/migrations/0045_auto_20201116_1808.py

@@ -0,0 +1,34 @@
+# Generated by Django 3.1.2 on 2020-11-16 18:08
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('RIGS', '0044_auto_20201024_2031'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='riskassessment',
+            name='outside',
+            field=models.BooleanField(default=False, help_text='Is the event outdoors?'),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='riskassessment',
+            name='contractors',
+            field=models.BooleanField(help_text='Are you using any external contractors?<small>i.e. Freelancers/Crewing Companies</small>'),
+        ),
+        migrations.AlterField(
+            model_name='riskassessment',
+            name='nonstandard_equipment',
+            field=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>"),
+        ),
+        migrations.AlterField(
+            model_name='riskassessment',
+            name='other_companies',
+            field=models.BooleanField(help_text='Are TEC working with any other companies on site?<small>e.g. TEC is providing the lighting while another company does sound</small>'),
+        ),
+    ]

RIGS/migrations/0046_auto_20201213_1625.py

@@ -0,0 +1,34 @@
+# Generated by Django 3.1.2 on 2020-12-13 16:25
+
+import RIGS.models
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('RIGS', '0045_auto_20201116_1808'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='riskassessment',
+            name='power_plan',
+            field=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]),
+        ),
+        migrations.AddField(
+            model_name='riskassessment',
+            name='rigging_plan',
+            field=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]),
+        ),
+        migrations.AlterField(
+            model_name='riskassessment',
+            name='contractors',
+            field=models.BooleanField(help_text='Are you using any external contractors?<br><small>i.e. Freelancers/Crewing Companies</small>'),
+        ),
+        migrations.AlterField(
+            model_name='riskassessment',
+            name='other_companies',
+            field=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>'),
+        ),
+    ]

RIGS/migrations/0046_create_powertests.py

@@ -1,71 +0,0 @@
-# Generated by Django 3.2.16 on 2023-05-08 15:58
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-import versioning.versioning
-
-def migrate_old_data(apps, schema_editor):
-    EventChecklist = apps.get_model('RIGS', 'EventChecklist')
-    PowerTestRecord = apps.get_model('RIGS', 'PowerTestRecord')
-    for ec in EventChecklist.objects.all():
-        # New highscore for the most pythonic BS I've ever written.
-        PowerTestRecord.objects.create(event=ec.event, venue=ec.venue, reviewed_by=ec.reviewed_by, **{i.name:getattr(ec, i.attname) for i in PowerTestRecord._meta.get_fields() if not (i.is_relation or i.auto_created or i.name == "notes")})
-
-
-def revert(apps, schema_editor):
-    apps.get_model('RIGS', 'PowerTestRecord').objects.all().delete()
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('RIGS', '0045_alter_profile_is_approved'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='PowerTestRecord',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('event', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='power_tests', to='RIGS.event')),
-                ('notes', models.TextField(blank=True, default='')),
-                ('venue', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='RIGS.venue')),
-                ('reviewed_at', models.DateTimeField(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.DecimalField(blank=True, decimal_places=2, help_text='Earth Fault Loop Impedance (Z<small>S</small>)', max_digits=5, 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, default='', help_text='Description', max_length=255)),
-                ('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.DecimalField(blank=True, decimal_places=2, help_text='Earth Fault Loop Impedance (Z<small>S</small>)', max_digits=5, null=True, verbose_name='Earth Fault Loop Impedance')),
-                ('w2_description', models.CharField(blank=True, default='', help_text='Description', max_length=255)),
-                ('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.DecimalField(blank=True, decimal_places=2, help_text='Earth Fault Loop Impedance (Z<small>S</small>)', max_digits=5, null=True, verbose_name='Earth Fault Loop Impedance')),
-                ('w3_description', models.CharField(blank=True, default='', help_text='Description', max_length=255)),
-                ('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.DecimalField(blank=True, decimal_places=2, help_text='Earth Fault Loop Impedance (Z<small>S</small>)', max_digits=5, null=True, verbose_name='Earth Fault Loop Impedance')),
-                ('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_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Reviewer')),
-            ],
-            options={
-                'abstract': False,
-                'ordering': ['event'],
-                'permissions': [('review_power', 'Can review Power Test Records')],
-            },
-            bases=(models.Model, versioning.versioning.RevisionMixin),
-        ),
-        migrations.RunPython(migrate_old_data, reverse_code=revert),
-    ]

RIGS/migrations/0047_auto_20201213_1642.py

@@ -0,0 +1,22 @@
+# Generated by Django 3.1.2 on 2020-12-13 16:42
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('RIGS', '0046_auto_20201213_1625'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='eventchecklist',
+            name='event_size',
+        ),
+        migrations.AddField(
+            model_name='riskassessment',
+            name='event_size',
+            field=models.IntegerField(blank=True, choices=[(0, 'Small'), (1, 'Medium'), (2, 'Large')], null=True),
+        ),
+    ]

RIGS/migrations/0047_auto_20230517_0944.py

@@ -1,44 +0,0 @@
-# Generated by Django 3.2.19 on 2023-05-17 08:44
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-from django.core.exceptions import ObjectDoesNotExist
-
-
-def migrate_old_data(apps, schema_editor):
-    EventChecklist = apps.get_model('RIGS', 'EventChecklist')
-    EventCheckIn = apps.get_model('RIGS', 'EventCheckIn')
-    for ec in EventChecklist.objects.all():
-        for crew in ec.crew.all():
-            try:
-                EventCheckIn.objects.create(event=ec.event, person=crew.crewmember, role=crew.role, time=crew.start, end_time=crew.end, vehicle=ec.vehicles.get(driver=crew.crewmember).vehicle)
-            except ObjectDoesNotExist:
-                EventCheckIn.objects.create(event=ec.event, person=crew.crewmember, role=crew.role, time=crew.start, end_time=crew.end)
-
-
-def revert(apps, schema_editor):
-    apps.get_model('RIGS', 'EventCheckIn').objects.all().delete()
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('RIGS', '0046_create_powertests'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='EventCheckIn',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('time', models.DateTimeField()),
-                ('role', models.CharField(blank=True, max_length=50)),
-                ('vehicle', models.CharField(blank=True, max_length=100)),
-                ('end_time', models.DateTimeField(blank=True, null=True)),
-                ('event', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='crew', to='RIGS.event')),
-                ('person', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='checkins', to=settings.AUTH_USER_MODEL)),
-            ],
-        ),
-        migrations.RunPython(migrate_old_data, reverse_code=revert),
-    ]

RIGS/migrations/0048_auto_20201227_1749.py

@@ -0,0 +1,24 @@
+# Generated by Django 3.1.2 on 2020-12-27 17:49
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('RIGS', '0047_auto_20201213_1642'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='riskassessment',
+            name='event_size',
+        ),
+        migrations.AlterField(
+            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'),
+        ),
+    ]

RIGS/migrations/0048_auto_20230518_1256.py

@@ -1,156 +0,0 @@
-# Generated by Django 3.2.19 on 2023-05-18 11:56
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('RIGS', '0047_auto_20230517_0944'),
-    ]
-
-    operations = [
-                migrations.RemoveField(
-            model_name='eventchecklistvehicle',
-            name='checklist',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklistvehicle',
-            name='driver',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='all_rcds_tested',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='earthing',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='fd_earth_fault',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='fd_phase_rotation',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='fd_pssc',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='fd_voltage_l1',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='fd_voltage_l2',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='fd_voltage_l3',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='labelling',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='pat',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='power_mic',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='public_sockets_tested',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='rcds',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='source_rcd',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='supply_test',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='w1_description',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='w1_earth_fault',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='w1_polarity',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='w1_voltage',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='w2_description',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='w2_earth_fault',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='w2_polarity',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='w2_voltage',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='w3_description',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='w3_earth_fault',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='w3_polarity',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='w3_voltage',
-        ),
-        migrations.AddField(
-            model_name='powertestrecord',
-            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.AlterField(
-            model_name='eventchecklist',
-            name='reviewed_at',
-            field=models.DateTimeField(blank=True, null=True),
-        ),
-        migrations.AlterField(
-            model_name='powertestrecord',
-            name='reviewed_at',
-            field=models.DateTimeField(blank=True, null=True),
-        ),
-        migrations.AlterField(
-            model_name='riskassessment',
-            name='reviewed_at',
-            field=models.DateTimeField(blank=True, null=True),
-        ),
-        migrations.DeleteModel(
-            name='EventChecklistCrew',
-        ),
-        migrations.DeleteModel(
-            name='EventChecklistVehicle',
-        ),
-    ]

RIGS/migrations/0049_auto_20230529_1123.py

@@ -1,53 +0,0 @@
-# Generated by Django 3.2.19 on 2023-05-29 10:23
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('RIGS', '0048_auto_20230518_1256'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='powertestrecord',
-            name='fd_earth_fault',
-            field=models.DecimalField(blank=True, decimal_places=2, help_text='Earth Fault Loop Impedance (Z<small>S</small>) / Ω', max_digits=6, null=True, verbose_name='Earth Fault Loop Impedance'),
-        ),
-        migrations.AlterField(
-            model_name='powertestrecord',
-            name='fd_pssc',
-            field=models.IntegerField(blank=True, help_text='Prospective Short Circuit Current / A', null=True, verbose_name='PSCC'),
-        ),
-        migrations.AlterField(
-            model_name='powertestrecord',
-            name='w1_earth_fault',
-            field=models.DecimalField(blank=True, decimal_places=2, help_text='Earth Fault Loop Impedance (Z<small>S</small>) / Ω', max_digits=6, null=True, verbose_name='Earth Fault Loop Impedance'),
-        ),
-        migrations.AlterField(
-            model_name='powertestrecord',
-            name='w1_voltage',
-            field=models.IntegerField(blank=True, help_text='Voltage / V', null=True),
-        ),
-        migrations.AlterField(
-            model_name='powertestrecord',
-            name='w2_earth_fault',
-            field=models.DecimalField(blank=True, decimal_places=2, help_text='Earth Fault Loop Impedance (Z<small>S</small>) / Ω', max_digits=6, null=True, verbose_name='Earth Fault Loop Impedance'),
-        ),
-        migrations.AlterField(
-            model_name='powertestrecord',
-            name='w2_voltage',
-            field=models.IntegerField(blank=True, help_text='Voltage / V', null=True),
-        ),
-        migrations.AlterField(
-            model_name='powertestrecord',
-            name='w3_earth_fault',
-            field=models.DecimalField(blank=True, decimal_places=2, help_text='Earth Fault Loop Impedance (Z<small>S</small>) / Ω', max_digits=6, null=True, verbose_name='Earth Fault Loop Impedance'),
-        ),
-        migrations.AlterField(
-            model_name='powertestrecord',
-            name='w3_voltage',
-            field=models.IntegerField(blank=True, help_text='Voltage / V', null=True),
-        ),
-    ]

RIGS/migrations/0050_event_forum_url.py

@@ -1,19 +0,0 @@
-# Generated by Django 3.2.19 on 2023-06-27 11:28
-
-import RIGS.models
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('RIGS', '0049_auto_20230529_1123'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='event',
-            name='forum_url',
-            field=models.URLField(blank=True, default='', validators=[RIGS.models.validate_forum_url]),
-        ),
-    ]

RIGS/migrations/0051_alter_payment_method.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.2.19 on 2023-07-09 21:23
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('RIGS', '0050_event_forum_url'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='payment',
-            name='method',
-            field=models.CharField(blank=True, choices=[('C', 'Cash'), ('I', 'Internal'), ('E', 'External'), ('T', 'TEC Adjustment')], default='', max_length=2),
-        ),
-    ]

RIGS/migrations/0052_event_parking_and_access.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.2.25 on 2024-11-20 20:17
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('RIGS', '0051_alter_payment_method'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='event',
-            name='parking_and_access',
-            field=models.BooleanField(default=False),
-        ),
-    ]

RIGS/migrations/0053_riskassessment_parking_and_access.py

@@ -1,19 +0,0 @@
-# Generated by Django 3.2.25 on 2024-11-20 21:18
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('RIGS', '0052_event_parking_and_access'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='riskassessment',
-            name='parking_and_access',
-            field=models.BooleanField(default=False, help_text='Are there additional requirements for parking and access to the venue? (i.e. campus parking permits, event access wristbands)'),
-            preserve_default=False,
-        ),
-    ]

RIGS/models.py

@@ -1,48 +1,34 @@
 import datetime
 import hashlib
-import random
-import string
-from collections import Counter
-from decimal import Decimal
-from urllib.parse import urlparse
-
 import pytz
+
 from django import forms
-from django.db.models import Q, F
-from django.conf import settings
-from django.contrib.auth.models import AbstractUser
-from django.core.exceptions import ValidationError
 from django.db import models
-from django.urls import reverse
+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
-from versioning.versioning import RevisionMixin
+import string
 
+import random
+from collections import Counter
+from decimal import Decimal
 
-def filter_by_pk(filt, query):
-    # try and parse an int
-    try:
-        val = int(query)
-        filt = filt | Q(pk=val)
-    except:  # noqa
-        # not an integer
-        pass
-    return filt
+from django.core.exceptions import ValidationError
+from django.urls import reverse_lazy
+
+from urllib.parse import urlparse
 
 
 class Profile(AbstractUser):
-    initials = models.CharField(max_length=5, null=True, blank=False)
-    phone = models.CharField(max_length=13, blank=True, default='')
-    api_key = models.CharField(max_length=40, blank=True, editable=False, default='')
-    is_approved = models.BooleanField(default=False, verbose_name="Approval Status", help_text="Designates whether a staff member has approved this user.")
-    # Currently only populated by the admin approval email. TODO: Populate it each time we send any email, might need that...
-    last_emailed = models.DateTimeField(blank=True, null=True)
-    dark_theme = models.BooleanField(default=False)
-    is_supervisor = models.BooleanField(default=False)
-
-    reversion_hide = True
+    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)
+    is_approved = models.BooleanField(default=False)
+    last_emailed = models.DateTimeField(blank=True,
+                                        null=True)  # Currently only populated by the admin approval email. TODO: Populate it each time we send any email, might need that...
 
     @classmethod
     def make_api_key(cls):
@@ -63,12 +49,12 @@ class Profile(AbstractUser):
     def name(self):
         name = self.get_full_name()
         if self.initials:
-            name += f' "{self.initials}"'
+            name += ' "{}"'.format(self.initials)
         return name
 
     @property
     def latest_events(self):
-        return self.event_mic.order_by('-start_date').select_related('person', 'organisation', 'venue', 'mic', 'riskassessment', 'invoice').prefetch_related('checklists')
+        return self.event_mic.order_by('-start_date').select_related('person', 'organisation', 'venue', 'mic')
 
     @classmethod
     def admins(cls):
@@ -76,38 +62,55 @@ class Profile(AbstractUser):
 
     @classmethod
     def users_awaiting_approval_count(cls):
-        # last_login = None ensures we only pick up genuinely new users, not those that have been deactivated for inactivity
-        return Profile.objects.filter(is_approved=False, last_login=None, date_joined_date=timezone.now().date()).count()
+        return Profile.objects.filter(models.Q(is_approved=False)).count()
 
     def __str__(self):
         return self.name
 
-    def current_event(self):
-        q = EventCheckIn.objects.filter(person=self, end_time=None)
-        return q.latest('time') if q.exists() else None
+# TODO move to versioning - currently get import errors with that
 
 
-class ContactableManager(models.Manager):
-    def search(self, query=None):
-        qs = self.get_queryset()
-        if query is not None:
-            or_lookup = Q(name__icontains=query) | Q(email__icontains=query) | Q(address__icontains=query) | Q(notes__icontains=query) | Q(
-                phone__startswith=query) | Q(phone__endswith=query)
+class RevisionMixin(object):
+    @property
+    def is_first_version(self):
+        versions = Version.objects.get_for_object(self)
+        return len(versions) == 1
 
-            or_lookup = filter_by_pk(or_lookup, query)
+    @property
+    def current_version(self):
+        version = Version.objects.get_for_object(self).select_related('revision').first()
+        return version
 
-            qs = qs.filter(or_lookup).distinct()  # distinct() is often necessary with Q lookups
-        return qs
+    @property
+    def last_edited_at(self):
+        version = self.current_version
+        if version is None:
+            return None
+        return version.revision.date_created
+
+    @property
+    def last_edited_by(self):
+        version = self.current_version
+        if version is None:
+            return None
+        return version.revision.user
+
+    @property
+    def current_version_id(self):
+        version = self.current_version
+        if version is None:
+            return None
+        return "V{0} | R{1}".format(version.pk, version.revision.pk)
 
 
 class Person(models.Model, RevisionMixin):
     name = models.CharField(max_length=50)
-    phone = models.CharField(max_length=15, blank=True, default='')
-    email = models.EmailField(blank=True, default='')
-    address = models.TextField(blank=True, default='')
-    notes = models.TextField(blank=True, default='')
+    phone = models.CharField(max_length=15, blank=True, null=True)
+    email = models.EmailField(blank=True, null=True)
 
-    objects = ContactableManager()
+    address = models.TextField(blank=True, null=True)
+
+    notes = models.TextField(blank=True, null=True)
 
     def __str__(self):
         string = self.name
@@ -133,18 +136,18 @@ class Person(models.Model, RevisionMixin):
         return self.event_set.order_by('-start_date').select_related('person', 'organisation', 'venue', 'mic')
 
     def get_absolute_url(self):
-        return reverse('person_detail', kwargs={'pk': self.pk})
+        return reverse_lazy('person_detail', kwargs={'pk': self.pk})
 
 
 class Organisation(models.Model, RevisionMixin):
     name = models.CharField(max_length=50)
-    phone = models.CharField(max_length=15, blank=True, default='')
-    email = models.EmailField(blank=True, default='')
-    address = models.TextField(blank=True, default='')
-    notes = models.TextField(blank=True, default='')
-    union_account = models.BooleanField(default=False)
+    phone = models.CharField(max_length=15, blank=True, null=True)
+    email = models.EmailField(blank=True, null=True)
 
-    objects = ContactableManager()
+    address = models.TextField(blank=True, null=True)
+
+    notes = models.TextField(blank=True, null=True)
+    union_account = models.BooleanField(default=False)
 
     def __str__(self):
         string = self.name
@@ -170,7 +173,7 @@ class Organisation(models.Model, RevisionMixin):
         return self.event_set.order_by('-start_date').select_related('person', 'organisation', 'venue', 'mic')
 
     def get_absolute_url(self):
-        return reverse('organisation_detail', kwargs={'pk': self.pk})
+        return reverse_lazy('organisation_detail', kwargs={'pk': self.pk})
 
 
 class VatManager(models.Manager):
@@ -178,6 +181,7 @@ class VatManager(models.Manager):
         return self.find_rate(timezone.now())
 
     def find_rate(self, date):
+        # return self.filter(startAt__lte=date).latest()
         try:
             return self.filter(start_at__lte=date).latest()
         except VatRate.DoesNotExist:
@@ -205,18 +209,17 @@ class VatRate(models.Model, RevisionMixin):
         get_latest_by = 'start_at'
 
     def __str__(self):
-        return f"{self.comment} {self.start_at} @ {self.as_percent}%"
+        return self.comment + " " + str(self.start_at) + " @ " + str(self.as_percent) + "%"
 
 
 class Venue(models.Model, RevisionMixin):
     name = models.CharField(max_length=255)
-    phone = models.CharField(max_length=15, blank=True, default='')
-    email = models.EmailField(blank=True, default='')
+    phone = models.CharField(max_length=15, blank=True, null=True)
+    email = models.EmailField(blank=True, null=True)
     three_phase_available = models.BooleanField(default=False)
-    notes = models.TextField(blank=True, default='')
-    address = models.TextField(blank=True, default='')
+    notes = models.TextField(blank=True, null=True)
 
-    objects = ContactableManager()
+    address = models.TextField(blank=True, null=True)
 
     def __str__(self):
         string = self.name
@@ -229,23 +232,24 @@ class Venue(models.Model, RevisionMixin):
         return self.event_set.order_by('-start_date').select_related('person', 'organisation', 'venue', 'mic')
 
     def get_absolute_url(self):
-        return reverse('venue_detail', kwargs={'pk': self.pk})
+        return reverse_lazy('venue_detail', kwargs={'pk': self.pk})
 
 
 class EventManager(models.Manager):
     def current_events(self):
         events = self.filter(
-            (models.Q(start_date__gte=timezone.now(), end_date__isnull=True, dry_hire=False) & ~models.Q(
+            (models.Q(start_date__gte=timezone.now().date(), end_date__isnull=True, dry_hire=False) & ~models.Q(
                 status=Event.CANCELLED)) |  # Starts after with no end
             (models.Q(end_date__gte=timezone.now().date(), dry_hire=False) & ~models.Q(
                 status=Event.CANCELLED)) |  # Ends after
-            (models.Q(dry_hire=True, start_date__gte=timezone.now()) & ~models.Q(
+            (models.Q(dry_hire=True, start_date__gte=timezone.now().date()) & ~models.Q(
                 status=Event.CANCELLED)) |  # Active dry hire
             (models.Q(dry_hire=True, checked_in_by__isnull=True) & (
                 models.Q(status=Event.BOOKED) | models.Q(status=Event.CONFIRMED))) |  # Active dry hire GT
-            models.Q(status=Event.CANCELLED, start_date__gte=timezone.now())  # Canceled but not started
-        ).order_by('start_date', 'end_date', 'start_time', 'end_time', 'meet_at').select_related('person', 'organisation', 'venue', 'mic')
-
+            models.Q(status=Event.CANCELLED, start_date__gte=timezone.now().date())  # Canceled but not started
+        ).order_by('start_date', 'end_date', 'start_time', 'end_time', 'meet_at').select_related('person',
+                                                                                                 'organisation',
+                                                                                                 'venue', 'mic')
         return events
 
     def events_in_bounds(self, start, end):
@@ -268,54 +272,16 @@ class EventManager(models.Manager):
 
     def rig_count(self):
         event_count = self.filter(
-            (models.Q(start_date__gte=timezone.now(), end_date__isnull=True, dry_hire=False,
+            (models.Q(start_date__gte=timezone.now().date(), 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(), dry_hire=False, is_rig=True) & ~models.Q(
+            (models.Q(end_date__gte=timezone.now().date(), dry_hire=False, is_rig=True) & ~models.Q(
                 status=Event.CANCELLED)) |  # Ends after
-            (models.Q(dry_hire=True, start_date__gte=timezone.now(), is_rig=True) & ~models.Q(
+            (models.Q(dry_hire=True, start_date__gte=timezone.now().date(), is_rig=True) & ~models.Q(
                 status=Event.CANCELLED))  # Active dry hire
         ).count()
         return event_count
 
-    def waiting_invoices(self):
-        events = self.filter(
-            (
-                models.Q(start_date__lte=datetime.date.today(), end_date__isnull=True) |  # Starts before with no end
-                models.Q(end_date__lte=datetime.date.today())  # Or has end date, finishes before
-            ) & models.Q(invoice__isnull=True) &  # Has not already been invoiced
-            models.Q(is_rig=True)  # Is a rig (not non-rig)
-        ).order_by('start_date') \
-            .select_related('person', 'organisation', 'venue', 'mic') \
-            .prefetch_related('items')
-
-        return events
-
-    def search(self, query=None):
-        qs = self.get_queryset()
-        if query is not None:
-            or_lookup = Q(name__icontains=query) | Q(description__icontains=query) | Q(notes__icontains=query)
-
-            or_lookup = filter_by_pk(or_lookup, query)
-
-            try:
-                if query[0] == "N":
-                    val = int(query[1:])
-                    or_lookup = Q(pk=val)  # If string is N###### then do a simple PK filter
-            except:  # noqa
-                pass
-
-            qs = qs.filter(or_lookup).distinct()  # distinct() is often necessary with Q lookups
-        return qs
-
-
-def validate_forum_url(value):
-    if not value:
-        return  # Required error is done the field
-    obj = urlparse(value)
-    if obj.hostname not in ('forum.nottinghamtec.co.uk'):
-        raise ValidationError('URL must point to a location on the TEC Forum')
-
 
 @reversion.register(follow=['items'])
 class Event(models.Model, RevisionMixin):
@@ -335,8 +301,8 @@ class Event(models.Model, RevisionMixin):
     person = models.ForeignKey('Person', null=True, blank=True, on_delete=models.CASCADE)
     organisation = models.ForeignKey('Organisation', blank=True, null=True, on_delete=models.CASCADE)
     venue = models.ForeignKey('Venue', blank=True, null=True, on_delete=models.CASCADE)
-    description = models.TextField(blank=True, default='')
-    notes = models.TextField(blank=True, default='')
+    description = models.TextField(blank=True, null=True)
+    notes = models.TextField(blank=True, null=True)
     status = models.IntegerField(choices=EVENT_STATUS_CHOICES, default=PROVISIONAL)
     dry_hire = models.BooleanField(default=False)
     is_rig = models.BooleanField(default=True)
@@ -350,9 +316,7 @@ class Event(models.Model, RevisionMixin):
     end_time = models.TimeField(blank=True, null=True)
     access_at = models.DateTimeField(blank=True, null=True)
     meet_at = models.DateTimeField(blank=True, null=True)
-
-    # Venue requirements
-    parking_and_access = models.BooleanField(default=False)
+    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,
@@ -361,27 +325,22 @@ class Event(models.Model, RevisionMixin):
                             verbose_name="MIC", on_delete=models.CASCADE)
 
     # Monies
-    purchase_order = models.CharField(max_length=255, blank=True, default='', verbose_name='PO')
-    collector = models.CharField(max_length=255, blank=True, default='', verbose_name='collected by')
+    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')
+    collector = models.CharField(max_length=255, blank=True, null=True, verbose_name='collected by')
 
     # Authorisation request details
     auth_request_by = models.ForeignKey('Profile', null=True, blank=True, on_delete=models.CASCADE)
     auth_request_at = models.DateTimeField(null=True, blank=True)
-    auth_request_to = models.EmailField(blank=True, default='')
-
-    forum_url = models.URLField(default='', blank=True, validators=[validate_forum_url])
+    auth_request_to = models.EmailField(null=True, blank=True)
 
     @property
     def display_id(self):
-        if self.pk:
-            if self.is_rig:
-                return f"N{self.pk:05d}"
+        if self.is_rig:
+            return str("N%05d" % self.pk)
+        else:
             return self.pk
-        return "????"
-
-    @property
-    def needs_mic(self):
-        return self.is_rig and not self.dry_hire
 
     # Calculated values
     """
@@ -390,7 +349,7 @@ class Event(models.Model, RevisionMixin):
 
     @property
     def sum_total(self):
-        total = self.items.aggregate(
+        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))
         )['sum_total']
@@ -404,9 +363,6 @@ class Event(models.Model, RevisionMixin):
 
     @property
     def vat(self):
-        # No VAT is owed on internal transfers
-        if self.internal:
-            return 0
         return Decimal(self.sum_total * self.vat_rate.rate).quantize(Decimal('.01'))
 
     """
@@ -427,15 +383,7 @@ class Event(models.Model, RevisionMixin):
 
     @property
     def hs_done(self):
-        return self.riskassessment is not None and self.has_checklist and self.has_power
-
-    @property
-    def has_checklist(self):
-        return self.checklists.exists()
-
-    @property
-    def has_power(self):
-        return self.power_tests.exists()
+        return self.riskassessment is not None and len(self.checklists.all()) > 0
 
     @property
     def has_start_time(self):
@@ -508,22 +456,13 @@ class Event(models.Model, RevisionMixin):
         else:
             return bool(self.purchase_order)
 
-    @property
-    def can_check_in(self):
-        earliest = self.earliest_time
-        if isinstance(self.earliest_time, datetime.date):
-            earliest = datetime.datetime.combine(self.earliest_time, datetime.time(00, 00))
-            tz = pytz.timezone(settings.TIME_ZONE)
-            earliest = tz.localize(earliest)
-        return not self.dry_hire and not self.status == Event.CANCELLED and earliest <= timezone.now()
-
     objects = EventManager()
 
     def get_absolute_url(self):
-        return reverse('event_detail', kwargs={'pk': self.pk})
+        return reverse_lazy('event_detail', kwargs={'pk': self.pk})
 
     def __str__(self):
-        return f"{self.display_id} | {self.name}"
+        return "{}: {}".format(self.display_id, self.name)
 
     def clean(self):
         errdict = {}
@@ -554,7 +493,7 @@ class Event(models.Model, RevisionMixin):
 class EventItem(models.Model, RevisionMixin):
     event = models.ForeignKey('Event', related_name='items', blank=True, on_delete=models.CASCADE)
     name = models.CharField(max_length=255)
-    description = models.TextField(blank=True, default='')
+    description = models.TextField(blank=True, null=True)
     quantity = models.IntegerField()
     cost = models.DecimalField(max_digits=10, decimal_places=2)
     order = models.IntegerField()
@@ -569,11 +508,11 @@ class EventItem(models.Model, RevisionMixin):
         ordering = ['order']
 
     def __str__(self):
-        return f"{self.event_id}.{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 f"item {self.name}"
+        return str("item {}".format(self.name))
 
 
 @reversion.register
@@ -581,62 +520,17 @@ class EventAuthorisation(models.Model, RevisionMixin):
     event = models.OneToOneField('Event', related_name='authorisation', on_delete=models.CASCADE)
     email = models.EmailField()
     name = models.CharField(max_length=255)
-    uni_id = models.CharField(max_length=10, blank=True, default='', verbose_name="University ID")
-    account_code = models.CharField(max_length=50, default='', blank=True)
+    uni_id = models.CharField(max_length=10, blank=True, null=True, verbose_name="University ID")
+    account_code = models.CharField(max_length=50, 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('event_detail', kwargs={'pk': self.event_id})
+        return reverse_lazy('event_detail', kwargs={'pk': self.event.pk})
 
     @property
     def activity_feed_string(self):
-        return f"{self.event.display_id} (requested by {self.sent_by.initials})"
-
-
-class InvoiceManager(models.Manager):
-    def outstanding_invoices(self):
-        # Manual query is the only way I have found to do this efficiently. Not ideal but needs must
-        sql = "SELECT * FROM " \
-              "(SELECT " \
-              "(SELECT COUNT(p.amount) FROM \"RIGS_payment\" AS p WHERE p.invoice_id=\"RIGS_invoice\".id) AS \"payment_count\", " \
-              "(SELECT SUM(ei.cost * ei.quantity) FROM \"RIGS_eventitem\" AS ei WHERE ei.event_id=\"RIGS_invoice\".event_id) AS \"cost\", " \
-              "(SELECT SUM(p.amount) FROM \"RIGS_payment\" AS p WHERE p.invoice_id=\"RIGS_invoice\".id) AS \"payments\", " \
-              "\"RIGS_invoice\".\"id\", \"RIGS_invoice\".\"event_id\", \"RIGS_invoice\".\"invoice_date\", \"RIGS_invoice\".\"void\" FROM \"RIGS_invoice\") " \
-              "AS sub " \
-              "WHERE (((cost > 0.0) AND (payment_count=0)) OR (cost - payments) <> 0.0) AND void = '0'" \
-              "ORDER BY invoice_date"
-
-        query = self.raw(sql)
-        return query
-
-    def search(self, query=None):
-        qs = self.get_queryset()
-        if query is not None:
-            or_lookup = Q(event__name__icontains=query)
-
-            or_lookup = filter_by_pk(or_lookup, query)
-
-            # try and parse an int
-            try:
-                val = int(query)
-                or_lookup = or_lookup | Q(event__pk=val)
-            except:  # noqa
-                # not an integer
-                pass
-
-            try:
-                if query[0] == "N":
-                    val = int(query[1:])
-                    or_lookup = Q(event__pk=val)  # If string is Nxxxxx then filter by event number
-                elif query[0] == "#":
-                    val = int(query[1:])
-                    or_lookup = Q(pk=val)  # If string is #xxxxx then filter by invoice number
-            except:  # noqa
-                pass
-
-            qs = qs.filter(or_lookup).distinct()  # distinct() is often necessary with Q lookups
-        return qs
+        return "{} (requested by {})".format(self.event.display_id, self.sent_by.initials)
 
 
 @reversion.register(follow=['payment_set'])
@@ -647,8 +541,6 @@ class Invoice(models.Model, RevisionMixin):
 
     reversion_perm = 'RIGS.view_invoice'
 
-    objects = InvoiceManager()
-
     @property
     def sum_total(self):
         return self.event.sum_total
@@ -673,18 +565,18 @@ class Invoice(models.Model, RevisionMixin):
         return self.balance == 0 or self.void
 
     def get_absolute_url(self):
-        return reverse('invoice_detail', kwargs={'pk': self.pk})
+        return reverse_lazy('invoice_detail', kwargs={'pk': self.pk})
 
     @property
     def activity_feed_string(self):
-        return f"{self.display_id} for Event {self.event.display_id}"
+        return "#{} for Event {}".format(self.display_id, "N%05d" % self.event.pk)
 
     def __str__(self):
-        return f"{self.display_id}: {self.event} (£{self.balance:.2f})"
+        return "%i: %s (%.2f)" % (self.pk, self.event, self.balance)
 
     @property
     def display_id(self):
-        return f"#{self.pk:05d}"
+        return "{:05d}".format(self.pk)
 
     class Meta:
         ordering = ['-invoice_date']
@@ -695,27 +587,29 @@ class Payment(models.Model, RevisionMixin):
     CASH = 'C'
     INTERNAL = 'I'
     EXTERNAL = 'E'
+    SUCORE = 'SU'
     ADJUSTMENT = 'T'
     METHODS = (
         (CASH, 'Cash'),
         (INTERNAL, 'Internal'),
         (EXTERNAL, 'External'),
+        (SUCORE, 'SU Core'),
         (ADJUSTMENT, 'TEC Adjustment'),
     )
 
     invoice = models.ForeignKey('Invoice', on_delete=models.CASCADE)
     date = models.DateField()
     amount = models.DecimalField(max_digits=10, decimal_places=2, help_text='Please use ex. VAT')
-    method = models.CharField(max_length=2, choices=METHODS, default='', blank=True)
+    method = models.CharField(max_length=2, choices=METHODS, null=True, blank=True)
 
     reversion_hide = True
 
     def __str__(self):
-        return f"{self.get_method_display()}: {self.amount}"
+        return "%s: %d" % (self.get_method_display(), self.amount)
 
     @property
     def activity_feed_string(self):
-        return f"payment of £{self.amount}"
+        return str("payment of £{}".format(self.amount))
 
 
 def validate_url(value):
@@ -726,21 +620,8 @@ def validate_url(value):
         raise ValidationError('URL must point to a location on the TEC Sharepoint')
 
 
-class ReviewableModel(models.Model):
-    reviewed_at = models.DateTimeField(null=True, blank=True)
-    reviewed_by = models.ForeignKey(settings.AUTH_USER_MODEL, blank=True, null=True,
-                                    verbose_name="Reviewer", on_delete=models.CASCADE)
-
-    class Meta:
-        abstract = True
-
-    @cached_property
-    def fieldz(self):
-        return [n.name for n in list(self._meta.get_fields()) if n.name != 'reviewed_at' and n.name != 'reviewed_by' and not n.is_relation and not n.auto_created]
-
-
 @reversion.register
-class RiskAssessment(ReviewableModel, RevisionMixin):
+class RiskAssessment(models.Model, RevisionMixin):
     SMALL = (0, 'Small')
     MEDIUM = (1, 'Medium')
     LARGE = (2, 'Large')
@@ -754,10 +635,12 @@ class RiskAssessment(ReviewableModel, RevisionMixin):
     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, default='', 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?")
+    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?")
@@ -765,12 +648,12 @@ class RiskAssessment(ReviewableModel, RevisionMixin):
     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, default='', 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, default='', help_text="Upload your power plan to the <a href='https://nottinghamtec.sharepoint.com/'>Sharepoint</a> and submit a link", validators=[validate_url])
+    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, default='', 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?")
+    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?")
@@ -783,14 +666,15 @@ class RiskAssessment(ReviewableModel, RevisionMixin):
     # 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, default='', help_text="Who are the persons on site responsible for their use?")
-    rigging_plan = models.URLField(blank=True, default='', help_text="Upload your rigging plan to the <a href='https://nottinghamtec.sharepoint.com/'>Sharepoint</a> and submit a link", validators=[validate_url])
-
-    # Venue Access
-    parking_and_access = models.BooleanField(help_text="Are there additional requirements for parking and access to the venue? (i.e. campus parking permits, event access wristbands)")
+    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 = {
@@ -799,7 +683,7 @@ class RiskAssessment(ReviewableModel, RevisionMixin):
         'contractors': False,
         'other_companies': False,
         'crew_fatigue': False,
-        # 'big_power': False Doesn't require checking with a super either way
+        'big_power': False,
         'generators': False,
         'other_companies_power': False,
         'nonstandard_equipment_power': False,
@@ -813,7 +697,6 @@ class RiskAssessment(ReviewableModel, RevisionMixin):
         'nonstandard_emergency_procedure': False,
         'special_structures': False,
         'suspended_structures': False,
-        'parking_and_access': False
     }
     inverted_fields = {key: value for (key, value) in expected_values.items() if not value}.keys()
 
@@ -838,29 +721,24 @@ class RiskAssessment(ReviewableModel, RevisionMixin):
         else:
             return self.SMALL[0]
 
-    def get_event_size_display(self):
-        return self.SIZES[self.event_size][1] + " Event"
-
-    def __str__(self):
-        return f"{self.pk} | {self.event}"
-
-    def get_absolute_url(self):
-        return reverse('ra_detail', kwargs={'pk': self.pk})
-
     @property
     def activity_feed_string(self):
         return str(self.event)
 
-    @property
-    def name(self):
-        return str(self)
+    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
-class EventChecklist(ReviewableModel, RevisionMixin):
+@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()
 
@@ -871,38 +749,9 @@ class EventChecklist(ReviewableModel, RevisionMixin):
     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, default='', max_length=255, help_text="Location of Safety Bag/Box")
-    extinguishers_location = models.CharField(blank=True, default='', max_length=255, help_text="Location of fire extinguishers")
+    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")
 
-    inverted_fields = []
-
-    class Meta:
-        ordering = ['event']
-        permissions = [
-            ('review_eventchecklist', 'Can review Event Checklists')
-        ]
-
-    def __str__(self):
-        return f"{self.pk} - {self.event}"
-
-    @property
-    def activity_feed_string(self):
-        return str(self.event)
-
-    def get_absolute_url(self):
-        return reverse('ec_detail', kwargs={'pk': self.pk})
-
-
-@reversion.register
-class PowerTestRecord(ReviewableModel, RevisionMixin):
-    earth_fault_text = "Earth Fault Loop Impedance (Z<small>S</small>) / Ω"
-    pssc_text = "Prospective Short Circuit Current / A"
-
-    event = models.ForeignKey('Event', related_name='power_tests', on_delete=models.CASCADE)
-    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)
-    notes = models.TextField(blank=True, default='')
     # 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>")
@@ -919,66 +768,73 @@ class PowerTestRecord(ReviewableModel, RevisionMixin):
     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.DecimalField(blank=True, null=True, max_digits=6, decimal_places=2, verbose_name="Earth Fault Loop Impedance", help_text=earth_fault_text)
-    fd_pssc = models.IntegerField(blank=True, null=True, verbose_name="PSCC", help_text=pssc_text)
+    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, default='', max_length=255, help_text="Description")
+    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 / V")
-    w1_earth_fault = models.DecimalField(blank=True, null=True, max_digits=6, decimal_places=2, verbose_name="Earth Fault Loop Impedance", help_text=earth_fault_text)
-    w2_description = models.CharField(blank=True, default='', max_length=255, help_text="Description")
+    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 / V")
-    w2_earth_fault = models.DecimalField(blank=True, null=True, max_digits=6, decimal_places=2, verbose_name="Earth Fault Loop Impedance", help_text=earth_fault_text)
-    w3_description = models.CharField(blank=True, default='', max_length=255, help_text="Description")
+    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 / V")
-    w3_earth_fault = models.DecimalField(blank=True, null=True, max_digits=6, decimal_places=2, verbose_name="Earth Fault Loop Impedance", help_text=earth_fault_text)
+    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_power', 'Can review Power Test Records')
+            ('review_eventchecklist', 'Can review Event Checklists')
         ]
 
-    def __str__(self):
-        return f"{self.pk} - {self.event}"
-
-    def get_absolute_url(self):
-        return reverse('pt_detail', kwargs={'pk': self.pk})
-
     @property
     def activity_feed_string(self):
         return str(self.event)
 
-    @property
-    def name(self):
-        return f"Power Test Record - {self.event}"
-
-
-class EventCheckIn(models.Model):
-    event = models.ForeignKey('Event', related_name='crew', on_delete=models.CASCADE)
-    person = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='checkins', on_delete=models.CASCADE)
-    time = models.DateTimeField()
-    role = models.CharField(max_length=50, blank=True)
-    vehicle = models.CharField(max_length=100, blank=True)
-    end_time = models.DateTimeField(null=True, blank=True)
+    def get_absolute_url(self):
+        return reverse_lazy('ec_detail', kwargs={'pk': self.pk})
 
     def __str__(self):
-        return f"{self.person} on {self.event}"
+        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):
-        sass = " Please invent time travel and retry."
-        if self.time > timezone.now():
-            raise ValidationError("May not check in in the future." + sass)
-        if self.end_time and self.end_time < self.time:
-            raise ValidationError("May not check out before you've checked in." + sass)
+        if self.start > self.end:
+            raise ValidationError('Unless you\'ve invented time travel, crew can\'t finish before they have started.')
 
-    def get_absolute_url(self):
-        return reverse('event_detail', kwargs={'pk': self.event_id})
-
-    def active(self):
-        return end_time is not None
+    def __str__(self):
+        return "{} ({})".format(str(self.crewmember), self.role)

RIGS/rigboard.py

@@ -1,35 +1,36 @@
-import copy
-import datetime
-import re
-import premailer
-import simplejson
-import urllib
-import hmac
-import hashlib
+from io import BytesIO
+import urllib.request
+import urllib.error
+import urllib.parse
 
-from envparse import env
-from bs4 import BeautifulSoup
-
-from django.conf import settings
-from django.contrib import messages
-from django.contrib.staticfiles import finders
-from django.core import signing
-from django.core.exceptions import SuspiciousOperation
-from django.core.mail import EmailMultiAlternatives
-from django.db.models import Q
-from django.http import HttpResponse
+from django.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.utils import timezone
+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 import generic
 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 PyRIGS import decorators
-from PyRIGS.views import OEmbedView, is_ajax, ModalURLMixin, PrintView, get_related
 from RIGS import models, forms
+from PyRIGS import decorators
+import datetime
+import re
+import copy
 
 __author__ = 'ghost'
 
@@ -39,15 +40,10 @@ class RigboardIndex(generic.TemplateView):
 
     def get_context_data(self, **kwargs):
         # get super context
-        context = super().get_context_data(**kwargs)
-
-        objects = models.Event.objects.current_events()
-
-        if self.request.GET.get('hide_cancelled', False):
-            objects = objects.exclude(status=models.Event.CANCELLED)
+        context = super(RigboardIndex, self).get_context_data(**kwargs)
 
         # call out method to get current events
-        context['events'] = objects.select_related('riskassessment', 'invoice').prefetch_related('checklists')
+        context['events'] = models.Event.objects.current_events()
         context['page_title'] = "Rigboard"
         return context
 
@@ -56,46 +52,46 @@ class WebCalendar(generic.TemplateView):
     template_name = 'calendar.html'
 
     def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
+        context = super(WebCalendar, self).get_context_data(**kwargs)
         context['view'] = kwargs.get('view', '')
         context['date'] = kwargs.get('date', '')
-        # context['page_title'] = "Calendar"
         return context
 
 
-class EventDetail(generic.DetailView, ModalURLMixin):
+class EventDetail(generic.DetailView):
     template_name = 'event_detail.html'
     model = models.Event
 
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        title = f"{self.object.display_id} | {self.object.name}"
-        if self.object.dry_hire:
-            title += " <span class='badge badge-secondary'>Dry Hire</span>"
-        context['page_title'] = title
-        if is_ajax(self.request):
-            context['override'] = "base_ajax.html"
-        else:
-            context['override'] = 'base_assets.html'
-        return context
+
+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 EventOEmbed(OEmbedView):
-    model = models.Event
-    url_name = 'event_embed'
-
-
 class EventCreate(generic.CreateView):
     model = models.Event
     form_class = forms.EventForm
     template_name = 'event_form.html'
 
     def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
+        context = super(EventCreate, self).get_context_data(**kwargs)
         context['page_title'] = "New Event"
         context['edit'] = True
         context['currentVAT'] = models.VatRate.objects.current_rate()
@@ -104,8 +100,11 @@ class EventCreate(generic.CreateView):
         if hasattr(form, 'items_json') and re.search(r'"-\d+"', form['items_json'].value()):
             messages.info(self.request, "Your item changes have been saved. Please fix the errors and save the event.")
 
-        get_related(form, context)
-
+        # 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
 
     def get_success_url(self):
@@ -118,13 +117,17 @@ class EventUpdate(generic.UpdateView):
     template_name = 'event_form.html'
 
     def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        context['page_title'] = f"Event {self.object.display_id}"
+        context = super(EventUpdate, self).get_context_data(**kwargs)
+        context['page_title'] = "Event {}".format(self.object.display_id)
         context['edit'] = True
 
         form = context['form']
 
-        get_related(form, context)
+        # 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
 
@@ -138,7 +141,7 @@ class EventUpdate(generic.UpdateView):
             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().render_to_response(context, **response_kwargs)
+        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})
@@ -146,7 +149,7 @@ class EventUpdate(generic.UpdateView):
 
 class EventDuplicate(EventUpdate):
     def get_object(self, queryset=None):
-        old = super().get_object(queryset)  # Get the object (the event you're duplicating)
+        old = super(EventDuplicate, self).get_object(queryset)  # Get the object (the event you're duplicating)
         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
@@ -155,10 +158,9 @@ class EventDuplicate(EventUpdate):
         # Clear checked in by if it's a dry hire
         if new.dry_hire is True:
             new.checked_in_by = None
-            new.collector = None
 
         # Remove all the authorisation information from the new event
-        new.auth_request_to = ''
+        new.auth_request_to = None
         new.auth_request_by = None
         new.auth_request_at = None
 
@@ -171,22 +173,47 @@ class EventDuplicate(EventUpdate):
         return new
 
     def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        context['page_title'] = f"Duplicate of Event {self.object.display_id}"
+        context = super(EventDuplicate, self).get_context_data(**kwargs)
+        context['page_title'] = "Duplicate of Event {}".format(self.object.display_id)
         context["duplicate"] = True
         return context
 
 
-class EventPrint(PrintView):
-    model = models.Event
-    template_name = 'event_print.xml'
-    append_terms = True
+class EventPrint(generic.View):
+    def get(self, request, pk):
+        object = get_object_or_404(models.Event, pk=pk)
+        template = get_template('event_print.xml')
 
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        context['quote'] = True
-        context['filename'] = f"Event_{context['object'].display_id}_{context['object_name']}_{context['object'].start_date}.pdf"
-        return context
+        merger = PdfFileMerger()
+
+        context = {
+            'object': object,
+            'fonts': {
+                'opensans': {
+                    'regular': 'static/fonts/OPENSANS-REGULAR.TTF',
+                    'bold': 'static/fonts/OPENSANS-BOLD.TTF',
+                }
+            },
+            'quote': True,
+            'current_user': request.user,
+            'filename': 'Event {} {} {}.pdf'.format(object.display_id, re.sub(r'[^a-zA-Z0-9 \n\.]', '', object.name), object.start_date)
+        }
+
+        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)
+
+        response = HttpResponse(content_type='application/pdf')
+        response['Content-Disposition'] = 'filename="{}"'.format(context['filename'])
+        response.write(merged.getvalue())
+        return response
 
 
 class EventArchive(generic.ListView):
@@ -195,7 +222,9 @@ class EventArchive(generic.ListView):
     paginate_by = 25
 
     def get_context_data(self, **kwargs):
-        context = super().get_context_data(**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
@@ -219,22 +248,37 @@ class EventArchive(generic.ListView):
             filter &= Q(start_date__gte=start)
 
         q = self.request.GET.get('q', "")
-        objects = self.model.objects.all()
 
-        if q:
-            objects = self.model.objects.search(q)
+        if q != "":
+            qfilter = Q(name__icontains=q) | Q(description__icontains=q) | Q(notes__icontains=q)
+
+            # 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 = objects.filter(filter).order_by('-start_date')
+        qs = self.model.objects.filter(filter).order_by('-start_date')
 
         # Preselect related for efficiency
         qs.select_related('person', 'organisation', 'venue', 'mic')
 
-        if not qs.exists():
+        if len(qs) == 0:
             messages.add_message(self.request, messages.WARNING, "No events have been found matching those criteria.")
 
         return qs
@@ -243,7 +287,6 @@ class EventArchive(generic.ListView):
 class EventAuthorise(generic.UpdateView):
     template_name = 'eventauthorisation_form.html'
     success_template = 'eventauthorisation_success.html'
-    preview = False
 
     def form_valid(self, form):
         self.object = form.save()
@@ -251,7 +294,7 @@ class EventAuthorise(generic.UpdateView):
         self.template_name = self.success_template
         messages.add_message(self.request, messages.SUCCESS,
                              'Success! Your event has been authorised. ' +
-                             f'You will also receive email confirmation to {self.object.email}.')
+                             'You will also receive email confirmation to %s.' % (self.object.email))
         return self.render_to_response(self.get_context_data())
 
     @property
@@ -265,13 +308,12 @@ class EventAuthorise(generic.UpdateView):
         return forms.InternalClientEventAuthorisationForm
 
     def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
+        context = super(EventAuthorise, self).get_context_data(**kwargs)
         context['event'] = self.event
         context['tos_url'] = settings.TERMS_OF_HIRE_URL
-        context['page_title'] = f"{self.event.display_id}: {self.event.name}"
+        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>'
-        context['preview'] = self.preview
         return context
 
     def get(self, request, *args, **kwargs):
@@ -284,10 +326,10 @@ class EventAuthorise(generic.UpdateView):
                 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().get(request, *args, **kwargs)
+        return super(EventAuthorise, self).get(request, *args, **kwargs)
 
     def get_form(self, **kwargs):
-        form = super().get_form(**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
@@ -303,7 +345,7 @@ class EventAuthorise(generic.UpdateView):
         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().dispatch(request, *args, **kwargs)
+        return super(EventAuthorise, self).dispatch(request, *args, **kwargs)
 
 
 class EventAuthorisationRequest(generic.FormView, generic.detail.SingleObjectMixin):
@@ -313,14 +355,14 @@ class EventAuthorisationRequest(generic.FormView, generic.detail.SingleObjectMix
 
     @method_decorator(decorators.nottinghamtec_address_required)
     def dispatch(self, *args, **kwargs):
-        return super().dispatch(*args, **kwargs)
+        return super(EventAuthorisationRequest, self).dispatch(*args, **kwargs)
 
     @property
     def object(self):
         return self.get_object()
 
     def get_success_url(self):
-        if is_ajax(self.request):
+        if self.request.is_ajax():
             url = reverse_lazy('closemodal')
             messages.info(self.request, "location.reload()")
         else:
@@ -353,13 +395,13 @@ class EventAuthorisationRequest(generic.FormView, generic.detail.SingleObjectMix
             context['to_name'] = event.organisation.name
 
         msg = EmailMultiAlternatives(
-            f"{self.object.display_id} | {self.object.name} - Event Authorisation Request",
-            get_template("email/eventauthorisation_client_request.txt").render(context),
+            "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 = finders.find('css/email.css')
-        html = premailer.Premailer(get_template("email/eventauthorisation_client_request.html").render(context),
+        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')
 
@@ -369,61 +411,23 @@ class EventAuthorisationRequest(generic.FormView, generic.detail.SingleObjectMix
 
 
 class EventAuthoriseRequestEmailPreview(generic.DetailView):
-    template_name = "email/eventauthorisation_client_request.html"
+    template_name = "eventauthorisation_client_request.html"
     model = models.Event
 
     def render_to_response(self, context, **response_kwargs):
-        css = finders.find('css/email.css')
-        response = super().render_to_response(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().get_context_data(**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)
-        context['target'] = 'event_authorise_form_preview'
         return context
-
-
-class CreateForumThread(generic.base.RedirectView):
-    permanent = False
-
-    def get_redirect_url(self, *args, **kwargs):
-        event = get_object_or_404(models.Event, pk=kwargs['pk'])
-
-        if event.forum_url:
-            return event.forum_url
-
-        params = {
-            'title': str(event),
-            'body': f'https://rigs.nottinghamtec.co.uk/event/{event.pk}',
-            'category': 'rig-info'
-        }
-        return f'https://forum.nottinghamtec.co.uk/new-topic?{urllib.parse.urlencode(params)}'
-
-
-class RecieveForumWebhook(generic.View):
-    @method_decorator(csrf_exempt)
-    def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)
-
-    def post(self, request, *args, **kwargs):
-        computed = f"sha256={hmac.new(env('FORUM_WEBHOOK_SECRET').encode(), request.body, hashlib.sha256).hexdigest()}"
-        if not hmac.compare_digest(request.headers.get('X-Discourse-Event-Signature'), computed):
-            return HttpResponseForbidden('Invalid signature header')
-        # Check if this is the right kind of event. The webhook filters by category on the forum side
-        if request.headers.get('X-Discourse-Event') == "topic_created":
-            body = simplejson.loads(request.body.decode('utf-8'))
-            event_id = int(body['topic']['title'][1:6])  # find the ID, force convert it to an int to eliminate leading zeros
-            event = models.Event.objects.filter(pk=event_id).first()
-            if event:
-                event.forum_url = f"https://forum.nottinghamtec.co.uk/t/{body['topic']['slug']}"
-                event.save()
-                return HttpResponse(status=202)
-        return HttpResponse(status=204)

RIGS/signals.py

@@ -1,31 +1,37 @@
+import datetime
 import re
+import urllib.request
 import urllib.error
 import urllib.parse
-import urllib.request
 from io import BytesIO
-import datetime
 
+from django.db.models.signals import post_save
 from PyPDF2 import PdfFileReader, PdfFileMerger
 from django.conf import settings
-from django.contrib.staticfiles import finders
-from django.core.cache import cache
+from django.contrib.staticfiles.storage import staticfiles_storage
 from django.core.mail import EmailMessage, EmailMultiAlternatives
-from django.db.models.signals import post_save
+from django.core.cache import cache
 from django.template.loader import get_template
 from django.urls import reverse
 from django.utils import timezone
-from premailer import Premailer
 from registration.signals import user_activated
-from reversion import revisions as reversion
+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,
     }
@@ -55,23 +61,23 @@ def send_eventauthorisation_success_email(instance):
     elif instance.event.organisation is not None and instance.email == instance.event.organisation.email:
         context['to_name'] = instance.event.organisation.name
 
-    subject = f"{instance.event.display_id} | {instance.event.name} - Event Authorised"
+    subject = "N%05d | %s - Event Authorised" % (instance.event.pk, instance.event.name)
 
     client_email = EmailMultiAlternatives(
         subject,
-        get_template("email/eventauthorisation_client_success.txt").render(context),
+        get_template("eventauthorisation_client_success.txt").render(context),
         to=[instance.email],
         reply_to=[settings.AUTHORISATION_NOTIFICATION_ADDRESS],
     )
 
-    css = finders.find('css/email.css')
-    html = Premailer(get_template("email/eventauthorisation_client_success.html").render(context),
+    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(f'{instance.event.display_id} - {escapedEventName} - CONFIRMATION.pdf',
+    client_email.attach('N%05d - %s - CONFIRMATION.pdf' % (instance.event.pk, escapedEventName),
                         merged.getvalue(),
                         'application/pdf'
                         )
@@ -83,7 +89,7 @@ def send_eventauthorisation_success_email(instance):
 
     mic_email = EmailMessage(
         subject,
-        get_template("email/eventauthorisation_mic_success.txt").render(context),
+        get_template("eventauthorisation_mic_success.txt").render(context),
         to=[mic_email_address]
     )
 
@@ -111,19 +117,19 @@ def send_admin_awaiting_approval_email(user, request, **kwargs):
         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") + f'?is_approved__exact=0&date_joined__date={timezone.now().date()}',
+                '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(
-                f"{context['number_of_users']} new users awaiting approval on RIGS",
-                get_template("email/admin_awaiting_approval.txt").render(context),
+                "%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 = finders.find('css/email.css')
-            html = Premailer(get_template("email/admin_awaiting_approval.html").render(context),
+            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()

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

@@ -0,0 +1,28 @@
+/*!
+ * Ajax Bootstrap Select
+ *
+ * Extends existing [Bootstrap Select] implementations by adding the ability to search via AJAX requests as you type. Originally for CROSCON.
+ *
+ * @version 1.4.5
+ * @author Adam Heim - https://github.com/truckingsim
+ * @link https://github.com/truckingsim/Ajax-Bootstrap-Select
+ * @copyright 2019 Adam Heim
+ * @license Released under the MIT license.
+ *
+ * Contributors:
+ *   Mark Carver - https://github.com/markcarver
+ *
+ * Last build: 2019-04-23 12:18:56 PM EDT
+ */
+.bootstrap-select .status {
+  background: #f0f0f0;
+  clear: both;
+  color: #999;
+  font-size: 11px;
+  font-style: italic;
+  font-weight: 500;
+  line-height: 1;
+  margin-bottom: -5px;
+  padding: 10px 20px; }
+
+/*# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImFqYXgtYm9vdHN0cmFwLXNlbGVjdC5jc3MiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7Ozs7Ozs7OztFQWVFO0FBQ0Y7RUFDRSxtQkFBbUI7RUFDbkIsV0FBVztFQUNYLFdBQVc7RUFDWCxlQUFlO0VBQ2Ysa0JBQWtCO0VBQ2xCLGdCQUFnQjtFQUNoQixjQUFjO0VBQ2QsbUJBQW1CO0VBQ25CLGtCQUFrQixFQUFBIiwiZmlsZSI6ImFqYXgtYm9vdHN0cmFwLXNlbGVjdC5jc3MiLCJzb3VyY2VzQ29udGVudCI6WyIvKiFcbiAqIEFqYXggQm9vdHN0cmFwIFNlbGVjdFxuICpcbiAqIEV4dGVuZHMgZXhpc3RpbmcgW0Jvb3RzdHJhcCBTZWxlY3RdIGltcGxlbWVudGF0aW9ucyBieSBhZGRpbmcgdGhlIGFiaWxpdHkgdG8gc2VhcmNoIHZpYSBBSkFYIHJlcXVlc3RzIGFzIHlvdSB0eXBlLiBPcmlnaW5hbGx5IGZvciBDUk9TQ09OLlxuICpcbiAqIEB2ZXJzaW9uIDEuNC41XG4gKiBAYXV0aG9yIEFkYW0gSGVpbSAtIGh0dHBzOi8vZ2l0aHViLmNvbS90cnVja2luZ3NpbVxuICogQGxpbmsgaHR0cHM6Ly9naXRodWIuY29tL3RydWNraW5nc2ltL0FqYXgtQm9vdHN0cmFwLVNlbGVjdFxuICogQGNvcHlyaWdodCAyMDE5IEFkYW0gSGVpbVxuICogQGxpY2Vuc2UgUmVsZWFzZWQgdW5kZXIgdGhlIE1JVCBsaWNlbnNlLlxuICpcbiAqIENvbnRyaWJ1dG9yczpcbiAqICAgTWFyayBDYXJ2ZXIgLSBodHRwczovL2dpdGh1Yi5jb20vbWFya2NhcnZlclxuICpcbiAqIExhc3QgYnVpbGQ6IDIwMTktMDQtMjMgMTI6MTg6NTYgUE0gRURUXG4gKi9cbi5ib290c3RyYXAtc2VsZWN0IC5zdGF0dXMge1xuICBiYWNrZ3JvdW5kOiAjZjBmMGYwO1xuICBjbGVhcjogYm90aDtcbiAgY29sb3I6ICM5OTk7XG4gIGZvbnQtc2l6ZTogMTFweDtcbiAgZm9udC1zdHlsZTogaXRhbGljO1xuICBmb250LXdlaWdodDogNTAwO1xuICBsaW5lLWhlaWdodDogMTtcbiAgbWFyZ2luLWJvdHRvbTogLTVweDtcbiAgcGFkZGluZzogMTBweCAyMHB4O1xufVxuIl19 */

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

@@ -0,0 +1,28 @@
+/*!
+ * 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

@@ -0,0 +1,23 @@
+.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

@@ -0,0 +1,39 @@
+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

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