[ImgBot] Optimize images

*Total -- 8,936.02kb -> 7,990.11kb (10.59%)

/assets/static/imgs/square_logo.png -- 23.90kb -> 17.64kb (26.18%)
/RIGS/static/imgs/tappytaptap.gif -- 6,433.15kb -> 5,493.51kb (14.61%)
/RIGS/static/imgs/rigs.jpg -- 277.61kb -> 277.60kb (0%)
/RIGS/static/imgs/training.jpg -- 852.42kb -> 852.42kb (0%)
/RIGS/static/imgs/assets.jpg -- 1,348.94kb -> 1,348.94kb (0%)

Signed-off-by: ImgBotApp <ImgBotHelp@gmail.com>

.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

@@ -13,20 +13,26 @@ jobs:
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v2
         with:
-            python-version: 3.9
-            cache: 'pipenv'
+            python-version: 3.9.1
+      - uses: actions/cache@v2
+        id: pcache
+        with:
+            path: ~/.local/share/virtualenvs
+            key: ${{ runner.os }}-pipenv-${{ hashFiles('Pipfile.lock') }}
+            restore-keys: |
+              ${{ runner.os }}-pipenv-
       - name: Install Dependencies
         run: |
-              python3 -m pip install --upgrade pip pipenv
+              python -m pip install --upgrade pip pipenv
               pipenv install -d
         # if: steps.pcache.outputs.cache-hit != 'true'
       - name: Cache Static Files
         id: static-cache
-        uses: actions/cache@v3
+        uses: actions/cache@v2
         with:
             path: 'pipeline/built_assets'
             key: ${{ hashFiles('package-lock.json') }}-${{ hashFiles('pipeline/source_assets') }}
@@ -37,9 +43,9 @@ jobs:
       - name: Basic Checks
         run: |
               pipenv run pycodestyle . --exclude=migrations,node_modules
-              pipenv run python3 manage.py check
-              pipenv run python3 manage.py makemigrations --check --dry-run
-              pipenv run python3 manage.py collectstatic --noinput
+              pipenv run python manage.py check
+              pipenv run python manage.py makemigrations --check --dry-run
+              pipenv run python manage.py collectstatic --noinput
       - name: Run Tests
         run: pipenv run pytest -n auto -vv --cov
       - uses: actions/upload-artifact@v2

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"]

Pipfile

@@ -11,6 +11,7 @@ asgiref = "~=3.3.1"
 beautifulsoup4 = "~=4.9.3"
 Brotli = "~=1.0.9"
 cachetools = "~=4.2.1"
+certifi = "~=2020.12.5"
 chardet = "~=4.0.0"
 configparser = "~=5.0.1"
 contextlib2 = "~=0.6.0.post1"
@@ -19,35 +20,37 @@ cssutils = "~=1.0.2"
 dj-database-url = "~=0.5.0"
 dj-static = "~=0.0.6"
 Django = "~=3.2"
-django-debug-toolbar = "~=4.0.0"
+django-debug-toolbar = "~=3.2"
 django-filter = "~=2.4.0"
 django-ical = "~=1.7.1"
 django-recurrence = "~=1.10.3"
 django-registration-redux = "~=2.9"
 django-reversion = "~=3.0.9"
+django-toolbelt = "~=0.0.1"
 django-widget-tweaks = "~=1.4.8"
 django-htmlmin = "~=0.11.0"
-envparse = "*"
+envparse = "~=0.2.0"
 gunicorn = "~=20.0.4"
 icalendar = "~=4.0.7"
 idna = "~=2.10"
+lxml = "~=4.7.1"
 Markdown = "~=3.3.3"
 msgpack = "~=1.0.2"
 pep517 = "~=0.9.1"
-Pillow = "~=9.3.0"
+Pillow = "~=9.0.0"
 premailer = "~=3.7.0"
 progress = "~=1.5"
 psutil = "~=5.8.0"
 psycopg2 = "~=2.8.6"
 Pygments = "~=2.7.4"
 pyparsing = "~=2.4.7"
-PyPDF2 = "~=1.27.5"
-PyPOM = "~=2.2.4"
+PyPDF2 = "~=1.26.0"
+PyPOM = "~=2.2.0"
 python-dateutil = "~=2.8.1"
 pytoml = "~=0.1.21"
 pytz = "~=2020.5"
-reportlab = "*"
-requests = "~=2.31.0"
+reportlab = "~=3.5.59"
+requests = "~=2.25.1"
 retrying = "~=1.3.3"
 simplejson = "~=3.17.2"
 six = "~=1.15.0"
@@ -60,6 +63,7 @@ tornado = "~=6.1"
 urllib3 = "~=1.26.5"
 whitenoise = "~=5.2.0"
 yolk = "~=0.4.3"
+"z3c.rml" = "~=4.1.2"
 zipp = "~=3.4.0"
 "zope.component" = "~=4.6.2"
 "zope.deferredimport" = "~=4.3.1"
@@ -75,14 +79,10 @@ python-barcode = "*"
 django-hCaptcha = "*"
 importlib-metadata = "*"
 django-hcaptcha = "*"
-"z3c.rml" = "*"
-pikepdf = "*"
-django-queryable-properties = "*"
-django-mass-edit = "*"
-selenium = "~=4.9.1"
 
 [dev-packages]
-pycodestyle = "~=2.9.1"
+selenium = "~=3.141.0"
+pycodestyle = "*"
 coveralls = "*"
 django-coverage-plugin = "*"
 pytest-cov = "*"

PyRIGS/decorators.py

@@ -9,8 +9,9 @@ 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
 
@@ -24,7 +25,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 +55,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

PyRIGS/settings.py

@@ -42,9 +42,8 @@ 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'))
 
@@ -64,18 +63,17 @@ INSTALLED_APPS = (
     'assets',
     'training',
 
-    # 'debug_toolbar',
+    'debug_toolbar',
     'registration',
     'reversion',
     'widget_tweaks',
     'hcaptcha',
-    'massadmin',
 )
 
 MIDDLEWARE = (
     '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',

PyRIGS/tests/regions.py

@@ -120,10 +120,10 @@ class TextBox(Region):
 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"))
+        return self.driver.execute_script("return document.querySelector('#' + arguments[0]).nextSibling.nextSibling.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)
+        self.driver.execute_script("document.querySelector('#' + arguments[0]).nextSibling.nextSibling.CodeMirror.getDoc().setValue(arguments[1]);", self.root.get_attribute("id"), value)
 
 
 class CheckBox(Region):
@@ -145,7 +145,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):

PyRIGS/tests/test_unit.py

@@ -10,7 +10,6 @@ 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
@@ -136,11 +135,3 @@ def test_keyholder_access(client):
     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

@@ -23,12 +23,10 @@ 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('', 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")),
 ]

PyRIGS/views.py

@@ -1,30 +1,18 @@
 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
+import simplejson
 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.http import HttpResponse
 from django.shortcuts import get_object_or_404
 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 RIGS import models
 from assets import models as asset_models
@@ -35,20 +23,12 @@ 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
     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())
         return context
 
 
@@ -59,7 +39,6 @@ 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,
     }
@@ -70,9 +49,8 @@ class SecureAPIRequest(generic.View):
         'organisation': 'RIGS.view_organisation',
         'profile': 'RIGS.view_profile',
         'event': None,
-        'asset': None,
         'supplier': None,
-        'training_item': None,
+        'training_item': None,  # TODO
     }
 
     '''
@@ -141,13 +119,14 @@ class SecureAPIRequest(generic.View):
                     '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)
@@ -172,7 +151,8 @@ 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)
 
@@ -196,14 +176,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):
             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 != "":
@@ -215,8 +208,8 @@ 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}"
+        context = super(GenericDetailView, self).get_context_data(**kwargs)
+        context['page_title'] = "{} | {}".format(self.model.__name__, self.object.name)
         if is_ajax(self.request):
             context['override'] = "base_ajax.html"
         return context
@@ -226,8 +219,8 @@ 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__}"
+        context = super(GenericUpdateView, self).get_context_data(**kwargs)
+        context['page_title'] = "Edit {}".format(self.model.__name__)
         if is_ajax(self.request):
             context['override'] = "base_ajax.html"
         return context
@@ -237,60 +230,13 @@ 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__}"
+        context = super(GenericCreateView, self).get_context_data(**kwargs)
+        context['page_title'] = "Create {}".format(self.model.__name__)
         if is_ajax(self.request):
             context['override'] = "base_ajax.html"
         return context
 
 
-class 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'
 
@@ -310,72 +256,14 @@ class CloseModal(generic.TemplateView):
 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}"
+        full_url = "{0}://{1}{2}".format(request.scheme, request.META['HTTP_HOST'], embed_url)
 
         data = {
-            'html': f'<iframe src="{full_url}" frameborder="0" width="100%" height="250"></iframe>',
+            'html': '<iframe src="{0}" frameborder="0" width="100%" height="250"></iframe>'.format(full_url),
             '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)
+        json = simplejson.JSONEncoderForHTML().encode(data)
+        return HttpResponse(json, content_type="application/json")

RIGS/admin.py

@@ -8,7 +8,6 @@ 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
 
@@ -20,142 +19,19 @@ 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_staff', 'is_superuser', 'is_supervisor', 'number_of_events')
-    list_display_links = ['username']
+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'), {
@@ -173,12 +49,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)
@@ -207,8 +133,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

@@ -28,8 +28,7 @@ class InvoiceIndex(generic.ListView):
         total = 0
         for i in context['object_list']:
             total += i.balance
-        event_count = len(list(context['object_list']))
-        context['page_title'] = f"Outstanding Invoices ({event_count} Events, £{total:.2f})"
+        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
 
@@ -44,7 +43,7 @@ class InvoiceDetail(generic.DetailView):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         invoice_date = self.object.invoice_date.strftime("%d/%m/%Y")
-        context['page_title'] = f"Invoice {self.object.display_id} ({invoice_date})"
+        context['page_title'] = f"Invoice {self.object.display_id} ({invoice_date}) "
         if self.object.void:
             context['page_title'] += "<span class='badge badge-warning float-right'>VOID</span>"
         elif self.object.is_closed:
@@ -60,14 +59,11 @@ class InvoicePrint(generic.View):
         object = invoice.event
         template = get_template('event_print.xml')
 
-        name = re.sub(r'[^a-zA-Z0-9 \n\.]', '', object.name)
-        filename = f"Invoice {invoice.display_id} for {object.display_id} {name}.pdf"
-
         context = {
             'object': object,
             'invoice': invoice,
             'current_user': request.user,
-            'filename': filename
+            '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)
@@ -77,7 +73,7 @@ class InvoicePrint(generic.View):
         pdfData = buffer.read()
 
         response = HttpResponse(content_type='application/pdf')
-        response['Content-Disposition'] = f'filename="{filename}"'
+        response['Content-Disposition'] = 'filename="{}"'.format(context['filename'])
         response.write(pdfData)
         return response
 
@@ -128,7 +124,32 @@ class InvoiceArchive(generic.ListView):
         return context
 
     def get_queryset(self):
-        return self.model.objects.search(self.request.GET.get('q')).order_by('-invoice_date')
+        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):
@@ -142,7 +163,7 @@ class InvoiceWaiting(generic.ListView):
         objects = self.get_queryset()
         for obj in objects:
             total += obj.sum_total
-        context['page_title'] = f"Events for Invoice ({len(objects)} Events, £{total:.2f})"
+        context['page_title'] = "Events for Invoice ({} Events, £{:.2f})".format(len(objects), total)
         return context
 
     def get_queryset(self):

RIGS/forms.py

@@ -44,7 +44,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'
@@ -153,10 +153,6 @@ class EventAuthorisationRequestForm(forms.Form):
 
 
 class EventRiskAssessmentForm(forms.ModelForm):
-    related_models = {
-        'power_mic': models.Profile,
-    }
-
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         for name, field in self.fields.items():
@@ -176,9 +172,9 @@ class EventRiskAssessmentForm(forms.ModelForm):
         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')
+            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:
@@ -200,41 +196,86 @@ class EventChecklistForm(forms.ModelForm):
 
     related_models = {
         'venue': models.Venue,
+        'power_mic': models.Profile,
     }
 
+    # Two possible formats
+    def parsedatetime(self, date_string):
+        try:
+            return timezone.make_aware(datetime.strptime(date_string, '%Y-%m-%dT%H:%M:%S'))
+        except ValueError:
+            return timezone.make_aware(datetime.strptime(date_string, '%Y-%m-%dT%H:%M'))
+
+    # There's probably a thousand better ways to do this, but this one is mine
+    def clean(self):
+        vehicles = {key: val for key, val in self.data.items()
+                    if key.startswith('vehicle')}
+        for key in vehicles:
+            pk = int(key.split('_')[1])
+            driver_key = 'driver_' + str(pk)
+            if(self.data[driver_key] == ''):
+                raise forms.ValidationError('Add a driver to vehicle ' + str(pk), code='vehicle_mismatch')
+            else:
+                try:
+                    item = models.EventChecklistVehicle.objects.get(pk=pk)
+                except models.EventChecklistVehicle.DoesNotExist:
+                    item = models.EventChecklistVehicle()
+
+                item.vehicle = vehicles['vehicle_' + str(pk)]
+                item.driver = models.Profile.objects.get(pk=self.data[driver_key])
+                item.full_clean('checklist')
+
+                # item does not have a database pk yet as it isn't saved
+                self.items['v' + str(pk)] = item
+
+        crewmembers = {key: val for key, val in self.data.items()
+                       if key.startswith('crewmember')}
+        other_fields = ['start', 'role', 'end']
+        for key in crewmembers:
+            pk = int(key.split('_')[1])
+
+            for field in other_fields:
+                value = self.data['{}_{}'.format(field, pk)]
+                if value == '':
+                    raise forms.ValidationError('Add a {} to crewmember {}'.format(field, pk), code='{}_mismatch'.format(field))
+
+            try:
+                item = models.EventChecklistCrew.objects.get(pk=pk)
+            except models.EventChecklistCrew.DoesNotExist:
+                item = models.EventChecklistCrew()
+
+            item.crewmember = models.Profile.objects.get(pk=self.data['crewmember_' + str(pk)])
+            item.start = self.parsedatetime(self.data['start_' + str(pk)])
+            item.role = self.data['role_' + str(pk)]
+            item.end = self.parsedatetime(self.data['end_' + str(pk)])
+            item.full_clean('checklist')
+
+            # item does not have a database pk yet as it isn't saved
+            self.items['c' + str(pk)] = item
+
+        return super(EventChecklistForm, self).clean()
+
+    def save(self, commit=True):
+        checklist = super(EventChecklistForm, self).save(commit=False)
+        if (commit):
+            # Remove all existing, to be recreated from the form
+            checklist.vehicles.all().delete()
+            checklist.crew.all().delete()
+            checklist.save()
+
+            for key in self.items:
+                item = self.items[key]
+                reversion.add_to_revision(item)
+                # finish and save new database items
+                item.checklist = checklist
+                item.full_clean()
+                item.save()
+
+        self.items.clear()
+
+        return checklist
+
     class Meta:
         model = models.EventChecklist
         fields = '__all__'
         exclude = ['reviewed_at', 'reviewed_by']
-
-
-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()
-
-    class Meta:
-        model = models.PowerTestRecord
-        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,226 @@
+from django.contrib import messages
+from django.http import HttpResponseRedirect
+from django.urls import reverse_lazy
+from django.utils import timezone
+from django.views import generic
+from reversion import revisions as reversion
+
+from RIGS import models, forms
+
+
+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'
+
+    def get_context_data(self, **kwargs):
+        context = super(EventRiskAssessmentDetail, self).get_context_data(**kwargs)
+        context['page_title'] = "Risk Assessment for Event <a href='{}'>{} {}</a>".format(self.object.event.get_absolute_url(), self.object.event.display_id, self.object.event.name)
+        return context
+
+
+class EventRiskAssessmentList(generic.ListView):
+    paginate_by = 20
+    model = models.RiskAssessment
+    template_name = 'hs_object_list.html'
+
+    def get_queryset(self):
+        return self.model.objects.exclude(event__status=models.Event.CANCELLED).order_by('reviewed_at').select_related('event')
+
+    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'
+        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 <a href='{}'>{} {}</a>".format(self.object.event.get_absolute_url(), 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_queryset(self):
+        return self.model.objects.exclude(event__status=models.Event.CANCELLED).order_by('reviewed_at').select_related('event')
+
+    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'
+        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().exclude(status=models.Event.CANCELLED).order_by('-start_date').select_related('riskassessment').prefetch_related('checklists')
+
+    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

@@ -93,7 +93,7 @@ class CalendarICS(ICalFeed):
         title += item.name
 
         # Add the status
-        title += f' ({item.get_status_display()})'
+        title += ' (' + str(item.get_status_display()) + ')'
 
         return title
 
@@ -101,8 +101,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):
@@ -114,13 +115,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'
@@ -139,18 +140,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/generateSampleRIGSData.py

@@ -278,7 +278,7 @@ class Command(BaseCommand):
                                                      suspended_structures=bool(random.getrandbits(1)),
                                                      outside=bool(random.getrandbits(1)))
                 if i == 0 or random.randint(0, 1) > 0:  # Event 1 and 1 in 10 have a Checklist
-                    models.EventChecklist.objects.create(event=new_event,
+                    models.EventChecklist.objects.create(event=new_event, power_mic=random.choice(self.profiles),
                                                          safe_parking=bool(random.getrandbits(1)),
                                                          safe_packing=bool(random.getrandbits(1)),
                                                          exits=bool(random.getrandbits(1)),
@@ -287,4 +287,6 @@ class Command(BaseCommand):
                                                          ear_plugs=bool(random.getrandbits(1)),
                                                          hs_location="Locked away safely",
                                                          extinguishers_location="Somewhere, I forgot",
+                                                         earthing=bool(random.getrandbits(1)),
+                                                         pat=bool(random.getrandbits(1)),
                                                          date=timezone.now(), venue=random.choice(self.venues))

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/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/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_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_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/models.py

@@ -8,7 +8,6 @@ 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
@@ -18,25 +17,13 @@ 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
-
-
-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
 
 
 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.")
+    is_approved = models.BooleanField(default=False)
     # 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)
@@ -63,7 +50,7 @@ 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
@@ -81,32 +68,48 @@ class Profile(AbstractUser):
     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
 
+class RevisionMixin:
+    @property
+    def is_first_version(self):
+        versions = Version.objects.get_for_object(self)
+        return len(versions) == 1
 
-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)
+    @property
+    def current_version(self):
+        version = Version.objects.get_for_object(self).select_related('revision').first()
+        return version
 
-            or_lookup = filter_by_pk(or_lookup, query)
+    @property
+    def last_edited_at(self):
+        version = self.current_version
+        if version is None:
+            return None
+        return version.revision.date_created
 
-            qs = qs.filter(or_lookup).distinct()  # distinct() is often necessary with Q lookups
-        return qs
+    @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 f"V{version.pk} | R{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='')
 
-    objects = ContactableManager()
+    address = models.TextField(blank=True, default='')
+
+    notes = models.TextField(blank=True, default='')
 
     def __str__(self):
         string = self.name
@@ -139,12 +142,12 @@ 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)
 
-    objects = ContactableManager()
-
     def __str__(self):
         string = self.name
         if self.notes is not None:
@@ -213,9 +216,8 @@ class Venue(models.Model, RevisionMixin):
     email = models.EmailField(blank=True, default='')
     three_phase_available = models.BooleanField(default=False)
     notes = models.TextField(blank=True, default='')
-    address = models.TextField(blank=True, default='')
 
-    objects = ContactableManager()
+    address = models.TextField(blank=True, default='')
 
     def __str__(self):
         string = self.name
@@ -290,23 +292,6 @@ class EventManager(models.Manager):
 
         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
-
 
 @reversion.register(follow=['items'])
 class Event(models.Model, RevisionMixin):
@@ -361,8 +346,10 @@ class Event(models.Model, RevisionMixin):
     def display_id(self):
         if self.pk:
             if self.is_rig:
-                return f"N{self.pk:05d}"
+                return str("N%05d" % self.pk)
+
             return self.pk
+
         return "????"
 
     # Calculated values
@@ -409,15 +396,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):
@@ -490,15 +469,6 @@ 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.start_date, datetime.time(00, 00))
-            tz = pytz.timezone(settings.TIME_ZONE)
-            earliest = tz.localize(earliest)
-        return not self.dry_hire and earliest <= timezone.now()
-
     objects = EventManager()
 
     def get_absolute_url(self):
@@ -592,34 +562,6 @@ class InvoiceManager(models.Manager):
         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
-
 
 @reversion.register(follow=['payment_set'])
 class Invoice(models.Model, RevisionMixin):
@@ -659,14 +601,14 @@ class Invoice(models.Model, RevisionMixin):
 
     @property
     def activity_feed_string(self):
-        return f"{self.display_id} for Event {self.event.display_id}"
+        return "#{} for Event {}".format(self.display_id, self.event.display_id)
 
     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,11 +637,11 @@ class Payment(models.Model, RevisionMixin):
     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):
@@ -710,21 +652,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')
@@ -772,6 +701,10 @@ class RiskAssessment(ReviewableModel, RevisionMixin):
 
     # 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 = {
@@ -780,7 +713,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,
@@ -808,6 +741,10 @@ class RiskAssessment(ReviewableModel, RevisionMixin):
             ('review_riskassessment', 'Can review Risk Assessments')
         ]
 
+    @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]
+
     @property
     def event_size(self):
         # Confirm event size. Check all except generators, since generators entails outside
@@ -818,29 +755,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('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()
 
@@ -854,32 +786,6 @@ class EventChecklist(ReviewableModel, RevisionMixin):
     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")
 
-    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):
-    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>")
@@ -915,40 +821,58 @@ class PowerTestRecord(ReviewableModel, RevisionMixin):
     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}"
+    @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]
 
     @property
     def activity_feed_string(self):
         return str(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('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,9 +1,14 @@
 import copy
 import datetime
 import re
+import urllib.error
+import urllib.parse
+import urllib.request
+from io import BytesIO
+
 import premailer
 import simplejson
-
+from PyPDF2 import PdfFileMerger, PdfFileReader
 from django.conf import settings
 from django.contrib import messages
 from django.contrib.staticfiles import finders
@@ -19,9 +24,10 @@ from django.urls import reverse_lazy
 from django.utils import timezone
 from django.utils.decorators import method_decorator
 from django.views import generic
+from z3c.rml import rml2pdf
 
 from PyRIGS import decorators
-from PyRIGS.views import OEmbedView, is_ajax, ModalURLMixin, PrintView, get_related
+from PyRIGS.views import OEmbedView, is_ajax
 from RIGS import models, forms
 
 __author__ = 'ghost'
@@ -47,11 +53,10 @@ class WebCalendar(generic.TemplateView):
         context = super().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
 
@@ -61,10 +66,6 @@ class EventDetail(generic.DetailView, ModalURLMixin):
         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
 
 
@@ -92,8 +93,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):
@@ -112,7 +116,11 @@ class EventUpdate(generic.UpdateView):
 
         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
 
@@ -165,16 +173,35 @@ class EventDuplicate(EventUpdate):
         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,
+            '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):
@@ -184,6 +211,7 @@ class EventArchive(generic.ListView):
 
     def get_context_data(self, **kwargs):
         context = super().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
@@ -207,17 +235,32 @@ 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')
@@ -272,7 +315,7 @@ 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)
@@ -341,13 +384,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),
+        html = premailer.Premailer(get_template("eventauthorisation_client_request.html").render(context),
                                    external_styles=css).transform()
         msg.attach_alternative(html, 'text/html')
 
@@ -357,7 +400,7 @@ 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):

RIGS/signals.py

@@ -54,23 +54,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),
+    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'
                         )
@@ -82,7 +82,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]
     )
 
@@ -116,13 +116,13 @@ def send_admin_awaiting_approval_email(user, request, **kwargs):
             }
 
             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),
+            html = Premailer(get_template("admin_awaiting_approval.html").render(context),
                              external_styles=css).transform()
             email.attach_alternative(html, 'text/html')
             email.send()

RIGS/templates/base_print.xml

@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE document SYSTEM "rml.dtd">
-<document filename="{{filename}}">
-    <docinit>
-        <registerTTFont faceName="OpenSans" fileName="static/fonts/OpenSans-Regular.tff"/>
-        <registerTTFont faceName="OpenSans-Bold" fileName="static/fonts/OpenSans-Bold.tff"/>
-        <registerFontFamily name="OpenSans" bold="OpenSans-Bold" boldItalic="OpenSans-Bold"/>
-    </docinit>
-
-    <stylesheet>
-        <initialize>
-            <color id="LightGray" RGB="#D3D3D3"/>
-            <color id="DarkGray" RGB="#707070"/>
-            <color id="Brand" RGB="#3853a4"/>
-        </initialize>
-
-        <paraStyle name="style.para" fontName="OpenSans" />
-        <paraStyle name="blockPara" spaceAfter="5" spaceBefore="5"/>
-        <paraStyle name="style.Heading1" fontName="OpenSans" fontSize="16" leading="18" spaceAfter="0"/>
-        <paraStyle name="style.Heading2" fontName="OpenSans-Bold" fontSize="10" spaceAfter="2"/>
-        <paraStyle name="style.Heading3" fontName="OpenSans" fontSize="10" spaceAfter="0"/>
-        <paraStyle name="center" alignment="center"/>
-        <paraStyle name="page-head" alignment="center" fontName="OpenSans-Bold" fontSize="16" leading="18" spaceAfter="0"/>
-
-        <paraStyle name="style.event_description" fontName="OpenSans" textColor="DarkGray" />
-        <paraStyle name="style.item_description" fontName="OpenSans" textColor="DarkGray" leftIndent="10" />
-        <paraStyle name="style.specific_description" fontName="OpenSans" textColor="DarkGray" fontSize="10" />
-        <paraStyle name="style.times" fontName="OpenSans"  fontSize="10" />
-        <paraStyle name="style.head_titles" fontName="OpenSans-Bold" fontSize="10" />
-        <paraStyle name="style.head_numbers" fontName="OpenSans"  fontSize="10" />
-        <paraStyle name="style.emheader" fontName="OpenSans" textColor="White" fontSize="12" backColor="Brand" leading="20" borderPadding="4"/>
-        <paraStyle name="style.breakbefore" parent="emheader" pageBreakBefore="1"/>
-
-        <blockTableStyle id="eventSpecifics">
-            <blockValign value="top"/>
-             <lineStyle kind="LINEAFTER" colorName="LightGrey" start="0,0" stop="1,0" thickness="1"/>
-        </blockTableStyle>
-
-        <blockTableStyle id="headLayout">
-            <blockValign value="top"/>
-
-        </blockTableStyle>
-
-        <blockTableStyle id="eventDetails">
-            <blockValign value="top"/>
-            <blockTopPadding start="0,0" stop="-1,0" length="0"/>
-            <blockLeftPadding start="0,0" stop="0,-1" length="0"/>
-        </blockTableStyle>
-
-        <blockTableStyle id="itemTable">
-            <blockValign value="top"/>
-            <lineStyle kind="LINEBELOW" colorName="LightGrey" start="0,0" stop="-1,-1" thickness="1"/>
-            {#<lineStyle kind="box" colorName="black" thickness="1" start="0,0" stop="-1,-1"/>#}
-        </blockTableStyle>
-
-        <blockTableStyle id="totalTable">
-            <blockLeftPadding start="0,0" stop="0,-1" length="0"/>
-            <lineStyle kind="LINEBELOW" colorName="LightGrey" start="-2,0" stop="-1,-1" thickness="1"/>
-            {# <lineStyle cap="default" kind="grid" colorName="black" thickness="1" start="1,0" stop="-1,-1"/> #}
-        </blockTableStyle>
-
-        <blockTableStyle id="infoTable" keepWithNext="true">
-            <blockLeftPadding start="0,0" stop="-1,-1" length="0"/>
-        </blockTableStyle>
-
-        <blockTableStyle id="paymentTable">
-            <blockBackground colorName="LightGray" start="0,1" stop="3,1"/>
-            <blockFont name="OpenSans-Bold" start="0,1" stop="0,1"/>
-            <blockFont name="OpenSans-Bold" start="2,1" stop="2,1"/>
-            <lineStyle kind="outline" colorName="black" thickness="1" start="0,1" stop="3,1"/>
-        </blockTableStyle>
-
-        <blockTableStyle id="signatureTable">
-            <blockTopPadding length="20" />
-            <blockLeftPadding start="0,0" stop="0,-1" length="0"/>
-            <lineStyle kind="linebelow" start="1,0" stop="1,0" colorName="black"/>
-            <lineStyle kind="linebelow" start="3,0" stop="3,0" colorName="black"/>
-            <lineStyle kind="linebelow" start="5,0" stop="5,0" colorName="black"/>
-        </blockTableStyle>
-
-        <listStyle name="ol"
-                   bulletFormat="%s."
-                   bulletFontSize="10" />
-
-        <listStyle name="ul"
-                   start="bulletchar"
-                   bulletFontSize="10"/>
-    </stylesheet>
-
-    <template title="{{filename}}"> {# Note: page is 595x842 points (1 point=1/72in) #}
-            <pageTemplate id="Headed" >
-                <pageGraphics>
-                    <image file="static/imgs/paperwork/corner-tr-su.jpg" x="395" y="642" height="200" width="200"/>
-                    <image file="static/imgs/paperwork/corner-bl.jpg" x="0" y="0" height="200" width="200"/>
-
-                    {# logo positioned 42 from left, 33 from top #}
-                    <image file="static/imgs/paperwork/tec-logo.jpg" x="42" y="719" height="90" width="84"/>
-
-                    <setFont name="OpenSans-Bold" size="22.5" leading="10"/>
-                    <drawString x="137" y="780">TEC PA &amp; Lighting</drawString>
-
-                    <setFont name="OpenSans" size="9"/>
-                    <drawString x="137" y="760">Portland Building, University Park, Nottingham, NG7 2RD</drawString>
-                    <drawString x="137" y="746">www.nottinghamtec.co.uk</drawString>
-                    <drawString x="265" y="746">info@nottinghamtec.co.uk</drawString>
-                    <drawString x="137" y="732">Phone: (0115) 846 8720</drawString>
-
-                    <setFont name="OpenSans" size="10" />
-                    <drawCenteredString x="302.5" y="38">[Page <pageNumber/> of <getName id="lastPage" default="0" />]</drawCenteredString>
-                    <setFont name="OpenSans" size="7" />
-                    <drawCenteredString x="302.5" y="26">
-                        {{info_string}}
-                    </drawCenteredString>
-                </pageGraphics>
-
-                <frame id="main" x1="50" y1="65" width="495" height="645"/>
-            </pageTemplate>
-
-            <pageTemplate id="Main">
-                <pageGraphics>
-                    <image file="static/imgs/paperwork/corner-tr.jpg" x="395" y="642" height="200" width="200"/>
-                    <image file="static/imgs/paperwork/corner-bl.jpg" x="0" y="0" height="200" width="200"/>
-
-                    <setFont name="OpenSans" size="10"/>
-                    <drawCenteredString x="302.5" y="38">[Page <pageNumber/> of <getName id="lastPage" default="0" />]</drawCenteredString>
-                    <setFont name="OpenSans" size="7" />
-                    <drawCenteredString x="302.5" y="26">
-                        {{info_string}}
-                    </drawCenteredString>
-                </pageGraphics>
-                <frame id="main" x1="50" y1="65" width="495" height="727"/>
-            </pageTemplate>
-    </template>
-
-    <story firstPageTemplate="Headed">
-        <setNextFrame name="main"/>
-        <nextFrame/>
-        {% block content %}
-        {% endblock %}
-    </story>
-
-</document>

RIGS/templates/base_rigs.html

@@ -34,7 +34,16 @@
        </div>
     </li>
     {% if perms.RIGS.view_riskassessment %}
-    <li class="nav-item"><a class="nav-link" href="{% url 'hs_list' %}">H&S</a></li>
+    <li class="nav-item dropdown">
+      <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownHS" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+        H&S
+      </a>
+      <div class="dropdown-menu" aria-labelledby="navbarDropdownHS">
+        <a class="dropdown-item" href="{% url 'hs_list' %}"><span class="fas fa-eye"></span> Overview</a>
+        <a class="dropdown-item" href="{% url 'ra_list' %}"><span class="fas fa-file-medical"></span> Risk Assessments</a>
+        <a class="dropdown-item" href="{% url 'ec_list' %}"><span class="fas fa-tasks"></span> Event Checklists</a>
+      </div>
+    </li>
     {% endif %}
     {% if perms.RIGS.view_invoice %}
     <li class="nav-item dropdown">

RIGS/templates/calendar.html

@@ -27,12 +27,15 @@
 
             calendar = new FullCalendar.Calendar(calendarEl, {
               themeSystem: 'bootstrap',
+              //defaultView: 'dayGridMonth', This is now default
               aspectRatio: 1.5,
               eventTimeFormat: {
                 'hour': '2-digit',
                 'minute': '2-digit',
                 'hour12': false
               },
+              //nowIndicator: true,
+              //firstDay: 1,
               headerToolbar: false,
               editable: false,
               dayMaxEventRows: true, // allow "more" link when too many events
@@ -55,10 +58,8 @@
                             };
                             $(doc).each(function() {
                                 end = $(this).attr('latest')
-                                allDay = false
                                 if(end.indexOf("T") < 0){ //If latest does not contain a time
-                                   end = moment(end + " 23:59").format("YYYY-MM-DD[T]HH:mm:ss")
-                                   allDay = true
+                                   end = moment(end).add(1, 'days') //End date is non-inclusive, so add a day
                                 }
 
                                 thisEvent = {
@@ -66,8 +67,7 @@
                                     'end': end,
                                     'className': 'modal-href',
                                     'title': $(this).attr('title'),
-                                    'url': $(this).attr('url'),
-                                    'allDay': allDay
+                                    'url': $(this).attr('url')
                                 }
 
                                 if($(this).attr('is_rig')===true || $(this).attr('status') === "Cancelled"){

RIGS/templates/email/eventauthorisation_mic_success.txt

@@ -1,5 +0,0 @@
-Hi {{object.event.mic.get_full_name|default_if_none:"somebody"}},
-
-Just to let you know your event N{{object.eventdisplay_id}} has been successfully authorised for £{{object.amount}} by {{object.name}} as of {{object.event.last_edited_at}}.
-
-The TEC Rig Information Gathering System

RIGS/templates/email/ra_reminder.html

@@ -1,16 +0,0 @@
-{% extends 'base_client_email.html' %}
-
-{% block content %}
-    <p>Hi {{event.mic.get_full_name|default_if_none:"Productions Manager"}},</p>
-
-    {% if event.mic %}
-    <p>Just to let you know your event {{event.display_id}} <em>requires<em> a pre-event risk assessment completing prior to the event. Please do so as soon as possible.</p>
-    {% else %}
-    <p>This is a reminder that event {{event.display_id}} requires a MIC assigning and a risk assessment completing.</p>
-    {% endif %}
-
-    <p>Fill it out here:</p>
-    <a href="{{url}}" class="btn btn-info"><span class="fas fa-paperclip"></span> Create Risk Assessment</a>
-
-    <p>TEC PA &amp; Lighting</p>
-{% endblock %}

RIGS/templates/email/ra_reminder.txt

@@ -1,9 +0,0 @@
-Hi {{event.mic.get_full_name|default_if_none:"Productions Manager"}},
-
-{% if event.mic %}
-Just to let you know your event {{event.display_id}} requires a risk assessment completing prior to the event. Please do so as soon as possible.
-{% else %}
-This is a reminder that event {{event.display_id}} requires a MIC assigning and a risk assessment completing.
-{% endif %}
-
-The TEC Rig Information Gathering System

RIGS/templates/event_checklist_detail.html

@@ -7,22 +7,20 @@
 {% block content %}
 <div class="row">
     <div class="col-12 text-right my-3">
-        {% button 'edit' url='pt_edit' pk=object.pk %}
+        {% button 'edit' url='ec_edit' pk=object.pk %}
         {% button 'view' url='event_detail' pk=object.event.pk text="Event" %}
-        {% include 'partials/review_status.html' with perm=perms.RIGS.review_power review='pt_review' %}
+        {% include 'partials/review_status.html' with perm=perms.RIGS.review_eventchecklist review='ec_review' %}
     </div>
 </div>
-<div class="card mb-3">
-    <div class="card-header">{% include 'partials/event_size.html' with object=object.event.riskassessment %}</div>
-    <div class="card-body">
-        <dl class="row">
-                <dt class="col-6">{{ object|help_text:'power_mic' }}</dt>
+<div class="row">
+    <div class="col-md-6 col-sm-12">
+    <div class="card  mb-3">
+        <div class="card-header">General</div>
+        <div class="card-body">
+            <dl class="row">
+                <dt class="col-6">Date</dt>
                 <dd class="col-6">
-                    {% if object.power_mic %}
-                    <a href="{% url 'profile_detail' object.power_mic.pk %}">{{ object.power_mic.name }}</a>
-                    {% else %}
-                    None
-                    {% endif %}
+                    {{ object.date }}
                 </dd>
                 <dt class="col-6">Venue</dt>
                 <dd class="col-6">
@@ -32,11 +30,90 @@
                     </a>
                     {% endif %}
                 </dd>
-                <dt class="col-6">Notes</dt>
+                <dt class="col-6">{{ object|help_text:'power_mic' }}</dt>
                 <dd class="col-6">
-                    {{ object.notes }}
+                    {% if object.power_mic %}
+                    <a href="{% url 'profile_detail' object.power_mic.pk %}">{{ object.power_mic.name }}</a>
+                    {% else %}
+                    None
+                    {% endif %}
                 </dd>
-        </dl>
+            </dl>
+            <p>List vehicles and their drivers</p>
+            <ul>
+                {% for i in object.vehicles.all %}
+                    <li>{{i}}</li>
+                {% endfor %}
+            </ul>
+        </div>
+    </div>
+    </div>
+    <div class="col-md-6 col-sm-12">
+        <div class="card  mb-3">
+            <div class="card-header">Safety Checks</div>
+            <div class="card-body">
+                <dl class="row">
+                    <dt class="col-10">{{ object|help_text:'safe_parking'|safe }}</dt>
+                    <dd class="col-2">
+                        {{ object.safe_parking|yesnoi }}
+                    </dd>
+                    <dt class="col-10">{{ object|help_text:'safe_packing'|safe }}</dt>
+                    <dd class="col-2">
+                        {{ object.safe_packing|yesnoi }}
+                    </dd>
+                    <dt class="col-10">{{ object|help_text:'exits'|safe }}</dt>
+                    <dd class="col-2">
+                        {{ object.exits|yesnoi }}
+                    </dd>
+                    <dt class="col-10">{{ object|help_text:'trip_hazard'|safe }}</dt>
+                    <dd class="col-2">
+                        {{ object.trip_hazard|yesnoi }}
+                    </dd>
+                    <dt class="col-10">{{ object|help_text:'warning_signs'|safe }}</dt>
+                    <dd class="col-2">
+                        {{ object.warning_signs|yesnoi }}
+                    </dd>
+                    <dt class="col-10">{{ object|help_text:'ear_plugs'|safe }}</dt>
+                    <dd class="col-2">
+                        {{ object.ear_plugs|yesnoi }}
+                    </dd>
+                </dl>
+            </div>
+        </div>
+    </div>
+</div>
+<div class="card mb-3">
+    <div class="card-header">Crew Record</div>
+    <div class="table-responsive">
+        <table class="table table-sm">
+            <thead>
+                <tr>
+                    <th scope="col">Crewmember</th>
+                    <th scope="col">Start Time</th>
+                    <th scope="col">Role</th>
+                    <th scope="col">End Time</th>
+                </tr>
+            </thead>
+            <tbody id="crewmemberst">
+                {% for crew in object.crew.all %}
+                <tr>
+                    <td>{{crew.crewmember}}</td>
+                    <td>{{crew.start}}</td>
+                    <td>{{crew.role}}</td>
+                    <td>{{crew.end}}</td>
+                </tr>
+                {% empty %}
+                <tr>
+                    <td colspan="4" class="text-center bg-warning">Apparently this event happened by magic...</td>
+                </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+    </div>
+</div>
+<div class="card  mb-3">
+    <div class="card-header">Power {% include 'partials/event_size.html' with object=object.event.riskassessment %}</div>
+    <div class="card-body">
         {% if object.event.riskassessment.event_size == 0 %}
         <dl class="row">
             <dt class="col-10">{{ object|help_text:'rcds'|safe }}</dt>

RIGS/templates/event_checklist_form.html

@@ -19,15 +19,52 @@
     {{ block.super }}
     <script src="{% static 'js/autocompleter.js' %}"></script>
     <script src="{% static 'js/tooltip.js' %}"></script>
+
+    {% include 'partials/datetime-fix.html' %}
+
+    <script>
+    $(document).ready(function () {
+        $('button[data-action=add]').on('click', function (event) {
+            event.preventDefault();
+            let target = $($(this).attr('data-target'));
+            let newID = Number(target.attr('data-pk'));
+            let newRow = $($(this).attr('data-clone'))
+                    .clone().attr('style', "")
+                   .attr('id', function(i, val){
+                        return val.split("_")[0] + '_' + newID;
+                   })
+                   .appendTo(target);
+            newRow.find('select,input').attr('name', function(i, val){
+                        return val.split("_")[0] + '_' + newID;
+                   })//Disabled is to prevent the hidden row being sent to the form
+                   .removeAttr('disabled');
+            newRow.find('button[data-action=delete]').attr('data-id', newID);
+            newRow.find('select').addClass('selectpicker');
+            newRow.find('.selectpicker').selectpicker('refresh');
+            $(".selectpicker").each(function(){initPicker($(this))});
+            initDatetime();
+            $(target).attr('data-pk', newID - 1);
+        });
+        $(document).on('click', 'button[data-action=delete]', function(event) {
+           event.preventDefault();
+           $(this).closest('tr').remove();
+        });
+        //Somewhat rudimentary way of ensuring people fill in completely (if it hits the database validation the whole table row disappears when the page reloads...)
+        //the not is to avoid adding it to some of bootstrap-selects extra crap
+        $('#vehiclest,#crewmemberst').on('change', 'select,input', function () {
+            $(this).closest('tr').find("select,input").not(':input[type=search]').attr('required', 'true');
+        });
+    });
+    </script>
 {% endblock %}
 
 {% block content %}
     <div class="col-12">
         {% include 'form_errors.html' %}
         {% if edit %}
-        <form role="form" method="POST" action="{% url 'pt_edit' pk=object.pk %}">
+        <form role="form" method="POST" action="{% url 'ec_edit' pk=object.pk %}">
         {% else %}
-        <form role="form" method="POST" action="{% url 'event_pt' pk=event.pk %}">
+        <form role="form" method="POST" action="{% url 'event_ec' pk=event.pk %}">
         {% endif %}
             <input type="hidden" name="{{ form.event.name }}" id="{{ form.event.id_for_label }}"
                value="{{event.pk}}"/>
@@ -47,17 +84,14 @@
                                 <dt class="col-4">Event Size</dt>
                                 <dd class="col-8">{% include 'partials/event_size.html' with object=event.riskassessment %}</dd>
                             </dl>
-                            <hr>
-                            <div class="form-group form-row" id="{{ form.power_mic.id_for_label }}-group">
-                            <label for="{{ form.power_mic.id_for_label }}"
-                                class="col-4 col-form-label">{{ form.power_mic.help_text }}</label>
-                                <select id="{{ form.power_mic.id_for_label }}" name="{{ form.power_mic.name }}" class="form-control selectpicker col-8" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials" required="true">
-                                    {% if power_mic %}
-                                        <option value="{{power_mic.pk}}" selected="selected">{{ power_mic.name }}</option>
-                                    {% elif event.riskassessment.power_mic %}
-                                        <option value="{{event.riskassessment.power_mic.pk}}" selected="selected">{{ event.riskassessment.power_mic.name }}</option>
-                                    {% endif %}
-                                </select>
+                            <div class="form-group form-row">
+                                <label for="{{ form.date.id_for_label }}"
+                                       class="col-4 col-form-label">{{ form.date.label }}</label>
+                                {% if not form.date.value %}
+                                {% render_field form.date class+="form-control col-8" value=event.start_date %}
+                                {% else %}
+                                {% render_field form.date class+="form-control col-8" %}
+                                {% endif %}
                             </div>
                             <div class="form-group form-row" id="{{ form.venue.id_for_label }}-group">
                                 <label for="{{ form.venue.id_for_label }}"
@@ -70,9 +104,129 @@
                                 {% endif %}
                                 </select>
                             </div>
-                            <label for="{{ form.notes.id_for_label }}">Notes</label>
-                            {% render_field form.notes class+="form-control" %}
-                       </div>
+                            <div class="form-group form-row" id="{{ form.power_mic.id_for_label }}-group">
+                            <label for="{{ form.power_mic.id_for_label }}"
+                                class="col-4 col-form-label">{{ form.power_mic.help_text }}</label>
+                                <select id="{{ form.power_mic.id_for_label }}" name="{{ form.power_mic.name }}" class="form-control selectpicker col-8" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials" required="true">
+                                    {% if power_mic %}
+                                        <option value="{{power_mic.pk}}" selected="selected">{{ power_mic.name }}</option>
+                                    {% elif event.riskassessment.power_mic %}
+                                        <option value="{{event.riskassessment.power_mic.pk}}" selected="selected">{{ event.riskassessment.power_mic.name }}</option>
+                                    {% endif %}
+                                </select>
+                            </div>
+                            <p class="pt-3 font-weight-bold">List vehicles and their drivers</p>
+                            <div class="table-responsive">
+                                <table class="table table-sm">
+                                    <thead>
+                                        <tr>
+                                            <th scope="col">Vehicle</th>
+                                            <th scope="col">Driver</th>
+                                            <th scope="col"></th>
+                                        </tr>
+                                    </thead>
+                                    <tbody id="vehiclest" data-pk="-1">
+                                        <tr id="vehicles_new" style="display: none;">
+                                            <td><input type="text" class="form-control" name="vehicle_new" disabled="true"/></td>
+                                            <td><select data-container="body" class="form-control" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials" name="driver_new" disabled="true"></select></td>
+                                            <td><button type="button" class="btn btn-danger btn-sm mt-1" data-action='delete' data-target='#vehicle'><span class="fas fa-times"></span></button></td>
+                                        </tr>
+                                        {% for i in object.vehicles.all %}
+                                        <tr id="vehicles_{{i.pk}}">
+                                            <td><input name="vehicle_{{i.pk}}" type="text" class="form-control" value="{{ i.vehicle }}"/></td>
+                                            <td>
+                                                <select data-container="body" name="driver_{{i.pk}}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials">
+                                                    {% if i.driver != '' %}
+                                                        <option value="{{i.driver.pk}}" selected="selected">{{ i.driver.name }}</option>
+                                                    {% endif %}
+                                                </select>
+                                            </td>
+                                            <td><button type="button" class="btn btn-danger btn-sm mt-1" data-id='{{i.pk}}' data-action='delete' data-target='#vehicle'><span class="fas fa-times"></span></button></td>
+                                        </tr>
+                                        {% endfor %}
+                                    </tbody>
+                                </table>
+                            </div>
+                            <div class="text-right">
+                                <button type="button" class="btn btn-secondary" id="vehicle-add" data-action='add' data-target='#vehiclest' data-clone='#vehicles_new'><span class="fas fa-plus"></span> Add Vehicle</button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row my-3">
+                <div class="col-12">
+                    <div class="card">
+                        <div class="card-header">Safety Checks</div>
+                        <div class="card-body">
+                            {% include 'partials/checklist_checkbox.html' with formitem=form.safe_parking %}
+                            {% include 'partials/checklist_checkbox.html' with formitem=form.safe_packing %}
+                            {% include 'partials/checklist_checkbox.html' with formitem=form.exits %}
+                            {% include 'partials/checklist_checkbox.html' with formitem=form.trip_hazard %}
+                            {% include 'partials/checklist_checkbox.html' with formitem=form.warning_signs %}
+                            {% include 'partials/checklist_checkbox.html' with formitem=form.ear_plugs %}
+                            <div class="row pt-3">
+                                <label class="col-5" for="{{ form.hs_location.id_for_label }}">{{ form.hs_location.help_text }}</label>
+                                {% render_field form.hs_location class+="form-control col-7 col-md-4" %}
+                            </div>
+                            <div class="row pt-1">
+                                <label class="col-5" for="{{ form.extinguishers_location.id_for_label }}">{{ form.extinguishers_location.help_text }}</label>
+                                {% render_field form.extinguishers_location class+="form-control col-7 col-md-4" %}
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row my-3">
+                <div class="col-12">
+                    <div class="card">
+                        <div class="card-header">Crew Record</div>
+                        <div class="card-body">
+                            <div class="table-responsive">
+                                <table class="table table-sm">
+                                    <thead>
+                                        <tr>
+                                            <th scope="col">Person</th>
+                                            <th scope="col">Start Time</th>
+                                            <th scope="col">Role</th>
+                                            <th scope="col">End Time</th>
+                                            <th scope="col"></th>
+                                        </tr>
+                                    </thead>
+                                    <tbody id="crewmemberst" data-pk="-1">
+                                        <tr id="crew_new" style="display: none;">
+                                            <td>
+                                                <select name="crewmember_new" class="form-control" data-container="body" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials" disabled="true"></select>
+                                            </td>
+                                            <td style="min-width: 15ch"><input name="start_new" type="datetime-local" class="form-control" value="{{ i.start }}" disabled=""/></td>
+                                            <td style="min-width: 15ch"><input name="role_new" type="text" class="form-control" value="{{ i.role }}" disabled="true"/></td>
+                                            <td style="min-width: 15ch"><input name="end_new" type="datetime-local" class="form-control" value="{{ i.end }}" disabled="true" /></td>
+                                            <td><button type="button" class="btn btn-danger btn-sm mt-1" data-id='{{crew.pk}}' data-action='delete' data-target='#crewmember'><span class="fas fa-times"></span></button></td>
+                                        </tr>
+                                        {% for crew in object.crew.all %}
+                                        <tr id="crew_{{crew.pk}}">
+                                            <td>
+                                                <select data-container="body" name="crewmember_{{crew.pk}}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials">
+                                                    {% if crew.crewmember != '' %}
+                                                        <option value="{{crew.crewmember.pk}}" selected="selected">{{ crew.crewmember.name }}</option>
+                                                    {% endif %}
+                                                </select>
+                                            </td>
+                                            <td><input name="start_{{crew.pk}}" type="datetime-local" class="form-control" value="{{ crew.start|date:'Y-m-d' }}T{{ crew.start|date:'H:i:s' }}"/></td>
+                                            <td><input name="role_{{crew.pk}}" type="text" class="form-control" value="{{ crew.role }}"/></td>
+                                            <td><input name="end_{{crew.pk}}" type="datetime-local" class="form-control" value="{{ crew.end|date:'Y-m-d' }}T{{ crew.end|date:'H:i:s' }}"/></td>
+                                            <td><button type="button" class="btn btn-danger btn-sm mt-1" data-id='{{crew.pk}}' data-action='delete' data-target='#crewmember'><span class="fas fa-times"></span></button></td>
+                                        </tr>
+                                        {% endfor %}
+                                    </tbody>
+                                </table>
+                            </div>
+                        </div>
+                        <div class="card-footer">
+                            <div class="text-right">
+                                <button type="button" class="btn btn-secondary" data-action='add' data-target='#crewmemberst' data-clone='#crew_new'><span class="fas fa-plus"></span> Add Crewmember</button>
+                            </div>
+                        </div>
                     </div>
                 </div>
             </div>

RIGS/templates/event_detail.html

@@ -1,8 +1,6 @@
 {% extends request.is_ajax|yesno:"base_ajax.html,base_rigs.html" %}
 
 {% load markdown_tags %}
-{% load button from filters %}
-{% load static %}
 
 {% block content %}
 <div class="row my-3 py-3">
@@ -54,43 +52,6 @@
                 </div>
             </div>
         </div>
-        {% if event.can_check_in %}
-        <div class="col-sm-12">
-            <div class="card mt-3">
-                <div class="card-header">Crew Record</div>
-                <div class="table-responsive">
-                    <table class="table table-sm">
-                        <thead>
-                            <tr>
-                                <th scope="col">Name</th>
-                                <th scope="col">Vehicle</th>
-                                <th scope="col">Start Time</th>
-                                <th scope="col">Role</th>
-                                <th scope="col">End Time</th>
-                                <th scope="col">{% if request.user.pk is event.mic.pk %}<a href="{% url 'event_checkin_override' event.pk %}" class="btn btn-sm btn-success"><span class="fas fa-plus"></span> Add</a>{% endif %}</th>
-                            </tr>
-                        </thead>
-                        <tbody id="crewmembers">
-                            {% for crew in object.crew.all %}
-                            <tr>
-                                <td>{{crew.person}}</td>
-                                <td>{{crew.vehicle|default:"None"}}</td>
-                                <td>{{crew.time}}</td>
-                                <td>{{crew.role}}</td>
-                                <td>{% if crew.end_time %}{{crew.end_time}}{% else %}<span class="text-success fas fa-clock" data-toggle="tooltip" title="This person is currently checked into this event"></span>{% endif %}</td>
-                                <td>{% if crew.end_time %}{% if crew.person.pk == request.user.pk or event.mic.pk == request.user.pk %}{% button 'edit' 'edit_checkin' crew.pk clazz='btn-sm modal-href' %}{% endif %}{%endif%}</td>
-                            </tr>
-                            {% empty %}
-                            <tr>
-                                <td colspan="6" class="text-center bg-warning">Apparently this event happened by magic...</td>
-                            </tr>
-                            {% endfor %}
-                        </tbody>
-                    </table>
-                    </div>
-            </div>
-            {% endif %}
-        </div>
         {% if not request.is_ajax and perms.RIGS.view_event %}
         <div class="col-sm-12 text-right">
             {% include 'partials/event_detail_buttons.html' %}

RIGS/templates/event_form.html

@@ -8,13 +8,13 @@
 {% block css %}
     {{ block.super }}
     <link rel="stylesheet" type="text/css" href="{% static 'css/selects.css' %}"/>
-    <link rel="stylesheet" type="text/css" href="{% static 'css/easymde.min.css' %}">
+    <link rel="stylesheet" type="text/css" href="{% static 'css/simplemde.min.css' %}">
 {% endblock %}
 
 {% block preload_js %}
     {{ block.super }}
     <script src="{% static 'js/selects.js' %}"></script>
-    <script src="{% static 'js/easymde.min.js' %}"></script>
+    <script src="{% static 'js/simplemde.min.js' %}"></script>
 {% endblock %}
 
 {% block js %}
@@ -23,6 +23,8 @@
     <script src="{% static 'js/interaction.js' %}"></script>
     <script src="{% static 'js/tooltip.js' %}"></script>
 
+    {% include 'partials/datetime-fix.html' %}
+
     <script>
         const matches = window.matchMedia("(prefers-reduced-motion: reduce)").matches || window.matchMedia("(update: slow)").matches;
         $(document).ready(function () {
@@ -122,7 +124,7 @@
                         <div class="col-sm-8">
                             <div class="row">
                                 <div class="col-sm-9 col-md-7 col-lg-8">
-                                    <select id="{{ form.person.id_for_label }}" name="{{ form.person.name }}" class="selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='person' %}">
+                                    <select id="{{ form.person.id_for_label }}" name="{{ form.person.name }}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='person' %}">
                                         {% if person %}
                                             <option value="{{form.person.value}}" selected="selected" data-update_url="{% url 'person_update' form.person.value %}">{{ person }}</option>
                                         {% endif %}
@@ -149,7 +151,7 @@
                         <div class="col-sm-8">
                             <div class="row">
                                 <div class="col-sm-9 col-md-7 col-lg-8">
-                                    <select id="{{ form.organisation.id_for_label }}" name="{{ form.organisation.name }}" class="selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='organisation' %}" >
+                                    <select id="{{ form.organisation.id_for_label }}" name="{{ form.organisation.name }}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='organisation' %}" >
                                         {% if organisation %}
                                             <option value="{{form.organisation.value}}" selected="selected" data-update_url="{% url 'organisation_update' form.organisation.value %}">{{ organisation }}</option>
                                         {% endif %}
@@ -207,7 +209,7 @@
                             <div class="col-sm-8">
                                 <div class="row">
                                     <div class="col-sm-9 col-md-7 col-lg-8">
-                                        <select id="{{ form.venue.id_for_label }}" name="{{ form.venue.name }}" class="selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='venue' %}">
+                                        <select id="{{ form.venue.id_for_label }}" name="{{ form.venue.name }}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='venue' %}">
                                         {% if venue %}
                                             <option value="{{form.venue.value}}" selected="selected" data-update_url="{% url 'venue_update' form.venue.value %}">{{ venue }}</option>
                                         {% endif %}
@@ -277,8 +279,10 @@
                             </div>
                             <div class="form-group">
                                 <div class="col-sm-offset-4 col-sm-8">
+                                    <div class="checkbox">
                                         <label data-toggle="tooltip" title="Mark this event as a dry-hire, so it needs to be checked in at the end">
-                                        {{ form.dry_hire.label }} {% render_field form.dry_hire %}
+                                            {% render_field form.dry_hire %}{{ form.dry_hire.label }}
+                                        </label>
                                     </div>
                                 </div>
                             </div>
@@ -300,7 +304,7 @@
                                        class="col-sm-4 col-form-label">{{ form.mic.label }}</label>
 
                                 <div class="col-sm-8">
-                                    <select id="{{ form.mic.id_for_label }}" name="{{ form.mic.name }}" class="px-0 selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials">
+                                    <select id="{{ form.mic.id_for_label }}" name="{{ form.mic.name }}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials">
                                         {% if mic %}
                                             <option value="{{form.mic.value}}" selected="selected" >{{ mic.name }}</option>
                                         {% endif %}
@@ -314,7 +318,7 @@
                                            class="col-sm-4 col-form-label">{{ form.checked_in_by.label }}</label>
 
                                     <div class="col-sm-8">
-                                         <select id="{{ form.checked_in_by.id_for_label }}" name="{{ form.checked_in_by.name }}" class="px-0 selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials">
+                                         <select id="{{ form.checked_in_by.id_for_label }}" name="{{ form.checked_in_by.name }}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials">
                                             {% if checked_in_by %}
                                                 <option value="{{form.checked_in_by.value}}" selected="selected" >{{ checked_in_by.name }}</option>
                                             {% endif %}

RIGS/templates/event_print.xml

@@ -1,5 +1,136 @@
-{% extends 'base_print.xml' %}
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE document SYSTEM "rml.dtd">
+<document filename="{{filename}}">
+    <docinit>
+        <registerTTFont faceName="OpenSans" fileName="static/fonts/OpenSans-Regular.tff"/>
+        <registerTTFont faceName="OpenSans-Bold" fileName="static/fonts/OpenSans-Bold.tff"/>
+        <registerFontFamily name="OpenSans" bold="OpenSans-Bold" boldItalic="OpenSans-Bold"/>
+    </docinit>
 
-{% block content %}
-{% include "event_print_page.xml" %}
-{% endblock %}
+    <stylesheet>
+        <initialize>
+            <color id="LightGray" RGB="#D3D3D3"/>
+            <color id="DarkGray" RGB="#707070"/>
+        </initialize>
+
+        <paraStyle name="style.para" fontName="OpenSans" />
+        <paraStyle name="blockPara" spaceAfter="5" spaceBefore="5"/>
+        <paraStyle name="style.Heading1" fontName="OpenSans" fontSize="16" leading="18" spaceAfter="0"/>
+        <paraStyle name="style.Heading2" fontName="OpenSans-Bold" fontSize="10" spaceAfter="2"/>
+        <paraStyle name="style.Heading3" fontName="OpenSans" fontSize="10" spaceAfter="0"/>
+        <paraStyle name="center" alignment="center"/>
+        <paraStyle name="page-head" alignment="center" fontName="OpenSans-Bold" fontSize="16" leading="18" spaceAfter="0"/>
+
+        <paraStyle name="style.event_description" fontName="OpenSans" textColor="DarkGray" />
+        <paraStyle name="style.item_description" fontName="OpenSans" textColor="DarkGray" leftIndent="10" />
+        <paraStyle name="style.specific_description" fontName="OpenSans" textColor="DarkGray" fontSize="10" />
+        <paraStyle name="style.times" fontName="OpenSans"  fontSize="10" />
+        <paraStyle name="style.head_titles" fontName="OpenSans-Bold" fontSize="10" />
+        <paraStyle name="style.head_numbers" fontName="OpenSans"  fontSize="10" />
+
+        <blockTableStyle id="eventSpecifics">
+            <blockValign value="top"/>
+             <lineStyle kind="LINEAFTER" colorName="LightGrey" start="0,0" stop="1,0" thickness="1"/>
+        </blockTableStyle>
+
+        <blockTableStyle id="headLayout">
+            <blockValign value="top"/>
+
+        </blockTableStyle>
+
+        <blockTableStyle id="eventDetails">
+            <blockValign value="top"/>
+            <blockTopPadding start="0,0" stop="-1,0" length="0"/>
+            <blockLeftPadding start="0,0" stop="0,-1" length="0"/>
+        </blockTableStyle>
+
+        <blockTableStyle id="itemTable">
+            <blockValign value="top"/>
+            <lineStyle kind="LINEBELOW" colorName="LightGrey" start="0,0" stop="-1,-1" thickness="1"/>
+            {#<lineStyle kind="box" colorName="black" thickness="1" start="0,0" stop="-1,-1"/>#}
+        </blockTableStyle>
+
+        <blockTableStyle id="totalTable">
+            <blockLeftPadding start="0,0" stop="0,-1" length="0"/>
+            <lineStyle kind="LINEBELOW" colorName="LightGrey" start="-2,0" stop="-1,-1" thickness="1"/>
+            {# <lineStyle cap="default" kind="grid" colorName="black" thickness="1" start="1,0" stop="-1,-1"/> #}
+        </blockTableStyle>
+
+        <blockTableStyle id="infoTable" keepWithNext="true">
+            <blockLeftPadding start="0,0" stop="-1,-1" length="0"/>
+        </blockTableStyle>
+
+        <blockTableStyle id="paymentTable">
+            <blockBackground colorName="LightGray" start="0,1" stop="3,1"/>
+            <blockFont name="OpenSans-Bold" start="0,1" stop="0,1"/>
+            <blockFont name="OpenSans-Bold" start="2,1" stop="2,1"/>
+            <lineStyle kind="outline" colorName="black" thickness="1" start="0,1" stop="3,1"/>
+        </blockTableStyle>
+
+        <blockTableStyle id="signatureTable">
+            <blockTopPadding length="20" />
+            <blockLeftPadding start="0,0" stop="0,-1" length="0"/>
+            <lineStyle kind="linebelow" start="1,0" stop="1,0" colorName="black"/>
+            <lineStyle kind="linebelow" start="3,0" stop="3,0" colorName="black"/>
+            <lineStyle kind="linebelow" start="5,0" stop="5,0" colorName="black"/>
+        </blockTableStyle>
+
+        <listStyle name="ol"
+                   bulletFormat="%s."
+                   bulletFontSize="10" />
+
+        <listStyle name="ul"
+                   start="bulletchar"
+                   bulletFontSize="10"/>
+    </stylesheet>
+
+    <template > {# Note: page is 595x842 points (1 point=1/72in) #}
+            <pageTemplate id="Headed" >
+                <pageGraphics>
+                    <image file="static/imgs/paperwork/corner-tr-su.jpg" x="395" y="642" height="200" width="200"/>
+                    <image file="static/imgs/paperwork/corner-bl.jpg" x="0" y="0" height="200" width="200"/>
+
+                    {# logo positioned 42 from left, 33 from top #}
+                    <image file="static/imgs/paperwork/tec-logo.jpg" x="42" y="719" height="90" width="84"/>
+
+                    <setFont name="OpenSans-Bold" size="22.5" leading="10"/>
+                    <drawString x="137" y="780">TEC PA &amp; Lighting</drawString>
+
+                    <setFont name="OpenSans" size="9"/>
+                    <drawString x="137" y="760">Portland Building, University Park, Nottingham, NG7 2RD</drawString>
+                    <drawString x="137" y="746">www.nottinghamtec.co.uk</drawString>
+                    <drawString x="265" y="746">info@nottinghamtec.co.uk</drawString>
+                    <drawString x="137" y="732">Phone: (0115) 846 8720</drawString>
+
+                    <setFont name="OpenSans" size="10" />
+                    <drawCenteredString x="302.5" y="38">[Page <pageNumber/> of <getName id="lastPage" default="0" />]</drawCenteredString>
+                    <setFont name="OpenSans" size="7" />
+                    <drawCenteredString x="302.5" y="26">
+                        [Paperwork generated{% if current_user %} by {{current_user.name}} |{% endif %} {% now "d/m/Y H:i" %} | {{object.current_version_id}}]
+                    </drawCenteredString>
+                </pageGraphics>
+
+                <frame id="main" x1="50" y1="65" width="495" height="645"/>
+            </pageTemplate>
+
+            <pageTemplate id="Main">
+                <pageGraphics>
+                    <image file="static/imgs/paperwork/corner-tr.jpg" x="395" y="642" height="200" width="200"/>
+                    <image file="static/imgs/paperwork/corner-bl.jpg" x="0" y="0" height="200" width="200"/>
+
+                    <setFont name="OpenSans" size="10"/>
+                    <drawCenteredString x="302.5" y="38">[Page <pageNumber/> of <getName id="lastPage" default="0" />]</drawCenteredString>
+                    <setFont name="OpenSans" size="7" />
+                    <drawCenteredString x="302.5" y="26">
+                        [Paperwork generated{% if current_user %} by {{current_user.name}} |{% endif %} {% now "d/m/Y H:i" %} | {{object.current_version_id}}]
+                    </drawCenteredString>
+                </pageGraphics>
+                <frame id="main" x1="50" y1="65" width="495" height="727"/>
+            </pageTemplate>
+    </template>
+
+    <story firstPageTemplate="Headed">
+            {% include "event_print_page.xml" %}
+    </story>
+
+</document>

RIGS/templates/event_print_page.xml

@@ -1,10 +1,12 @@
 {% load markdown_tags %}
 {% load filters %}
 
+<setNextFrame name="main"/>
+<nextFrame/>
 <blockTable style="headLayout" colWidths="330,165">
 <tr>
     <td>
-        <h1><b>N{{ object.pk|stringformat:"05d" }}:</b> '{{ object.name }}'</h1>
+        <h1><b>N{{ object.pk|stringformat:"05d" }}:</b> '{{ object.name }}'<small></small></h1>
 
         <para style="style.event_description">
         <b>{{object.start_date|date:"D jS N Y"}}</b>
@@ -178,10 +180,15 @@
 {% for item in object.items.all %}
     <tr>
         <td>
-            <para><b>{{ item.name }}</b></para>
-            {% if item.description %}
-                {{ item.description|markdown:"rml" }}
-            {% endif %}
+            <para>{{ item.name }}
+                {% if item.description %}
+                    </para>
+                    <para style="item_description">
+                        {{ item.description|markdown:"rml" }}
+                    </para>
+                    <para>
+                {% endif %}
+            </para>
         </td>
         <td>£{{ item.cost|floatformat:2 }}</td>
         <td>{{ item.quantity }}</td>
@@ -201,7 +208,9 @@
     <tr>
         <td>
             {% if quote %}
-                <para>This quote is valid for 30 days unless otherwise arranged.</para>
+                <para>
+                    This quote is valid for 30 days unless otherwise arranged.
+                </para>
             {% endif %}
         </td>
         {% if object.vat > 0 %}

RIGS/templates/eventauthorisation_mic_success.txt

@@ -0,0 +1,5 @@
+Hi {{object.event.mic.get_full_name|default_if_none:"somebody"}},
+
+Just to let you know your event N{{object.event.pk|stringformat:"05d"}} has been successfully authorised for £{{object.amount}} by {{object.name}} as of {{object.event.last_edited_at}}.
+
+The TEC Rig Information Gathering System

RIGS/templates/eventauthorisation_request.html

@@ -5,6 +5,21 @@
 
 {% block title %}Request Authorisation{% endblock %}
 
+{% block js %}
+    <script src="{% static 'js/tooltip.js' %}"></script>
+    <script src="{% static 'js/popover.js' %}"></script>
+    <script src="{% static 'js/clipboard.min.js' %}"></script>
+    <script>
+        var clipboard = new ClipboardJS('.btn');
+
+        clipboard.on('success', function(e) {
+            $(e.trigger).popover('show');
+            window.setTimeout(function () {$(e.trigger).popover('hide')}, 3000);
+            e.clearSelection();
+        });
+    </script>
+{% endblock %}
+
 {% block content %}
     <div class="row">
         <div class="col-sm-12">
@@ -18,11 +33,11 @@
                 <dl class="dl-horizontal">
                     {% if object.person.email %}
                     <dt>Person Email</dt>
-                    <dd><span id="person-email" class="pr-1">{{ object.person.email }}</span> {% button 'copy' id='#person-email' %}</dd>
+                    <dd><span id="person-email">{{ object.person.email }}</span>{% button 'copy' id='#person-email' %}</dd>
                     {% endif %}
                     {% if object.organisation.email %}
                     <dt>Organisation Email</dt>
-                    <dd><span id="org-email" class="pr-1">{{ object.organisation.email }}</span> {% button 'copy' id='#org-email' %}</dd>
+                    <dd><span id="org-email">{{ object.organisation.email }}</span>{% button 'copy' id='#org-email' %}</dd>
                     {% endif %}
                 </dl>
                 {% else %}
@@ -42,20 +57,11 @@
             </form>
         </div>
     </div>
-    <script src="{% static 'js/tooltip.js' %}"></script>
-    <script src="{% static 'js/popover.js' %}"></script>
-    <script src="{% static 'js/clipboard.min.js' %}"></script>
+
     <script>
         $('#auth-request-form').on('submit', function () {
             $('#auth-request-form button').attr('disabled', true);
         });
-        var clipboard = new ClipboardJS('.btn');
-
-        clipboard.on('success', function(e) {
-            $(e.trigger).popover('show');
-            window.setTimeout(function () {$(e.trigger).popover('hide')}, 3000);
-            e.clearSelection();
-        });
     </script>
 {% endblock %}
 

RIGS/templates/hs/event_checklist_detail.html

@@ -1,79 +0,0 @@
-{% extends request.is_ajax|yesno:"base_ajax.html,base_rigs.html" %}
-{% load help_text from filters %}
-{% load profile_by_index from filters %}
-{% load yesnoi from filters %}
-{% load button from filters %}
-
-{% block content %}
-<div class="row">
-    <div class="col-12 text-right my-3">
-        {% button 'edit' url='ec_edit' pk=object.pk %}
-        {% button 'view' url='event_detail' pk=object.event.pk text="Event" %}
-        {% include 'partials/review_status.html' with perm=perms.RIGS.review_eventchecklist review='ec_review' %}
-    </div>
-</div>
-<div class="row">
-    <div class="col-md-6 col-sm-12">
-    <div class="card  mb-3">
-        <div class="card-header">General</div>
-        <div class="card-body">
-            <dl class="row">
-                <dt class="col-6">Date</dt>
-                <dd class="col-6">
-                    {{ object.date }}
-                </dd>
-                <dt class="col-6">Venue</dt>
-                <dd class="col-6">
-                    {% if object.venue %}
-                    <a href="{% url 'venue_detail' object.venue.pk %}" class="modal-href">
-                        {{ object.venue }}
-                    </a>
-                    {% endif %}
-                </dd>
-            </dl>
-        </div>
-    </div>
-    </div>
-    <div class="col-md-6 col-sm-12">
-        <div class="card  mb-3">
-            <div class="card-header">Safety Checks</div>
-            <div class="card-body">
-                <dl class="row">
-                    <dt class="col-10">{{ object|help_text:'safe_parking'|safe }}</dt>
-                    <dd class="col-2">
-                        {{ object.safe_parking|yesnoi }}
-                    </dd>
-                    <dt class="col-10">{{ object|help_text:'safe_packing'|safe }}</dt>
-                    <dd class="col-2">
-                        {{ object.safe_packing|yesnoi }}
-                    </dd>
-                    <dt class="col-10">{{ object|help_text:'exits'|safe }}</dt>
-                    <dd class="col-2">
-                        {{ object.exits|yesnoi }}
-                    </dd>
-                    <dt class="col-10">{{ object|help_text:'trip_hazard'|safe }}</dt>
-                    <dd class="col-2">
-                        {{ object.trip_hazard|yesnoi }}
-                    </dd>
-                    <dt class="col-10">{{ object|help_text:'warning_signs'|safe }}</dt>
-                    <dd class="col-2">
-                        {{ object.warning_signs|yesnoi }}
-                    </dd>
-                    <dt class="col-10">{{ object|help_text:'ear_plugs'|safe }}</dt>
-                    <dd class="col-2">
-                        {{ object.ear_plugs|yesnoi }}
-                    </dd>
-                </dl>
-            </div>
-        </div>
-    </div>
-</div>
-<div class="col-12 text-right">
-{% button 'edit' url='ec_edit' pk=object.pk %}
-{% button 'view' url='event_detail' pk=object.pk text="Event" %}
-{% include 'partials/review_status.html' with perm=perms.RIGS.review_eventchecklist review='ec_review' %}
-</div>
-<div class="col-12 text-right">
-{% include 'partials/last_edited.html' with target="eventchecklist_history" %}
-</div>
-{% endblock %}

RIGS/templates/hs/event_checklist_form.html

@@ -1,101 +0,0 @@
-{% extends request.is_ajax|yesno:'base_ajax.html,base_rigs.html' %}
-{% load widget_tweaks %}
-{% load static %}
-{% load help_text from filters %}
-{% load profile_by_index from filters %}
-{% load button from filters %}
-
-{% block css %}
-    {{ block.super }}
-    <link rel="stylesheet" href="{% static 'css/selects.css' %}"/>
-{% endblock %}
-
-{% block preload_js %}
-    {{ block.super }}
-    <script src="{% static 'js/selects.js' %}"></script>
-    <script src="{% static 'js/interaction.js' %}"></script>
-{% endblock %}
-
-{% block js %}
-    {{ block.super }}
-    <script src="{% static 'js/autocompleter.js' %}"></script>
-{% endblock %}
-
-{% block content %}
-    <div class="col-12">
-        {% include 'form_errors.html' %}
-        
-        <form role="form" method="POST" action="{% if edit %}{% url 'ec_edit' pk=object.pk %}{% else %}{% url 'event_ec' pk=event.pk %}{% endif %}">
-            <input type="hidden" name="{{ form.event.name }}" id="{{ form.event.id_for_label }}"
-               value="{{event.pk}}"/>
-            {% csrf_token %}
-            <div class="row">
-                <div class="col-12">
-                    <div class="card">
-                        <div class="card-header">Event Information</div>
-                        <div class="card-body">
-                            <dl class="row">
-                                <dt class="col-4">Event Date</dt>
-                                <dd class="col-8">{{ event.start_date}}{%if event.end_date %}-{{ event.end_date}}{%endif%}</dd>
-                                <dt class="col-4">Event Name</dt>
-                                <dd class="col-8">{{ event.name }}</dd>
-                                <dt class="col-4">Client</dt>
-                                <dd class="col-8">{{ event.person }}</dd>
-                                <dt class="col-4">Event Size</dt>
-                                <dd class="col-8">{% include 'partials/event_size.html' with object=event.riskassessment %}</dd>
-                            </dl>
-                            <div class="form-group form-row">
-                                <label for="{{ form.date.id_for_label }}"
-                                       class="col-4 col-form-label">{{ form.date.label }}</label>
-                                {% if not form.date.value %}
-                                {% render_field form.date class+="form-control col-8" value=event.start_date %}
-                                {% else %}
-                                {% render_field form.date class+="form-control col-8" %}
-                                {% endif %}
-                            </div>
-                            <div class="form-group form-row" id="{{ form.venue.id_for_label }}-group">
-                                <label for="{{ form.venue.id_for_label }}"
-                                class="col-4 col-form-label">{{ form.venue.label }}</label>
-                                <select id="{{ form.venue.id_for_label }}" name="{{ form.venue.name }}" class="selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='venue' %}">
-                                {% if venue %}
-                                    <option value="{{venue.pk}}" selected="selected">{{ venue.name }}</option>
-                                {% elif event.venue %}
-                                    <option value="{{event.venue.pk}}" selected="selected">{{ event.venue.name }}</option>
-                                {% endif %}
-                                </select>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="row my-3">
-                <div class="col-12">
-                    <div class="card">
-                        <div class="card-header">Safety Checks</div>
-                        <div class="card-body">
-                            {% include 'partials/checklist_checkbox.html' with formitem=form.safe_parking %}
-                            {% include 'partials/checklist_checkbox.html' with formitem=form.safe_packing %}
-                            {% include 'partials/checklist_checkbox.html' with formitem=form.exits %}
-                            {% include 'partials/checklist_checkbox.html' with formitem=form.trip_hazard %}
-                            {% include 'partials/checklist_checkbox.html' with formitem=form.warning_signs %}
-                            {% include 'partials/checklist_checkbox.html' with formitem=form.ear_plugs %}
-                            <div class="row pt-3">
-                                <label class="col-5" for="{{ form.hs_location.id_for_label }}">{{ form.hs_location.help_text }}</label>
-                                {% render_field form.hs_location class+="form-control col-7 col-md-4" %}
-                            </div>
-                            <div class="row pt-1">
-                                <label class="col-5" for="{{ form.extinguishers_location.id_for_label }}">{{ form.extinguishers_location.help_text }}</label>
-                                {% render_field form.extinguishers_location class+="form-control col-7 col-md-4" %}
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="row mt-3">
-                <div class="col-sm-12 text-right">
-                    {% button 'submit' %}
-                </div>
-            </div>
-        </form>
-    </div>
-{% endblock %}

RIGS/templates/hs/eventcheckin_form.html

@@ -1,105 +0,0 @@
-{% extends request.is_ajax|yesno:'base_ajax.html,base_rigs.html' %}
-{% load widget_tweaks %}
-{% load static %}
-{% load button from filters %}
-
-{% block css %}
-    {{ block.super }}
-    <link rel="stylesheet" type="text/css" href="{% static 'css/selects.css' %}"/>
-    <link rel="stylesheet" type="text/css" href="{% static 'css/easymde.min.css' %}">
-{% endblock %}
-
-{% block preload_js %}
-    {{ block.super }}
-    <script src="{% static 'js/selects.js' %}"></script>
-    <script src="{% static 'js/easymde.min.js' %}"></script>
-{% endblock %}
-
-{% block js %}
-    {{ block.super }}
-    <script src="{% static 'js/autocompleter.js' %}"></script>
-    <script src="{% static 'js/interaction.js' %}"></script>
-    <script src="{% static 'js/tooltip.js' %}"></script>
-{% endblock %}
-
-{% block content %}
-    <div class="col-12">
-        {% include 'form_errors.html' %}
-        <form id="checkin" role="form" method="POST" action="{{ form.action|default:request.path }}">
-            <input type="hidden" name="{{ form.event.name }}" id="{{ form.event.id_for_label }}"
-               value="{{event.pk}}"/>
-            {% if not request.is_ajax and self.request.user.pk is form.event.mic.pk %}
-            <div class="form-group">
-                <label for="{{ form.person.id_for_label }}"
-                       class="col-sm-4 col-form-label">{{ form.person.label }}</label>
-                <div class="col-sm-8">
-                    <select id="{{ form.person.id_for_label }}" name="{{ form.person.name }}" class="px-0 selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials">
-                        {% if person %}
-                            <option value="{{form.person.value}}" selected="selected" >{{ person.name }}</option>
-                        {% endif %}
-                    </select>
-                </div>
-            </div>
-            {% else %}
-            <input type="hidden" name="{{ form.person.name }}" id="{{ form.person.id_for_label }}"
-               value="{{request.user.pk}}"/>
-            {% endif %}
-            {% csrf_token %}
-            <div class="form-group">
-                <label for="{{ form.time.id_for_label }}"
-                       class="col-sm-4 col-form-label">Start Time</label>
-                <div class="col-sm-8">
-                    {% render_field form.time class+="form-control" %}
-                </div>
-            </div>
-            <div class="form-group">
-                <label for="{{ form.role.id_for_label }}" class="col col-form-label">Role</label>
-                <div class="row pl-3">
-                    <div class="col-md-6 col-sm-12">
-                        <button type="button" class="btn btn-primary" onclick="document.getElementById('id_role').value='MIC'">MIC</button>
-                        <button type="button" class="btn btn-danger" onclick="document.getElementById('id_role').value='Power MIC'">Power MIC</button>
-                        <button type="button" class="btn btn-info" onclick="document.getElementById('id_role').value='Crew'">Crew</button>
-                    </div>
-                    <div class="col-md-6 mt-2">
-                        {% render_field form.role class+="form-control" placeholder="Other (enter text)" %}
-                    </div>
-                </div>
-            </div>
-            <div class="form-group">
-                <label for="{{ form.vehicle.id_for_label }}" class="col col-form-label">Vehicle (if applicable)</label>
-                <div class="row pl-3">
-                    <div class="col-md-6 col-sm-12">
-                        <button type="button" class="btn btn-primary" onclick="document.getElementById('id_vehicle').value='Virgil'"><span class="fas fa-truck-moving"></span> Virgil</button>
-                        <button type="button" class="btn btn-secondary" onclick="document.getElementById('id_vehicle').value='Virgil + Erms'"><span class="fas fa-trailer"></span><span class="fas fa-truck-moving"></span> Virgil + Erms</button>
-                    </div>
-                    <div class="col-md-6 mt-2">
-                        {% render_field form.vehicle class+="form-control" placeholder="Other (enter text)" %}
-                    </div>
-                </div>
-            </div>
-            {% if edit or manual %}
-            <div class="form-group">
-                <label for="{{ form.end_time.id_for_label }}"
-                       class="col-sm-4 col-form-label">End Time</label>
-                <div class="col-sm-8">
-                    {% render_field form.end_time class+="form-control" %}
-                </div>
-            </div>
-            {% endif %}
-            {% if not request.is_ajax %}
-            <div class="row mt-3">
-                <div class="col-sm-12 text-right">
-                    {% button 'submit' %}
-                </div>
-            </div>
-            {% endif %}
-        </form>
-    </div>
-{% endblock %}
-
-{% block footer %}
-<div class="col-sm-12 text-right pr-0">
-    <button type="submit" class="btn btn-primary" title="Save" form="checkin"
-><span class="fas fa-save align-middle"></span> <span class="d-none d-sm-inline align-middle">Save</span></button>
-</div>
-{% endblock %}

RIGS/templates/hs/ra_print.xml

@@ -1,135 +0,0 @@
-{% extends 'base_print.xml' %}
-{% load filters %}
-
-{% block content %}
-<spacer length="15"/>
-<h1>Event Specific Risk Assessment for <strong>{{ object.event }}</strong></h1>
-<spacer length="15"/>
-<h2>Client: {{ object.event.person|default:object.event.organisation }} | Venue: {{ object.event.venue }} | MIC: {{ object.event.mic }}</h2>
-<spacer length="15"/>
-<hr/>
-<blockTable colWidths="425,100" spaceAfter="15">
-    <tr>
-        <td colspan="2"><h3><strong>General</strong></h3></td>
-    </tr>
-    <tr>
-        <td><para>{{ object|help_text:'nonstandard_equipment'|striptags }}</para></td>
-        <td>{{ object.nonstandard_equipment|yesno|capfirst }}</td>
-    </tr>
-    <tr>
-        <td><para>{{ object|help_text:'nonstandard_use'|striptags }}</para></td>
-        <td>{{ object.nonstandard_use|yesno|capfirst }}</td>
-    </tr>
-    <tr>
-        <td><para>{{ object|help_text:'contractors'|striptags }}</para></td>
-        <td>{{ object.contractors|yesno|capfirst }}</td>
-    </tr>
-    <tr>
-        <td><para>{{ object|help_text:'other_companies'|striptags }}</para></td>
-        <td>{{ object.other_companies|yesno|capfirst }}</td>
-    </tr>
-    <tr>
-        <td><para>{{ object|help_text:'crew_fatigue'|striptags }}</para></td>
-        <td>{{ object.crew_fatigue|yesno|capfirst }}</td>
-    </tr>
-    <tr>
-        <td><para>{{ object|help_text:'general_notes'|striptags }}</para></td>
-        <td><para>{{ object.general_notes|default:'No' }}</para></td>
-    </tr>
-    <tr>
-        <td colspan="2"><h3><strong>Power</strong></h3><spacer length="4"/><para textColor="white" backColor={% if object.event_size == 0 %}"green"{% elif object.event_size == 1 %}"yellow"{% else %}"red"{% endif %} borderPadding="3">{{ object.get_event_size_display }}</para></td>
-    </tr>
-    <tr>
-        <td><para>{{ object|help_text:'big_power'|striptags }}</para></td>
-        <td><para>{{ object.big_power|yesno|capfirst }}</para></td>
-    </tr>
-    <tr>
-        <td><para>{{ object|help_text:'power_mic'|striptags }}</para></td>
-        <td><para>{{ object.power_mic|default:object.event.mic }}</para></td>
-    </tr>
-    <tr>
-        <td><para>{{ object|help_text:'outside'|striptags }}</para></td>
-        <td><para>{{ object.outside|yesno|capfirst }}</para></td>
-    </tr>
-    <tr>
-        <td><para>{{ object|help_text:'generators'|striptags }}</para></td>
-        <td><para>{{ object.generators|yesno|capfirst }}</para></td>
-    </tr>
-    <tr>
-        <td><para>{{ object|help_text:'other_companies_power'|striptags }}</para></td>
-        <td><para>{{ object.other_companies_power|yesno|capfirst }}</para></td>
-    </tr>
-    <tr>
-        <td><para>{{ object|help_text:'nonstandard_equipment_power'|striptags }}</para></td>
-        <td><para>{{ object.nonstandard_equipment_power|yesno|capfirst }}</para></td>
-    </tr>
-    <tr>
-        <td><para>{{ object|help_text:'multiple_electrical_environments'|striptags }}</para></td>
-        <td><para>{{ object.multiple_electrical_environments|yesno|capfirst }}</para></td>
-    </tr>
-    <tr>
-        <td><para>{{ object|help_text:'power_notes'|striptags }}</para></td>
-        <td><para>{{ object.power_notes|default:'No' }}</para></td>
-    </tr>
-    <tr>
-        <td colspan="2"><h3><strong>Sound</strong></h3></td>
-    </tr>
-    <tr>
-        <td><para>{{ object|help_text:'noise_monitoring'|striptags }}</para></td>
-        <td><para>{{ object.noise_monitoring|yesno|capfirst }}</para></td>
-    </tr>
-    <tr>
-        <td><para>{{ object|help_text:'sound_notes'|striptags }}</para></td>
-        <td><para>{{ object.sound_notes|default:'No' }}</para></td>
-    </tr>
-    <tr>
-        <td colspan="2"><h3><strong>Site Details</strong></h3></td>
-    </tr>
-    <tr>
-        <td><para>{{ object|help_text:'known_venue'|striptags }}</para></td>
-        <td><para>{{ object.known_venue|yesno|capfirst }}</para></td>
-    </tr>
-    <tr>
-        <td><para>{{ object|help_text:'safe_loading'|striptags }}</para></td>
-        <td><para>{{ object.safe_loading|yesno|capfirst }}</para></td>
-    </tr>
-    <tr>
-        <td><para>{{ object|help_text:'safe_storage'|striptags }}</para></td>
-        <td><para>{{ object.safe_storage|yesno|capfirst }}</para></td>
-    </tr>
-    <tr>
-        <td><para>{{ object|help_text:'area_outside_of_control'|striptags }}</para></td>
-        <td><para>{{ object.area_outside_of_control|yesno|capfirst }}</para></td>
-    </tr>
-    <tr>
-        <td><para>{{ object|help_text:'barrier_required'|striptags }}</para></td>
-        <td><para>{{ object.barrier_required|yesno|capfirst }}</para></td>
-    </tr>
-    <tr>
-        <td><para>{{ object|help_text:'nonstandard_emergency_procedure'|striptags }}</para></td>
-        <td><para>{{ object.nonstandard_emergency_procedure|yesno|capfirst }}</para></td>
-    </tr>
-    <tr>
-        <td colspan="2"><h3><strong>Structures</strong></h3></td>
-    </tr>
-    <tr>
-        <td><para>{{ object|help_text:'special_structures'|striptags }}</para></td>
-        <td><para>{{ object.special_structures|yesno|capfirst }}</para></td>
-    </tr>
-    <tr>
-        <td><para>{{ object|help_text:'suspended_structures'|striptags }}</para></td>
-        <td><para>{{ object.suspended_structures|yesno|capfirst }}</para></td>
-    </tr>
-    <tr>
-        <td><para>{{ object|help_text:'persons_responsible_structures'|striptags }}</para></td>
-        <td><para>{{ object.persons_responsible_structures|default:'N/A' }}</para></td>
-    </tr>
-</blockTable>
-<spacer length="15"/>\
-<hr/>
-<spacer length="15"/>
-<para><em>Assessment completed by {{ object.last_edited_by }} on {{ object.last_edited_at }}</em></para>
-{% if object.reviewed_by %}
-<para><em>Reviewed by {{ object.reviewed_by }} on {{ object.reviewed.at }}</em></para>
-{% endif %}
-{% endblock %}

RIGS/templates/hs_list.html

@@ -12,7 +12,6 @@
                 <th scope="col">Dates</th>
                 <th scope="col">RA</th>
                 <th scope="col">Checklists</th>
-                <th scope="col">Power Records</th>
             </tr>
         </thead>
         <tbody>
@@ -36,14 +35,6 @@
             <a href="{% url 'event_ec' event.pk %}" class="btn btn-info"><span class="fas fa-paperclip"></span> <span
             class="d-none d-sm-inline">Create</span></a>
             </td>
-            <td>
-            {% for record in event.power_tests.all %}
-            {% include 'partials/hs_status.html' with event=event object=record view='pt_detail' edit='pt_edit' create='event_pt' review='pt_review' perm=perms.RIGS.review_power %}
-            <br/>
-            {% endfor %}
-            <a href="{% url 'event_pt' event.pk %}" class="btn btn-info"><span class="fas fa-paperclip"></span> <span
-            class="hidden-xs">Create</span></a>
-            </td>
         </tr>
         {% empty %}
         <tr class="bg-warning text-dark">

RIGS/templates/hs_object_list.html

@@ -0,0 +1,59 @@
+{% extends 'base_rigs.html' %}
+{% load paginator from filters %}
+{% load help_text from filters %}
+{% load verbose_name from filters %}
+{% load get_field from filters %}
+
+{% block title %}{{ title }} List{% endblock %}
+
+{% block content %}
+    <div class="row">
+        <div class="col-12">
+            <h2>{{title}} List</h2>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-12">
+            <div class="table-responsive">
+                <table class="table mb-0 table-sm">
+                    <thead>
+                        <tr>
+                            <th scope="col">Event</th>
+                            {# mmm hax #}
+                            {% if object_list.0 != None %}
+                                {% for field in object_list.0.fieldz %}
+                                    <th scope="col">{{ object_list.0|verbose_name:field|title }}</th>
+                                {% endfor %}
+                            {% endif %}
+                            <th scope="col"></th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                    {% for object in object_list %}
+                    <tr class="{% if object.reviewed_by %}table-success{%endif%}">
+                        {# General #}
+                        <th scope="row"><a href="{% url 'event_detail' object.event.pk %}">{{ object.event }}</a><br><small>{{ object.event.get_status_display }}</small></th>
+                        {% for field in object_list.0.fieldz %}
+                            <td>{{ object|get_field:field }}</td>
+                        {% endfor %}
+                        {# Buttons #}
+                        <td>
+                            {% include 'partials/hs_status.html' %}
+                        </td>
+                    </tr>
+                    {% empty %}
+                    <tr class="bg-warning">
+                        <td colspan="6">Nothing found</td>
+                    </tr>
+                    {% endfor %}
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+    {% if is_paginated %}
+        <div class="row justify-content-center">
+                {% paginator %}
+        </div>
+    {% endif %}
+{% endblock %}

RIGS/templates/partials/contact_details.html

@@ -40,7 +40,7 @@
                 <dt class="col-sm-6">Phone Number</dt>
                 <dd class="col-sm-6">{{ object.organisation.phone|linkornone:'tel' }}</dd>
                 <dt class="col-sm-6">Has SU Account</dt>
-                <dd class="col-sm-6">{{ object.organisation.union_account|yesno|capfirst }}</dd>
+                <dd class="col-sm-6">{{ event.organisation.union_account|yesno|capfirst }}</dd>
             </dl>
         </div>
     </div>

RIGS/templates/partials/ec_power_info.html

@@ -47,6 +47,6 @@
                 </tr>
             </tbody>
         </table>
-        <p><strong>Voltage Drop on Circuit:</strong> &#8804;5% (approx. 12v)</p>
+        <p><strong>Voltage Drop on Circuit:</strong> 5% (approx. 12v)</p>
     </div>
 </div>

RIGS/templates/partials/event_detail_buttons.html

@@ -9,7 +9,7 @@
         {% if event.internal %}
             <a class="btn item-add modal-href event-authorise-request
                     {% if event.authorised %}
-                        btn-success active disabled
+                        btn-success active
                     {% elif event.authorisation and event.authorisation.amount != event.total and event.authorisation.last_edited_at > event.auth_request_at %}
                         btn-warning
                     {% elif event.auth_request_to %}
@@ -18,7 +18,7 @@
                         btn-secondary
                     {% endif %}
                     "
-               {% if event.authorised %}aria-disabled="true"{% else %}href="{% url 'event_authorise_request' object.pk %}"{% endif %}>
+               href="{% url 'event_authorise_request' object.pk %}">
                 <span class="fas fa-paper-plane"></span>
                 <span class="d-none d-sm-inline">
                     {% if event.authorised %}
@@ -49,13 +49,5 @@
         {% endif %}
 
         <a href="https://docs.google.com/forms/d/e/1FAIpQLSf-TBOuJZCTYc2L8DWdAaC3_Werq0ulsUs8-6G85I6pA9WVsg/viewform" class="btn btn-danger"><span class="fas fa-file-invoice-dollar"></span> <span class="d-none d-sm-inline">Subhire Insurance Form</span></a>
-
-        {% if event.can_check_in %}
-            {% if request.user.current_event %}
-            <a href="{% url 'event_checkout' %}" class="btn btn-warning">Check Out</a>
-            {% else %}
-            <a href="{% url 'event_checkin' event.pk %}" class="btn btn-success modal-href"><span class="fas fa-user-clock"></span> <span class="d-none d-sm-inline">Check In</span></a>
-            {% endif %}
-        {% endif %}
     {% endif %}
 </div>

RIGS/templates/partials/event_details.html

@@ -15,7 +15,7 @@
             {% if object.venue %}
             <dt class="col-sm-6">Venue Notes</dt>
             <dd class="col-sm-6">
-                {{ object.venue.notes|markdown }}{% if object.venue.three_phase_available %}<br>(Three phase available){%endif%}
+                {{ object.venue.notes }}{% if object.venue.three_phase_available %}<br>(Three phase available){%endif%}
             </dd>
             {% endif %}
 

RIGS/templates/partials/event_status.html

@@ -15,21 +15,19 @@
         {% endif %}
     {% endif %}
     {% if not event.dry_hire %}
-        {% if event.has_checklist %}
-            <a href="{{ event.riskassessment.get_absolute_url }}"><span class="badge badge-success">RA: <span class="fas fa-check{% if event.riskassessment.reviewed_by %}-double{%endif%}"></span></a>
+        {% if event.riskassessment %}
+            <span class="badge badge-success">RA: <span class="fas fa-check"></span>{%if event.riskassessment.reviewed_by%}<span class="fas fa-check"></span>{%endif%}</span>
         {% else %}
             <span class="badge badge-danger">RA: <span class="fas fa-times"></span></span>
         {% endif %}
-        {% if event.has_checklist %}
-            <span class="badge badge-success">Checklist: <span class="fas fa-check"></span> {% if event.checklists.count > 1 %}({{event.checklists.count}}){% endif %}</span>
+    {% endif %}
+    {% if not event.dry_hire %}
+        {% if event.hs_done %}
+            {# TODO Display status of all checklists #}
+            <span class="badge badge-success">Checklist: <span class="fas fa-check"></span></span>
         {% else %}
             <span class="badge badge-danger">Checklist: <span class="fas fa-times"></span></span>
         {% endif %}
-        {% if event.has_power %}
-            <span class="badge badge-success">Power Record: <span class="fas fa-check"></span> {% if event.power_tests.count > 1 %}({{event.power_tests.count}}){% endif %}</span>
-        {% else %}
-            <span class="badge badge-danger">Power Record: <span class="fas fa-times"></span></span>
-        {% endif %}
     {% endif %}
     {% if perms.RIGS.view_invoice %}
         {% if event.invoice %}

RIGS/templates/partials/event_table.html

@@ -1,5 +1,4 @@
 {% load namewithnotes from filters %}
-{% load markdown_tags %}
 <div class="table-responsive">
     <table class="table mb-0" id="event_table">
         <thead>
@@ -30,15 +29,7 @@
             <!---Number-->
             <th scope="row" id="event_number">{{ event.display_id }}</th>
             <!--Dates & Times-->
-            <td id="event_dates" style="text-align: justify;">
-                {% if not event.cancelled %}
-                    {% if event.meet_at %}
-                        <span class="text-nowrap">Meet: <strong>{{ event.meet_at|date:"D d/m/Y H:i" }}</strong></span>
-                    {% endif %}
-                    {% if event.access_at %}
-                        <br><span class="text-nowrap">Access: <strong>{{ event.access_at|date:"D d/m/Y H:i" }}</strong></span>
-                    {% endif %}
-                {% endif %}
+            <td id="event_dates">
                 <span class="text-nowrap">Start: <strong>{{ event.start_date|date:"D d/m/Y" }}
                 {% if event.has_start_time %}
                     {{ event.start_time|date:"H:i" }}
@@ -52,6 +43,14 @@
                     {% endif %}</strong>
                     </span>
                 {% endif %}
+                {% if not event.cancelled %}
+                    {% if event.meet_at %}
+                        <br><span class="text-nowrap">Meet: <strong>{{ event.meet_at|date:"D d/m/Y H:i" }}</strong></span>
+                    {% endif %}
+                    {% if event.access_at %}
+                        <br><span class="text-nowrap">Access: <strong>{{ event.access_at|date:" D d/m/Y H:i" }}</strong></span>
+                    {% endif %}
+                {% endif %}
             </td>
             <!---Details-->
             <td id="event_details" class="w-100">
@@ -75,7 +74,7 @@
                     </h5>
                 {% endif %}
                 {% if not event.cancelled and event.description %}
-                    <p>{{ event.description|markdown }}</p>
+                    <p>{{ event.description|linebreaksbr }}</p>
                 {% endif %}
                 {% include 'partials/event_status.html' %}
             </td>

RIGS/templates/partials/hs_details.html

@@ -10,18 +10,10 @@
         <hr>
         <h5>Event Checklists:</h5>
         {% for checklist in event.checklists.all %}
-        {% include 'partials/hs_status.html' with event=event object=checklist view='ec_detail' edit='ec_edit' create='event_ec' review='ec_review' perm=perms.RIGS.review_eventchecklist %}
-        <br/>
-        {% endfor %}
-        <a href="{% url 'event_ec' event.pk %}" class="btn btn-info mt-2"><span class="fas fa-paperclip"></span> <span
-        class="hidden-xs">Create</span></a>
-        <hr>
-        <h5>Power Test Records:</h5>
-        {% for record in event.power_tests.all %}
-        {% include 'partials/hs_status.html' with event=event object=record view='pt_detail' edit='pt_edit' create='event_pt' review='pt_review' perm=perms.RIGS.review_power %}
-        <br/>
-        {% endfor %}
-        <a href="{% url 'event_pt' event.pk %}" class="btn btn-info mt-2"><span class="fas fa-paperclip"></span> <span
-        class="hidden-xs">Create</span></a>
+            {% include 'partials/hs_status.html' with event=event object=checklist view='ec_detail' edit='ec_edit' create='event_ec' review='ec_review' perm=perms.RIGS.review_eventchecklist %}
+            <br/>
+            {% endfor %}
+            <a href="{% url 'event_ec' event.pk %}" class="btn btn-info mt-2"><span class="fas fa-paperclip"></span> <span
+            class="hidden-xs">Create</span></a>
     </div>
 </div>

RIGS/templates/risk_assessment_detail.html

@@ -1,5 +1,7 @@
 {% extends request.is_ajax|yesno:"base_ajax.html,base_rigs.html" %}
-{% load filters %}
+{% load help_text from filters %}
+{% load yesnoi from filters %}
+{% load linkornone from filters %}
 
 {% block content %}
     <div class="row py-3">
@@ -45,7 +47,7 @@
                         </dd>
                         <dt class="col-sm-6">{{ object|help_text:'power_mic'|safe }}</dt>
                         <dd class="col-sm-6">
-                            {{ object.power_mic.name|default:object.event.mic }}
+                            {{ object.power_mic.name|default:'None' }}
                         </dd>
                         <dt class="col-sm-6">{{ object|help_text:'outside' }}</dt>
                         <dd class="col-sm-6">
@@ -142,7 +144,7 @@
                                 </dd>
                                 <dt class="col-12">{{ object|help_text:'persons_responsible_structures' }}</dt>
                                 <dd class="col-12">
-                                    {{ object.persons_responsible_structures|default:'N/A'|linebreaks }}
+                                    {{ object.persons_responsible_structures.name|default:'N/A'|linebreaks }}
                                 </dd>
                                 <dt class="col-12">{{ object|help_text:'rigging_plan'|safe }}</dt>
                                 <dd class="col-12">
@@ -155,7 +157,6 @@
             </div>
         </div>
         <div class="col-12 text-right">
-            {% button 'print' 'ra_print' object.pk %}
             <a href="{% url 'ra_edit' object.pk %}" class="btn btn-warning my-3"><span class="fas fa-edit"></span> <span
                     class="d-none d-sm-inline">Edit</span></a>
             <a href="{% url 'event_detail' object.event.pk %}" class="btn btn-primary"><span class="fas fa-eye"></span> View Event</a>

RIGS/templates/risk_assessment_form.html

@@ -98,9 +98,9 @@
                             <label for="{{ form.power_mic.id_for_label }}"
                                 class="col col-form-label">{{ form.power_mic.help_text|safe }}</label>
                             <div class="col-6">
-                                <select id="{{ form.power_mic.id_for_label }}" name="{{ form.power_mic.name }}" class="selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials">
-                                    {% if power_mic %}
-                                        <option value="{{form.power_mic.value}}" selected="selected">{{ power_mic }}</option>
+                                <select id="{{ form.power_mic.id_for_label }}" name="{{ form.power_mic.name }}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials">
+                                    {% if object.power_mic %}
+                                        <option value="{{object.power_mic.pk}}" selected="selected">{{ object.power_mic.name }}</option>
                                     {% endif %}
                                 </select>
                             </div>

RIGS/templatetags/filters.py

@@ -118,9 +118,9 @@ def orderby(request, field, attr):
 @register.filter(needs_autoescape=True)  # Used for accessing outside of a form, i.e. in detail views of RiskAssessment and EventChecklist
 def get_field(obj, field, autoescape=True):
     value = getattr(obj, field)
-    if (isinstance(value, bool)):
+    if(isinstance(value, bool)):
         value = yesnoi(value, field in obj.inverted_fields)
-    elif (isinstance(value, str)):
+    elif(isinstance(value, str)):
         value = truncatewords(value, 20)
     return mark_safe(value)
 
@@ -144,7 +144,7 @@ def get_list(dictionary, key):
 
 @register.filter
 def profile_by_index(value):
-    if (value):
+    if(value):
         return models.Profile.objects.get(pk=int(value))
     else:
         return ""
@@ -196,8 +196,8 @@ def button(type, url=None, pk=None, clazz="", icon=None, text="", id=None, style
         text = "Edit"
     elif type == 'print':
         clazz += " btn-primary "
-        icon = "fa-download"
-        text = "Export"
+        icon = "fa-print"
+        text = "Print"
     elif type == 'duplicate':
         clazz += " btn-info "
         icon = "fa-copy"
@@ -216,8 +216,6 @@ def button(type, url=None, pk=None, clazz="", icon=None, text="", id=None, style
         return {'submit': True, 'class': 'btn-info', 'icon': 'fa-search', 'text': 'Search', 'id': id, 'style': style}
     elif type == 'submit':
         return {'submit': True, 'class': 'btn-primary', 'icon': 'fa-save', 'text': 'Save', 'id': id, 'style': style}
-    elif type == 'today':
-        return {'today': True, 'id': id}
     return {'target': url, 'pk': pk, 'class': clazz, 'icon': icon, 'text': text, 'id': id, 'style': style}
 
 

RIGS/templatetags/markdown_tags.py

@@ -9,7 +9,7 @@ register = template.Library()
 
 
 @register.filter(name="markdown")
-def markdown_filter(text, input_format='html', add_style=""):
+def markdown_filter(text, input_format='html'):
     # markdown library can't handle text=None
     if text is None:
         return text

RIGS/tests/conftest.py

@@ -43,22 +43,15 @@ def venue(db):
 
 @pytest.fixture  # TODO parameterise with Event sizes
 def checklist(basic_event, venue, admin_user, ra):
-    checklist = models.EventChecklist.objects.create(event=basic_event, safe_parking=False,
+    checklist = models.EventChecklist.objects.create(event=basic_event, power_mic=admin_user, safe_parking=False,
                                                      safe_packing=False, exits=False, trip_hazard=False, warning_signs=False,
                                                      ear_plugs=False, hs_location="Locked away safely",
-                                                     extinguishers_location="Somewhere, I forgot",
+                                                     extinguishers_location="Somewhere, I forgot", earthing=False, pat=False,
                                                      date=timezone.now(), venue=venue)
     yield checklist
     checklist.delete()
 
 
-@pytest.fixture
-def power_test(basic_event, venue, admin_user, ra):
-    power_test = models.PowerTestRecord.objects.create(event=basic_event, venue=venue)
-    yield power_test
-    power_test.delete()
-
-
 @pytest.fixture
 def many_events(db, admin_user, scope="class"):
     many_events = {

RIGS/tests/pages.py

@@ -145,11 +145,11 @@ class CreateEvent(FormPage):
 
     def add_person(self):
         self.find_element(*self._add_person_selector).click()
-        return regions.Modal(self, self.driver.find_element(By.ID, 'modal'))
+        return regions.Modal(self, self.driver.find_element_by_id('modal'))
 
     def add_event_item(self):
         self.find_element(*self._add_item_selector).click()
-        element = self.driver.find_element(By.ID, 'itemModal')
+        element = self.driver.find_element_by_id('itemModal')
         self.wait.until(EC.visibility_of(element))
         return rigs_regions.ItemModal(self, element)
 
@@ -230,6 +230,11 @@ class CreateEventChecklist(FormPage):
     URL_TEMPLATE = 'event/{event_id}/checklist'
 
     _submit_locator = (By.XPATH, "//button[@type='submit' and contains(., 'Save')]")
+    _power_mic_selector = (By.XPATH, "//div[select[@id='id_power_mic']]")
+    _add_vehicle_locator = (By.XPATH, "//button[contains(., 'Vehicle')]")
+    _add_crew_locator = (By.XPATH, "//button[contains(., 'Crew')]")
+    _vehicle_row_locator = ('xpath', "//tr[@id[starts-with(., 'vehicle') and not(contains(.,'new'))]]")
+    _crew_row_locator = ('xpath', "//tr[@id[starts-with(., 'crew') and not(contains(.,'new'))]]")
 
     form_items = {
         'safe_parking': (regions.CheckBox, (By.ID, 'id_safe_parking')),
@@ -240,20 +245,6 @@ class CreateEventChecklist(FormPage):
         'ear_plugs': (regions.CheckBox, (By.ID, 'id_ear_plugs')),
         'hs_location': (regions.TextBox, (By.ID, 'id_hs_location')),
         'extinguishers_location': (regions.TextBox, (By.ID, 'id_extinguishers_location')),
-    }
-
-    @property
-    def success(self):
-        return '{event_id}' not in self.driver.current_url
-
-
-class CreatePowerTestRecord(FormPage):
-    URL_TEMPLATE = 'event/{event_id}/power'
-
-    _submit_locator = (By.XPATH, "//button[@type='submit' and contains(., 'Save')]")
-    _power_mic_selector = (By.XPATH, "//div[select[@id='id_power_mic']]")
-
-    form_items = {
         'rcds': (regions.CheckBox, (By.ID, 'id_rcds')),
         'supply_test': (regions.CheckBox, (By.ID, 'id_supply_test')),
         'earthing': (regions.CheckBox, (By.ID, 'id_earthing')),
@@ -272,10 +263,58 @@ class CreatePowerTestRecord(FormPage):
         'w1_earth_fault': (regions.TextBox, (By.ID, 'id_w1_earth_fault')),
     }
 
+    def add_vehicle(self):
+        self.find_element(*self._add_vehicle_locator).click()
+
+    def add_crew(self):
+        self.find_element(*self._add_crew_locator).click()
+
     @property
     def power_mic(self):
         return regions.BootstrapSelectElement(self, self.find_element(*self._power_mic_selector))
 
+    @property
+    def vehicles(self):
+        return [self.VehicleRow(self, el) for el in self.find_elements(*self._vehicle_row_locator)]
+
+    class VehicleRow(Region):
+        _name_locator = ('xpath', ".//input")
+        _select_locator = ('xpath', ".//div[contains(@class,'bootstrap-select')]/..")
+
+        @property
+        def name(self):
+            return regions.TextBox(self, self.root.find_element(*self._name_locator))
+
+        @property
+        def vehicle(self):
+            return regions.BootstrapSelectElement(self, self.root.find_element(*self._select_locator))
+
+    @property
+    def crew(self):
+        return [self.CrewRow(self, el) for el in self.find_elements(*self._crew_row_locator)]
+
+    class CrewRow(Region):
+        _select_locator = ('xpath', ".//div[contains(@class,'bootstrap-select')]/..")
+        _start_time_locator = ('xpath', ".//input[@name[starts-with(., 'start') and not(contains(.,'new'))]]")
+        _end_time_locator = ('xpath', ".//input[@name[starts-with(., 'end') and not(contains(.,'new'))]]")
+        _role_locator = ('xpath', ".//input[@name[starts-with(., 'role') and not(contains(.,'new'))]]")
+
+        @property
+        def crewmember(self):
+            return regions.BootstrapSelectElement(self, self.root.find_element(*self._select_locator))
+
+        @property
+        def start_time(self):
+            return regions.DateTimePicker(self, self.root.find_element(*self._start_time_locator))
+
+        @property
+        def end_time(self):
+            return regions.DateTimePicker(self, self.root.find_element(*self._end_time_locator))
+
+        @property
+        def role(self):
+            return regions.TextBox(self, self.root.find_element(*self._role_locator))
+
     @property
     def success(self):
         return '{event_id}' not in self.driver.current_url

RIGS/tests/regions.py

@@ -6,7 +6,7 @@ from PyRIGS.tests.regions import TextBox, Modal, SimpleMDETextArea
 
 class Header(Region):
     def find_link(self, link_text):
-        return self.driver.find_element(By.PARTIAL_LINK_TEXT, link_text)
+        return self.driver.find_element_by_partial_link_text(link_text)
 
 
 class ItemRow(Region):

RIGS/tests/sample.md

@@ -1,155 +0,0 @@
-An h1 header
-============
-
-Paragraphs are separated by a blank line.
-
-2nd paragraph. *Italic*, **bold**, and `monospace`. Itemized lists
-look like:
-
-  * this one
-  * that one
-  * the other one
-
-Note that --- not considering the asterisk --- the actual text
-content starts at 4-columns in.
-
-> Block quotes are
-> written like so.
->
-> They can span multiple paragraphs,
-> if you like.
-
-Use 3 dashes for an em-dash. Use 2 dashes for ranges (ex., "it's all
-in chapters 12--14"). Three dots ... will be converted to an ellipsis.
-Unicode is supported.
-
-
-
-An h2 header
-------------
-
-Here's a numbered list:
-
- 1. first item
- 2. second item
- 3. third item
-
-Note again how the actual text starts at 4 columns in (4 characters
-from the left side). Here's a code sample:
-
-    # Let me re-iterate ...
-    for i in 1 .. 10 { do-something(i) }
-
-As you probably guessed, indented 4 spaces. By the way, instead of
-indenting the block, you can use delimited blocks, if you like:
-
-~~~
-define foobar() {
-    print "Welcome to flavor country!";
-}
-~~~
-
-(which makes copying & pasting easier). You can optionally mark the
-delimited block for Pandoc to syntax highlight it:
-
-~~~python
-import time
-# Quick, count to ten!
-for i in range(10):
-    # (but not *too* quick)
-    time.sleep(0.5)
-    print i
-~~~
-
-
-
-### An h3 header ###
-
-Now a nested list:
-
- 1. First, get these ingredients:
-
-      * carrots
-      * celery
-      * lentils
-
- 2. Boil some water.
-
- 3. Dump everything in the pot and follow
-    this algorithm:
-
-        find wooden spoon
-        uncover pot
-        stir
-        cover pot
-        balance wooden spoon precariously on pot handle
-        wait 10 minutes
-        goto first step (or shut off burner when done)
-
-    Do not bump wooden spoon or it will fall.
-
-Notice again how text always lines up on 4-space indents (including
-that last line which continues item 3 above).
-
-Here's a link to [a website](http://foo.bar). Here's a footnote [^1].
-
-[^1]: Footnote text goes here.
-
-Tables can look like this:
-
-size  material      color
-----  ------------  ------------
-9     leather       brown
-10    hemp canvas   natural
-11    glass         transparent
-
-Table: Shoes, their sizes, and what they're made of
-
-(The above is the caption for the table.) Pandoc also supports
-multi-line tables:
-
---------  -----------------------
-keyword   text
---------  -----------------------
-red       Sunsets, apples, and
-          other red or reddish
-          things.
-
-green     Leaves, grass, frogs
-          and other things it's
-          not easy being.
---------  -----------------------
-
-A horizontal rule follows.
-
-***
-
-Here's a definition list:
-
-apples
-  : Good for making applesauce.
-oranges
-  : Citrus!
-tomatoes
-  : There's no "e" in tomatoe.
-
-Again, text is indented 4 spaces. (Put a blank line between each
-term/definition pair to spread things out more.)
-
-Here's a "line block":
-
-| Line one
-|   Line too
-| Line tree
-
-and images can be specified like so:
-
-![example image](example-image.jpg "An exemplary image")
-
-Inline math equations go in like so: $\\omega = d\\phi / dt$. Display
-math should get its own line and be put in in double-dollarsigns:
-
-$$I = \\int \rho R^{2} dV$$
-
-And note that you can backslash-escape any punctuation characters
-which you wish to be displayed literally, ex.: \\`foo\\`, \\*bar\\*, etc.

RIGS/tests/test_interaction.py

@@ -211,7 +211,7 @@ class TestEventCreate(BaseRigboardTest):
         self.assertEqual("Test Item 1", testitem['name'])
         self.assertEqual("2", testitem['quantity'])  # test a couple of "worse case" fields
 
-        total = self.driver.find_element(By.ID, 'total')
+        total = self.driver.find_element_by_id('total')
         ActionChains(self.driver).move_to_element(total).perform()
 
         # See new item appear in table
@@ -224,9 +224,9 @@ class TestEventCreate(BaseRigboardTest):
         self.assertEqual('47.90', row.subtotal)
 
         # Check totals TODO convert to page properties
-        self.assertEqual("47.90", self.driver.find_element(By.ID, 'sumtotal').text)
-        self.assertIn("(TBC)", self.driver.find_element(By.ID, 'vat-rate').text)
-        self.assertEqual("9.58", self.driver.find_element(By.ID, 'vat').text)
+        self.assertEqual("47.90", self.driver.find_element_by_id('sumtotal').text)
+        self.assertIn("(TBC)", self.driver.find_element_by_id('vat-rate').text)
+        self.assertEqual("9.58", self.driver.find_element_by_id('vat').text)
         self.assertEqual("57.48", total.text)
 
         self.page.submit()
@@ -318,7 +318,7 @@ class TestEventDuplicate(BaseRigboardTest):
 
         self.assertFalse(newEvent.authorised)
 
-        self.assertNotIn("N%05d" % self.testEvent.pk, self.driver.find_element(By.XPATH, '//h2').text)
+        self.assertNotIn("N%05d" % self.testEvent.pk, self.driver.find_element_by_xpath('//h2').text)
         self.assertNotIn("Event data duplicated but not yet saved", self.page.warning)  # Check info message not visible
 
         # Check the new items are visible
@@ -327,25 +327,26 @@ class TestEventDuplicate(BaseRigboardTest):
         self.assertIn("Test Item 2", table.text)
         self.assertIn("Test Item 3", table.text)
 
-        infoPanel = self.driver.find_element(By.XPATH, '//div[contains(text(), "Event Info")]/..')
-        self.assertIn("N%05d" % self.testEvent.pk, infoPanel.find_element(By.XPATH, '//dt[text()="Based On"]/following-sibling::dd[1]').text)
+        infoPanel = self.driver.find_element_by_xpath('//div[contains(text(), "Event Info")]/..')
+        self.assertIn("N%05d" % self.testEvent.pk,
+                      infoPanel.find_element_by_xpath('//dt[text()="Based On"]/following-sibling::dd[1]').text)
         # Check the PO hasn't carried through
-        self.assertNotIn("TESTPO", infoPanel.find_element(By.XPATH, '//dt[text()="PO"]/following-sibling::dd[1]').text)
+        self.assertNotIn("TESTPO", infoPanel.find_element_by_xpath('//dt[text()="PO"]/following-sibling::dd[1]').text)
 
         self.assertIn("N%05d" % self.testEvent.pk,
-                      infoPanel.find_element(By.XPATH, '//dt[text()="Based On"]/following-sibling::dd[1]').text)
+                      infoPanel.find_element_by_xpath('//dt[text()="Based On"]/following-sibling::dd[1]').text)
 
         self.driver.get(self.live_server_url + '/event/' + str(self.testEvent.pk))  # Go back to the old event
 
         # Check that based-on hasn't crept into the old event
-        infoPanel = self.driver.find_element(By.XPATH, '//div[contains(text(), "Event Info")]/..')
+        infoPanel = self.driver.find_element_by_xpath('//div[contains(text(), "Event Info")]/..')
         self.assertNotIn("N%05d" % self.testEvent.pk,
-                         infoPanel.find_element(By.XPATH, '//dt[text()="Based On"]/following-sibling::dd[1]').text)
+                         infoPanel.find_element_by_xpath('//dt[text()="Based On"]/following-sibling::dd[1]').text)
         # Check the PO remains on the old event
-        self.assertIn("TESTPO", infoPanel.find_element(By.XPATH, '//dt[text()="PO"]/following-sibling::dd[1]').text)
+        self.assertIn("TESTPO", infoPanel.find_element_by_xpath('//dt[text()="PO"]/following-sibling::dd[1]').text)
 
         self.assertNotIn("N%05d" % self.testEvent.pk,
-                         infoPanel.find_element(By.XPATH, '//dt[text()="Based On"]/following-sibling::dd[1]').text)
+                         infoPanel.find_element_by_xpath('//dt[text()="Based On"]/following-sibling::dd[1]').text)
 
         # Check the items are as they were
         table = self.page.item_table  # ID number is known, see above
@@ -676,6 +677,14 @@ def small_ec(page, admin_user):
     page.ear_plugs = True
     page.hs_location = "The Moon"
     page.extinguishers_location = "With the rest of the fire"
+    # If we do this first the search fails, for ... reasons
+    page.power_mic.search(admin_user.name)
+    page.power_mic.toggle()
+    assert not page.power_mic.is_open
+    page.earthing = True
+    page.rcds = True
+    page.supply_test = True
+    page.pat = True
 
 
 def test_ec_create_small(logged_in_browser, live_server, admin_user, ra):
@@ -696,15 +705,14 @@ def test_ec_create_medium(logged_in_browser, live_server, admin_user, medium_ra)
     page.ear_plugs = True
     page.hs_location = "Death Valley"
     page.extinguishers_location = "With the rest of the fire"
+    # If we do this first the search fails, for ... reasons
+    page.power_mic.search(admin_user.name)
+    page.power_mic.toggle()
+    assert not page.power_mic.is_open
 
     # Gotta scroll to make the button clickable
     logged_in_browser.driver.execute_script("window.scrollTo(0, document.body.scrollHeight);")
-    page.submit()
-    assert page.success
 
-
-def test_power_checklist(logged_in_browser, live_server, admin_user, power_test, medium_ra):
-    page = pages.CreatePowerTestRecord(logged_in_browser.driver, live_server.url, event_id=medium_ra.event.pk).open()
     page.earthing = True
     page.pat = True
     page.source_rcd = True
@@ -719,15 +727,56 @@ def test_power_checklist(logged_in_browser, live_server, admin_user, power_test,
     page.w1_polarity = True
     page.w1_voltage = 240
     page.w1_earth_fault = "0.42"
-    # If we do this first the search fails, for ... reasons
-    page.power_mic.search(admin_user.name)
-    page.power_mic.toggle()
-    assert not page.power_mic.is_open
 
     page.submit()
     assert page.success
 
 
+def test_ec_create_vehicle(logged_in_browser, live_server, admin_user, checklist):
+    page = pages.EditEventChecklist(logged_in_browser.driver, live_server.url, pk=checklist.pk).open()
+    small_ec(page, admin_user)
+    page.add_vehicle()
+    assert len(page.vehicles) == 1
+    vehicle_name = 'Brian'
+    page.vehicles[0].name.set_value(vehicle_name)
+    # Appears we're moving too fast for javascript...
+    t.sleep(1)
+    page.vehicles[0].vehicle.search(admin_user.first_name)
+    t.sleep(1)
+    page.submit()
+    assert page.success
+    # Check data is correct
+    checklist.refresh_from_db()
+    vehicle = models.EventChecklistVehicle.objects.get(checklist=checklist.pk)
+    assert vehicle_name == vehicle.vehicle
+
+
+# TODO Test validation of end before start
+def test_ec_create_crew(logged_in_browser, live_server, admin_user, checklist):
+    page = pages.EditEventChecklist(logged_in_browser.driver, live_server.url, pk=checklist.pk).open()
+    small_ec(page, admin_user)
+    page.add_crew()
+    assert len(page.crew) == 1
+    role = "MIC"
+    start_time = timezone.make_aware(datetime.datetime(2015, 1, 1, 9, 0))
+    end_time = timezone.make_aware(datetime.datetime(2015, 1, 1, 10, 30))
+    crew = page.crew[0]
+    t.sleep(2)
+    crew.crewmember.search(admin_user.first_name)
+    t.sleep(2)
+    crew.role.set_value(role)
+    crew.start_time.set_value(start_time)
+    crew.end_time.set_value(end_time)
+    page.submit()
+    assert page.success
+    # Check data is correct
+    crew_obj = models.EventChecklistCrew.objects.get(checklist=checklist.pk)
+    assert admin_user.pk == crew_obj.crewmember.pk
+    assert role == crew_obj.role
+    assert start_time == crew_obj.start
+    assert end_time == crew_obj.end
+
+
 # TODO Can I loop through all the boolean fields and test them at once?
 def test_ra_creation(logged_in_browser, live_server, admin_user, basic_event):
     page = pages.CreateRiskAssessment(logged_in_browser.driver, live_server.url, event_id=basic_event.pk).open()

RIGS/tests/test_unit.py

@@ -1,8 +1,5 @@
-import os
-import pytest
 from datetime import date
 
-from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist
 from django.test import TestCase
 from django.test.utils import override_settings
@@ -15,6 +12,8 @@ from pytest_django.asserts import assertRedirects, assertNotContains, assertCont
 from PyRIGS.tests.base import assert_times_almost_equal, assert_oembed, login
 from RIGS import models
 
+import pytest
+
 pytestmark = pytest.mark.django_db
 
 
@@ -372,7 +371,163 @@ def test_ra_redirect(admin_client, admin_user, ra):
 
 
 class TestMarkdownTemplateTags(TestCase):
-    markdown = open(os.path.join(settings.BASE_DIR, "RIGS/tests/sample.md")).read()
+    markdown = """
+An h1 header
+============
+
+Paragraphs are separated by a blank line.
+
+2nd paragraph. *Italic*, **bold**, and `monospace`. Itemized lists
+look like:
+
+  * this one
+  * that one
+  * the other one
+
+Note that --- not considering the asterisk --- the actual text
+content starts at 4-columns in.
+
+> Block quotes are
+> written like so.
+>
+> They can span multiple paragraphs,
+> if you like.
+
+Use 3 dashes for an em-dash. Use 2 dashes for ranges (ex., "it's all
+in chapters 12--14"). Three dots ... will be converted to an ellipsis.
+Unicode is supported.
+
+
+
+An h2 header
+------------
+
+Here's a numbered list:
+
+ 1. first item
+ 2. second item
+ 3. third item
+
+Note again how the actual text starts at 4 columns in (4 characters
+from the left side). Here's a code sample:
+
+    # Let me re-iterate ...
+    for i in 1 .. 10 { do-something(i) }
+
+As you probably guessed, indented 4 spaces. By the way, instead of
+indenting the block, you can use delimited blocks, if you like:
+
+~~~
+define foobar() {
+    print "Welcome to flavor country!";
+}
+~~~
+
+(which makes copying & pasting easier). You can optionally mark the
+delimited block for Pandoc to syntax highlight it:
+
+~~~python
+import time
+# Quick, count to ten!
+for i in range(10):
+    # (but not *too* quick)
+    time.sleep(0.5)
+    print i
+~~~
+
+
+
+### An h3 header ###
+
+Now a nested list:
+
+ 1. First, get these ingredients:
+
+      * carrots
+      * celery
+      * lentils
+
+ 2. Boil some water.
+
+ 3. Dump everything in the pot and follow
+    this algorithm:
+
+        find wooden spoon
+        uncover pot
+        stir
+        cover pot
+        balance wooden spoon precariously on pot handle
+        wait 10 minutes
+        goto first step (or shut off burner when done)
+
+    Do not bump wooden spoon or it will fall.
+
+Notice again how text always lines up on 4-space indents (including
+that last line which continues item 3 above).
+
+Here's a link to [a website](http://foo.bar). Here's a footnote [^1].
+
+[^1]: Footnote text goes here.
+
+Tables can look like this:
+
+size  material      color
+----  ------------  ------------
+9     leather       brown
+10    hemp canvas   natural
+11    glass         transparent
+
+Table: Shoes, their sizes, and what they're made of
+
+(The above is the caption for the table.) Pandoc also supports
+multi-line tables:
+
+--------  -----------------------
+keyword   text
+--------  -----------------------
+red       Sunsets, apples, and
+          other red or reddish
+          things.
+
+green     Leaves, grass, frogs
+          and other things it's
+          not easy being.
+--------  -----------------------
+
+A horizontal rule follows.
+
+***
+
+Here's a definition list:
+
+apples
+  : Good for making applesauce.
+oranges
+  : Citrus!
+tomatoes
+  : There's no "e" in tomatoe.
+
+Again, text is indented 4 spaces. (Put a blank line between each
+term/definition pair to spread things out more.)
+
+Here's a "line block":
+
+| Line one
+|   Line too
+| Line tree
+
+and images can be specified like so:
+
+![example image](example-image.jpg "An exemplary image")
+
+Inline math equations go in like so: $\\omega = d\\phi / dt$. Display
+math should get its own line and be put in in double-dollarsigns:
+
+$$I = \\int \rho R^{2} dV$$
+
+And note that you can backslash-escape any punctuation characters
+which you wish to be displayed literally, ex.: \\`foo\\`, \\*bar\\*, etc.
+    """
 
     def test_html_safe(self):
         html = markdown_filter(self.markdown)
@@ -401,7 +556,6 @@ class TestMarkdownTemplateTags(TestCase):
             description=self.markdown,
             start_date='2016-01-01',
         )
-        event_item = models.EventItem.objects.create(event=event, name="TI I1", quantity=1, cost=1.00, order=1, description="* test \n * test \n * test")
         user = models.Profile.objects.create(
             username='RML test',
             is_superuser=True,  # Don't care about permissions

RIGS/urls.py

@@ -5,7 +5,7 @@ from django.views.generic import RedirectView
 
 from PyRIGS.decorators import (api_key_required, has_oembed,
                                permission_required_with_403)
-from . import views
+from RIGS import finance, ical, rigboard, views, hs
 
 urlpatterns = [
     # People
@@ -42,116 +42,101 @@ urlpatterns = [
          name='venue_update'),
 
     # Rigboard
-    path('rigboard/', login_required(views.RigboardIndex.as_view()), name='rigboard'),
-    path('rigboard/calendar/', login_required()(views.WebCalendar.as_view()),
+    path('rigboard/', login_required(rigboard.RigboardIndex.as_view()), name='rigboard'),
+    path('rigboard/calendar/', login_required()(rigboard.WebCalendar.as_view()),
          name='web_calendar'),
     re_path(r'^rigboard/calendar/(?P<view>(month|week|day))/$',
-            login_required()(views.WebCalendar.as_view()), name='web_calendar'),
+            login_required()(rigboard.WebCalendar.as_view()), name='web_calendar'),
     re_path(r'^rigboard/calendar/(?P<view>(month|week|day))/(?P<date>(\d{4}-\d{2}-\d{2}))/$',
-            login_required()(views.WebCalendar.as_view()), name='web_calendar'),
+            login_required()(rigboard.WebCalendar.as_view()), name='web_calendar'),
     path('rigboard/archive/', RedirectView.as_view(permanent=True, pattern_name='event_archive')),
 
 
-    path('event/<int:pk>/', has_oembed(oembed_view="event_oembed")(views.EventDetail.as_view()),
+    path('event/<int:pk>/', has_oembed(oembed_view="event_oembed")(rigboard.EventDetail.as_view()),
          name='event_detail'),
-    path('event/create/', permission_required_with_403('RIGS.add_event')(views.EventCreate.as_view()),
+    path('event/create/', permission_required_with_403('RIGS.add_event')(rigboard.EventCreate.as_view()),
          name='event_create'),
-    path('event/archive/', login_required()(views.EventArchive.as_view()),
+    path('event/archive/', login_required()(rigboard.EventArchive.as_view()),
          name='event_archive'),
     path('event/<int:pk>/embed/',
-         xframe_options_exempt(login_required(login_url='/user/login/embed/')(views.EventEmbed.as_view())),
+         xframe_options_exempt(login_required(login_url='/user/login/embed/')(rigboard.EventEmbed.as_view())),
          name='event_embed'),
-    path('event/<int:pk>/oembed_json/', views.EventOEmbed.as_view(),
+    path('event/<int:pk>/oembed_json/', rigboard.EventOEmbed.as_view(),
          name='event_oembed'),
-    path('event/<int:pk>/print/', permission_required_with_403('RIGS.view_event')(views.EventPrint.as_view()),
+    path('event/<int:pk>/print/', permission_required_with_403('RIGS.view_event')(rigboard.EventPrint.as_view()),
          name='event_print'),
-    path('event/<int:pk>/edit/', permission_required_with_403('RIGS.change_event')(views.EventUpdate.as_view()),
+    path('event/<int:pk>/edit/', permission_required_with_403('RIGS.change_event')(rigboard.EventUpdate.as_view()),
          name='event_update'),
-    path('event/<int:pk>/duplicate/', permission_required_with_403('RIGS.add_event')(views.EventDuplicate.as_view()),
+    path('event/<int:pk>/duplicate/', permission_required_with_403('RIGS.add_event')(rigboard.EventDuplicate.as_view()),
          name='event_duplicate'),
 
     # Event H&S
-    path('event/hs/', permission_required_with_403('RIGS.view_riskassessment')(views.HSList.as_view()), name='hs_list'),
+    path('event/hs/', permission_required_with_403('RIGS.view_riskassessment')(hs.HSList.as_view()), name='hs_list'),
 
-    path('event/<int:pk>/ra/', permission_required_with_403('RIGS.add_riskassessment')(views.EventRiskAssessmentCreate.as_view()),
+    path('event/<int:pk>/ra/', permission_required_with_403('RIGS.add_riskassessment')(hs.EventRiskAssessmentCreate.as_view()),
          name='event_ra'),
-    path('event/ra/<int:pk>/', login_required(views.EventRiskAssessmentDetail.as_view()),
+    path('event/ra/<int:pk>/', permission_required_with_403('RIGS.view_riskassessment')(hs.EventRiskAssessmentDetail.as_view()),
          name='ra_detail'),
-    path('event/ra/<int:pk>/edit/', permission_required_with_403('RIGS.change_riskassessment')(views.EventRiskAssessmentEdit.as_view()),
+    path('event/ra/<int:pk>/edit/', permission_required_with_403('RIGS.change_riskassessment')(hs.EventRiskAssessmentEdit.as_view()),
          name='ra_edit'),
-    path('event/ra/<int:pk>/review/', permission_required_with_403('RIGS.review_riskassessment')(views.MarkReviewed.as_view()),
-         name='ra_review', kwargs={'model': 'RiskAssessment'}),
-    path('event/ra/<int:pk>/print/', permission_required_with_403('RIGS.view_riskassessment')(views.RAPrint.as_view()), name='ra_print'),
+    path('event/ra/list', permission_required_with_403('RIGS.view_riskassessment')(hs.EventRiskAssessmentList.as_view()),
+         name='ra_list'),
+    path('event/ra/<int:pk>/review/', permission_required_with_403('RIGS.review_riskassessment')(hs.EventRiskAssessmentReview.as_view()),
+         name='ra_review'),
 
-    path('event/<int:pk>/checklist/', permission_required_with_403('RIGS.add_eventchecklist')(views.EventChecklistCreate.as_view()),
+    path('event/<int:pk>/checklist/', permission_required_with_403('RIGS.add_eventchecklist')(hs.EventChecklistCreate.as_view()),
          name='event_ec'),
-    path('event/checklist/<int:pk>/', login_required(views.EventChecklistDetail.as_view()),
+    path('event/checklist/<int:pk>/', permission_required_with_403('RIGS.view_eventchecklist')(hs.EventChecklistDetail.as_view()),
          name='ec_detail'),
-    path('event/checklist/<int:pk>/edit/', permission_required_with_403('RIGS.change_eventchecklist')(views.EventChecklistEdit.as_view()),
+    path('event/checklist/<int:pk>/edit/', permission_required_with_403('RIGS.change_eventchecklist')(hs.EventChecklistEdit.as_view()),
          name='ec_edit'),
-    path('event/checklist/<int:pk>/review/', permission_required_with_403('RIGS.review_eventchecklist')(views.MarkReviewed.as_view()),
-         name='ec_review', kwargs={'model': 'EventChecklist'}),
-
-    path('event/<int:pk>/power/', permission_required_with_403('RIGS.add_powertestrecord')(views.PowerTestCreate.as_view()),
-         name='event_pt'),
-    path('event/power/<int:pk>/', login_required(views.PowerTestDetail.as_view()),
-         name='pt_detail'),
-    path('event/power/<int:pk>/edit/', permission_required_with_403('RIGS.change_powertestrecord')(views.PowerTestEdit.as_view()),
-         name='pt_edit'),
-    path('event/power/<int:pk>/review/', permission_required_with_403('RIGS.review_power')(views.MarkReviewed.as_view()),
-         name='pt_review', kwargs={'model': 'PowerTestRecord'}),
-
-    path('event/<int:pk>/checkin/', login_required(views.EventCheckIn.as_view()),
-         name='event_checkin'),
-    path('event/checkout/', login_required(views.EventCheckOut.as_view()),
-         name='event_checkout'),
-    path('event/<int:pk>/checkin/edit/', login_required(views.EventCheckInEdit.as_view()),
-         name='edit_checkin'),
-    path('event/<int:pk>/checkin/add/', login_required(views.EventCheckInOverride.as_view()),
-         name='event_checkin_override'),
+    path('event/checklist/list', permission_required_with_403('RIGS.view_eventchecklist')(hs.EventChecklistList.as_view()),
+         name='ec_list'),
+    path('event/checklist/<int:pk>/review/', permission_required_with_403('RIGS.review_eventchecklist')(hs.EventChecklistReview.as_view()),
+         name='ec_review'),
 
     # Finance
-    path('invoice/', permission_required_with_403('RIGS.view_invoice')(views.InvoiceIndex.as_view()),
+    path('invoice/', permission_required_with_403('RIGS.view_invoice')(finance.InvoiceIndex.as_view()),
          name='invoice_list'),
-    path('invoice/archive/', permission_required_with_403('RIGS.view_invoice')(views.InvoiceArchive.as_view()),
+    path('invoice/archive/', permission_required_with_403('RIGS.view_invoice')(finance.InvoiceArchive.as_view()),
          name='invoice_archive'),
-    path('invoice/waiting/', permission_required_with_403('RIGS.add_invoice')(views.InvoiceWaiting.as_view()),
+    path('invoice/waiting/', permission_required_with_403('RIGS.add_invoice')(finance.InvoiceWaiting.as_view()),
          name='invoice_waiting'),
 
-    path('event/<int:pk>/invoice/', permission_required_with_403('RIGS.add_invoice')(views.InvoiceEvent.as_view()),
+    path('event/<int:pk>/invoice/', permission_required_with_403('RIGS.add_invoice')(finance.InvoiceEvent.as_view()),
          name='invoice_event'),
-    path('event/<int:pk>/invoice/void', permission_required_with_403('RIGS.add_invoice')(views.InvoiceEvent.as_view()),
+    path('event/<int:pk>/invoice/void', permission_required_with_403('RIGS.add_invoice')(finance.InvoiceEvent.as_view()),
          name='invoice_event_void', kwargs={'void': True}),
 
-    path('invoice/<int:pk>/', permission_required_with_403('RIGS.view_invoice')(views.InvoiceDetail.as_view()),
+    path('invoice/<int:pk>/', permission_required_with_403('RIGS.view_invoice')(finance.InvoiceDetail.as_view()),
          name='invoice_detail'),
-    path('invoice/<int:pk>/print/', permission_required_with_403('RIGS.view_invoice')(views.InvoicePrint.as_view()),
+    path('invoice/<int:pk>/print/', permission_required_with_403('RIGS.view_invoice')(finance.InvoicePrint.as_view()),
          name='invoice_print'),
-    path('invoice/<int:pk>/void/', permission_required_with_403('RIGS.change_invoice')(views.InvoiceVoid.as_view()),
+    path('invoice/<int:pk>/void/', permission_required_with_403('RIGS.change_invoice')(finance.InvoiceVoid.as_view()),
          name='invoice_void'),
     path('invoice/<int:pk>/delete/',
-         permission_required_with_403('RIGS.change_invoice')(views.InvoiceDelete.as_view()),
+         permission_required_with_403('RIGS.change_invoice')(finance.InvoiceDelete.as_view()),
          name='invoice_delete'),
 
-    path('payment/create/', permission_required_with_403('RIGS.add_payment')(views.PaymentCreate.as_view()),
+    path('payment/create/', permission_required_with_403('RIGS.add_payment')(finance.PaymentCreate.as_view()),
          name='payment_create'),
-    path('payment/<int:pk>/delete/', permission_required_with_403('RIGS.add_payment')(views.PaymentDelete.as_view()),
+    path('payment/<int:pk>/delete/', permission_required_with_403('RIGS.add_payment')(finance.PaymentDelete.as_view()),
          name='payment_delete'),
 
     # Client event authorisation
     path('event/<pk>/auth/',
-         permission_required_with_403('RIGS.change_event')(views.EventAuthorisationRequest.as_view()),
+         permission_required_with_403('RIGS.change_event')(rigboard.EventAuthorisationRequest.as_view()),
          name='event_authorise_request'),
     path('event/<int:pk>/auth/preview/',
-         permission_required_with_403('RIGS.change_event')(views.EventAuthoriseRequestEmailPreview.as_view()),
+         permission_required_with_403('RIGS.change_event')(rigboard.EventAuthoriseRequestEmailPreview.as_view()),
          name='event_authorise_preview'),
-    re_path(r'^event/(?P<pk>\d+)/(?P<hmac>[-:\w]+)/$', views.EventAuthorise.as_view(),
+    re_path(r'^event/(?P<pk>\d+)/(?P<hmac>[-:\w]+)/$', rigboard.EventAuthorise.as_view(),
             name='event_authorise'),
-    re_path(r'^event/(?P<pk>\d+)/(?P<hmac>[-:\w]+)/preview/$', views.EventAuthorise.as_view(preview=True),
+    re_path(r'^event/(?P<pk>\d+)/(?P<hmac>[-:\w]+)/preview/$', rigboard.EventAuthorise.as_view(preview=True),
             name='event_authorise_form_preview'),
 
     # ICS Calendar - API key authentication
-    re_path(r'^ical/(?P<api_pk>\d+)/(?P<api_key>\w+)/rigs.ics$', api_key_required(views.CalendarICS()),
+    re_path(r'^ical/(?P<api_pk>\d+)/(?P<api_key>\w+)/rigs.ics$', api_key_required(ical.CalendarICS()),
             name="ics_calendar"),
 
 

RIGS/views/__init__.py

@@ -1,5 +0,0 @@
-from .crud import *
-from .finance import *
-from .hs import *
-from .ical import *
-from .rigboard import *

RIGS/views/hs.py

@@ -1,290 +0,0 @@
-from django.apps import apps
-from django.contrib import messages
-from django.http import HttpResponseRedirect
-from django.urls import reverse
-from django.utils import timezone
-from django.views import generic
-from reversion import revisions as reversion
-
-from RIGS import models, forms
-from RIGS.views.rigboard import get_related
-from PyRIGS.views import PrintView, ModalURLMixin
-from django.shortcuts import redirect
-
-
-class HSCreateView(generic.CreateView):
-    def get_form(self, **kwargs):
-        form = super().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().get_context_data(**kwargs)
-        epk = self.kwargs.get('pk')
-        event = models.Event.objects.get(pk=epk)
-        context['event'] = event
-        context['page_title'] = f'Create {self.model.__name__} for Event {event.display_id}'
-        return context
-
-
-class MarkReviewed(generic.View):
-    def get(self, *args, **kwargs):
-        obj = apps.get_model('RIGS', kwargs.get('model')).objects.get(pk=kwargs.get('pk'))
-        with reversion.create_revision():
-            reversion.set_user(self.request.user)
-            obj.reviewed_by = self.request.user
-            obj.reviewed_at = timezone.now()
-            obj.save()
-        return HttpResponseRedirect(reverse('hs_list'))
-
-
-class EventRiskAssessmentCreate(HSCreateView):
-    model = models.RiskAssessment
-    template_name = 'hs/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('ra_edit', kwargs={'pk': ra.pk}))
-
-        return super(EventRiskAssessmentCreate, self).get(self)
-
-    def get_success_url(self):
-        return reverse('ra_detail', kwargs={'pk': self.object.pk})
-
-
-class EventRiskAssessmentEdit(generic.UpdateView):
-    model = models.RiskAssessment
-    template_name = 'hs/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('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'] = f'Edit Risk Assessment for Event {ra.event.display_id}'
-        get_related(context['form'], context)
-        return context
-
-
-class EventRiskAssessmentDetail(generic.DetailView):
-    model = models.RiskAssessment
-    template_name = 'hs/risk_assessment_detail.html'
-
-    def get_context_data(self, **kwargs):
-        context = super(EventRiskAssessmentDetail, self).get_context_data(**kwargs)
-        context['page_title'] = f"Risk Assessment for Event <a href='{self.object.event.get_absolute_url()}'>{self.object.event.display_id} {self.object.event.name}</a>"
-        return context
-
-
-class EventChecklistDetail(generic.DetailView):
-    model = models.EventChecklist
-    template_name = 'hs/event_checklist_detail.html'
-
-    def get_context_data(self, **kwargs):
-        context = super(EventChecklistDetail, self).get_context_data(**kwargs)
-        context['page_title'] = f"Event Checklist for Event <a href='{self.object.event.get_absolute_url()}'>{self.object.event.display_id} {self.object.event.name}</a>"
-        return context
-
-
-class EventChecklistEdit(generic.UpdateView):
-    model = models.EventChecklist
-    template_name = 'hs/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('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'] = f'Edit Event Checklist for Event {ec.event.display_id}'
-        get_related(context['form'], context)
-        return context
-
-
-class EventChecklistCreate(HSCreateView):
-    model = models.EventChecklist
-    template_name = 'hs/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, f'A Risk Assessment must exist prior to creating any Event Checklists for {event}! Please create one now.')
-            return HttpResponseRedirect(reverse('event_ra', kwargs={'pk': epk}))
-
-        return super(EventChecklistCreate, self).get(self)
-
-    def get_success_url(self):
-        return reverse('ec_detail', kwargs={'pk': self.object.pk})
-
-
-class PowerTestDetail(generic.DetailView):
-    model = models.PowerTestRecord
-    template_name = 'hs/power_detail.html'
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        context['page_title'] = f"Power Test Record for Event <a href='{self.object.event.get_absolute_url()}'>{self.object.event.display_id} {self.object.event.name}</a>"
-        return context
-
-
-class PowerTestEdit(generic.UpdateView):
-    model = models.PowerTestRecord
-    template_name = 'hs/power_form.html'
-    form_class = forms.PowerTestRecordForm
-
-    def get_success_url(self):
-        ec = self.get_object()
-        ec.reviewed_by = None
-        ec.reviewed_at = None
-        ec.save()
-        return reverse('ec_detail', kwargs={'pk': self.object.pk})
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        pk = self.kwargs.get('pk')
-        ec = models.PowerTestRecord.objects.get(pk=pk)
-        context['event'] = ec.event
-        context['edit'] = True
-        context['page_title'] = f'Edit Power Test Record for Event {ec.event.display_id}'
-        # get_related(context['form'], context)
-        return context
-
-
-class PowerTestCreate(HSCreateView):
-    model = models.PowerTestRecord
-    template_name = 'hs/power_form.html'
-    form_class = forms.PowerTestRecordForm
-
-    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, f'A Risk Assessment must exist prior to creating any Power Test Records for {event}! Please create one now.')
-            return HttpResponseRedirect(reverse('event_ra', kwargs={'pk': epk}))
-
-        return super().get(self)
-
-    def get_success_url(self):
-        return reverse('pt_detail', kwargs={'pk': self.object.pk})
-
-
-class HSList(generic.ListView):
-    paginate_by = 20
-    model = models.Event
-    template_name = 'hs/hs_list.html'
-
-    def get_queryset(self):
-        return models.Event.objects.all().exclude(status=models.Event.CANCELLED).order_by('-start_date').select_related('riskassessment').prefetch_related('checklists')
-
-    def get_context_data(self, **kwargs):
-        context = super(HSList, self).get_context_data(**kwargs)
-        context['page_title'] = 'H&S Overview'
-        return context
-
-
-class RAPrint(PrintView):
-    model = models.RiskAssessment
-    template_name = 'hs/ra_print.xml'
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        context['filename'] = f"EventSpecificRiskAssessment_for_{context['object'].event.display_id}.pdf"
-        return context
-
-
-class EventCheckIn(generic.CreateView, ModalURLMixin):
-    model = models.EventCheckIn
-    template_name = 'hs/eventcheckin_form.html'
-    form_class = forms.EventCheckInForm
-
-    def get_success_url(self):
-        return self.get_close_url('event_detail', 'event_detail')  # Well, that's one way of doing that...!
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        context['event'] = models.Event.objects.get(pk=self.kwargs.get('pk'))
-        context['page_title'] = f'Check In to Event {context["event"].display_id}'
-        # get_related(context['form'], context)
-        return context
-
-
-class EventCheckInOverride(generic.CreateView):
-    model = models.EventCheckIn
-    template_name = 'hs/eventcheckin_form.html'
-    form_class = forms.EditCheckInForm
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        context['event'] = models.Event.objects.get(pk=self.kwargs.get('pk'))
-        context['page_title'] = f'Manually add Check In to Event {context["event"].display_id}'
-        context['manual'] = True
-        return context
-
-
-class EventCheckInEdit(generic.UpdateView, ModalURLMixin):
-    model = models.EventCheckIn
-    template_name = 'hs/eventcheckin_form.html'
-    form_class = forms.EditCheckInForm
-
-    def dispatch(self, request, *args, **kwargs):
-        obj = self.get_object()
-        if not obj.person == self.request.user and not obj.event.mic == self.request.user:
-            return redirect(self.request.META.get('HTTP_REFERER', '/'))
-        return super().dispatch(request)
-
-    def get_success_url(self):
-        return self.get_close_url('event_detail', 'event_detail')  # Well, that's one way of doing that...!
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        context['event'] = self.object.event
-        context['page_title'] = f'Edit Check In for Event {context["event"].display_id}'
-        context['edit'] = True
-        # get_related(context['form'], context)
-        return context
-
-
-class EventCheckOut(generic.RedirectView):
-    def get_redirect_url(self, *args, **kwargs):
-        checkin = self.request.user.current_event()
-        if checkin:
-            checkin.end_time = timezone.now()
-            checkin.save()
-        return self.request.META.get('HTTP_REFERER', '/')

assets/admin.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 from reversion.admin import VersionAdmin
-from RIGS.admin import AssociateAdmin
+
 from assets import models as assets
 
 
@@ -17,13 +17,9 @@ class AssetStatusAdmin(admin.ModelAdmin):
 
 
 @admin.register(assets.Supplier)
-class SupplierAdmin(AssociateAdmin):
+class SupplierAdmin(VersionAdmin):
     list_display = ['id', 'name']
     ordering = ['id']
-    merge_fields = ['name', 'phone', 'email', 'address', 'notes']
-
-    def get_queryset(self, request):
-        return super(VersionAdmin, self).get_queryset(request)
 
 
 @admin.register(assets.Asset)

assets/forms.py

@@ -33,7 +33,6 @@ class AssetSearchForm(forms.Form):
     category = forms.ModelMultipleChoiceField(models.AssetCategory.objects.all(), required=False)
     status = forms.ModelMultipleChoiceField(models.AssetStatus.objects.all(), required=False)
     is_cable = forms.BooleanField(required=False)
-    cable_type = forms.ModelMultipleChoiceField(models.CableType.objects.all(), required=False)
     date_acquired = forms.DateField(required=False)
 
 

assets/management/commands/generateSampleAssetsData.py

@@ -2,7 +2,6 @@ import random
 
 from django.core.management.base import BaseCommand, CommandError
 from django.db import transaction
-from django.db.utils import IntegrityError
 from django.utils import timezone
 from reversion import revisions as reversion
 
@@ -105,7 +104,8 @@ class Command(BaseCommand):
 
         for i in range(100):
             prefix = random.choice(asset_prefixes)
-            asset_id = get_available_asset_id(wanted_prefix=prefix)
+            asset_id = str(get_available_asset_id(wanted_prefix=prefix))
+            asset_id = prefix + asset_id
             asset = models.Asset(
                 asset_id=asset_id,
                 description=random.choice(asset_description),
@@ -125,9 +125,5 @@ class Command(BaseCommand):
             if i % 3 == 0:
                 asset.purchased_from = random.choice(self.suppliers)
 
-            with transaction.atomic():
-                try:
-                    asset.clean()
-                    asset.save()
-                except IntegrityError:
-                    pass
+            asset.clean()
+            asset.save()

assets/migrations/0023_alter_asset_purchased_from.py

@@ -1,19 +0,0 @@
-# Generated by Django 3.2.12 on 2022-02-14 15:13
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('assets', '0022_alter_cabletype_unique_together'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='asset',
-            name='purchased_from',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='assets', to='assets.supplier'),
-        ),
-    ]

assets/migrations/0024_alter_asset_salvage_value.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.2.12 on 2022-02-14 23:43
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('assets', '0023_alter_asset_purchased_from'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='asset',
-            name='salvage_value',
-            field=models.DecimalField(decimal_places=2, max_digits=10, null=True),
-        ),
-    ]

assets/migrations/0025_rename_salvage_value_asset_replacement_cost.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.2.12 on 2022-05-26 09:22
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('assets', '0024_alter_asset_salvage_value'),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name='asset',
-            old_name='salvage_value',
-            new_name='replacement_cost',
-        ),
-    ]

assets/migrations/0026_auto_20220526_1623.py

@@ -1,24 +0,0 @@
-# Generated by Django 3.2.12 on 2022-05-26 15:23
-
-import assets.models
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('assets', '0025_rename_salvage_value_asset_replacement_cost'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='asset',
-            name='purchase_price',
-            field=models.DecimalField(blank=True, decimal_places=2, max_digits=10, null=True, validators=[assets.models.validate_positive]),
-        ),
-        migrations.AlterField(
-            model_name='asset',
-            name='replacement_cost',
-            field=models.DecimalField(decimal_places=2, max_digits=10, null=True, validators=[assets.models.validate_positive]),
-        ),
-    ]

assets/migrations/0027_asset_nickname.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.2.16 on 2022-12-11 00:26
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('assets', '0026_auto_20220526_1623'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='asset',
-            name='nickname',
-            field=models.CharField(blank=True, max_length=120),
-        ),
-    ]

assets/models.py

@@ -2,12 +2,11 @@ import re
 
 from django.core.exceptions import ValidationError
 from django.db import models, connection
-from django.db.models import Q
 from django.urls import reverse
 from reversion import revisions as reversion
 from reversion.models import Version
 
-from RIGS.models import Profile, ContactableManager
+from RIGS.models import Profile
 from versioning.versioning import RevisionMixin
 
 
@@ -47,8 +46,6 @@ class Supplier(models.Model, RevisionMixin):
 
     notes = models.TextField(blank=True, default="")
 
-    objects = ContactableManager()
-
     class Meta:
         ordering = ['name']
 
@@ -91,24 +88,23 @@ class CableType(models.Model):
         return reverse('cable_type_detail', kwargs={'pk': self.pk})
 
 
-class AssetManager(models.Manager):
-    def search(self, query=None):
-        qs = self.get_queryset()
-        if query is not None:
-            or_lookup = (Q(asset_id__exact=query.upper()) | Q(description__icontains=query) | Q(serial_number__exact=query) | Q(nickname__icontains=query))
-            qs = qs.filter(or_lookup).distinct()  # distinct() is often necessary with Q lookups
-        return qs
-
-
 def get_available_asset_id(wanted_prefix=""):
-    last_asset = Asset.objects.filter(asset_id_prefix=wanted_prefix).last()
-    last_asset_id = last_asset.asset_id_number if last_asset else 0
-    return wanted_prefix + str(last_asset_id + 1)
-
-
-def validate_positive(value):
-    if value < 0:
-        raise ValidationError("A price cannot be negative")
+    sql = """
+    SELECT a.asset_id_number+1
+    FROM assets_asset a
+    LEFT OUTER JOIN assets_asset b ON
+        (a.asset_id_number + 1 = b.asset_id_number AND
+        a.asset_id_prefix = b.asset_id_prefix)
+    WHERE b.asset_id IS NULL AND a.asset_id_number >= %s AND a.asset_id_prefix = %s;
+    """
+    with connection.cursor() as cursor:
+        cursor.execute(sql, [9000, wanted_prefix])
+        row = cursor.fetchone()
+        if row is None or row[0] is None:
+            return 9000
+        else:
+            return row[0]
+        cursor.close()
 
 
 @reversion.register
@@ -120,13 +116,12 @@ class Asset(models.Model, RevisionMixin):
     category = models.ForeignKey(to=AssetCategory, on_delete=models.CASCADE)
     status = models.ForeignKey(to=AssetStatus, on_delete=models.CASCADE)
     serial_number = models.CharField(max_length=150, blank=True)
-    purchased_from = models.ForeignKey(to=Supplier, on_delete=models.SET_NULL, blank=True, null=True, related_name="assets")
+    purchased_from = models.ForeignKey(to=Supplier, on_delete=models.CASCADE, blank=True, null=True, related_name="assets")
     date_acquired = models.DateField()
     date_sold = models.DateField(blank=True, null=True)
-    purchase_price = models.DecimalField(blank=True, null=True, decimal_places=2, max_digits=10, validators=[validate_positive])
-    replacement_cost = models.DecimalField(null=True, decimal_places=2, max_digits=10, validators=[validate_positive])
+    purchase_price = models.DecimalField(blank=True, null=True, decimal_places=2, max_digits=10)
+    salvage_value = models.DecimalField(blank=True, null=True, decimal_places=2, max_digits=10)
     comments = models.TextField(blank=True)
-    nickname = models.CharField(max_length=120, blank=True)
 
     # Audit
     last_audited_at = models.DateTimeField(blank=True, null=True)
@@ -147,8 +142,6 @@ class Asset(models.Model, RevisionMixin):
 
     reversion_perm = 'assets.asset_finance'
 
-    objects = AssetManager()
-
     class Meta:
         ordering = ['asset_id_prefix', 'asset_id_number']
         permissions = [
@@ -172,6 +165,12 @@ class Asset(models.Model, RevisionMixin):
             errdict["asset_id"] = [
                 "An Asset ID can only consist of letters and numbers, with a final number"]
 
+        if self.purchase_price and self.purchase_price < 0:
+            errdict["purchase_price"] = ["A price cannot be negative"]
+
+        if self.salvage_value and self.salvage_value < 0:
+            errdict["salvage_value"] = ["A price cannot be negative"]
+
         if self.is_cable:
             if not self.length or self.length <= 0:
                 errdict["length"] = ["The length of a cable must be more than 0"]
@@ -190,7 +189,3 @@ class Asset(models.Model, RevisionMixin):
     @property
     def display_id(self):
         return str(self.asset_id)
-
-    @property
-    def name(self):
-        return f"{self.display_id} | {self.description}"

assets/templates/asset_audit.html

@@ -9,11 +9,9 @@
             date = new Date();
         }
         $('#id_date_acquired').val([date.getFullYear(), ('0' + (date.getMonth()+1)).slice(-2), ('0' + date.getDate()).slice(-2)].join('-'));
-        return false;
   }
   function setFieldValue(ID, CSA) {
       $('#' + String(ID)).val(CSA);
-      return false;
   }
   function checkIfCableHidden() {
     document.getElementById("cable-table").hidden = !document.getElementById("id_is_cable").checked;
@@ -41,16 +39,16 @@
   </div>
   <div class="form-group form-row">
     {% include 'partials/form_field.html' with field=form.date_acquired col="col-6" %}
-    <div class="col-sm-2">
-        <button class="btn btn-info" onclick="return setAcquired(true);" tabindex="-1">Today</button>
-        <button class="btn btn-warning" onclick="return setAcquired(false);" tabindex="-1">Unknown</button>
+    <div class="col-sm-4">
+        <button class="btn btn-info" onclick="setAcquired(true);" tabindex="-1">Today</button>
+        <button class="btn btn-warning" onclick="setAcquired(false);" tabindex="-1">Unknown</button>
     </div>
   </div>
   <div class="form-group form-row">
     {% include 'partials/form_field.html' with field=form.date_sold col="col-6" %}
   </div>
   <div class="form-group form-row">
-      {% include 'partials/form_field.html' with field=form.replacement_cost col="col-6" prepend="£" %}
+      {% include 'partials/form_field.html' with field=form.salvage_value col="col-6" prepend="£" %}
   </div>
   <hr>
   <div class="form-group form-row">
@@ -66,16 +64,16 @@
     <div class="form-group form-row">
       {% include 'partials/form_field.html' with field=form.length append=form.length.help_text col="col-6" %}
       <div class="col-4">
-        <button class="btn btn-danger" onclick="return setFieldValue('{{ form.length.id_for_label }}','5');" tabindex="-1" type="button">5{{ form.length.help_text }}</button>
-        <button class="btn btn-success" onclick="return setFieldValue('{{ form.length.id_for_label }}','10');" tabindex="-1" type="button">10{{ form.length.help_text }}</button>
-        <button class="btn btn-info" onclick="return setFieldValue('{{ form.length.id_for_label }}','20');" tabindex="-1" type="button">20{{ form.length.help_text }}</button>
+        <button class="btn btn-danger" onclick="setFieldValue('{{ form.length.id_for_label }}','5');" tabindex="-1" type="button">5{{ form.length.help_text }}</button>
+        <button class="btn btn-success" onclick="setFieldValue('{{ form.length.id_for_label }}','10');" tabindex="-1" type="button">10{{ form.length.help_text }}</button>
+        <button class="btn btn-info" onclick="setFieldValue('{{ form.length.id_for_label }}','20');" tabindex="-1" type="button">20{{ form.length.help_text }}</button>
       </div>
     </div>
     <div class="form-group form-row">
       {% include 'partials/form_field.html' with field=form.csa append=form.csa.help_text title='CSA' col="col-6" %}
       <div class="col-4">
-        <button class="btn btn-secondary" onclick="return setFieldValue('{{ form.csa.id_for_label }}', '1.5');" tabindex="-1" type="button">1.5{{ form.csa.help_text }}</button>
-        <button class="btn btn-secondary" onclick="return setFieldValue('{{ form.csa.id_for_label }}', '2.5');" tabindex="-1" type="button">2.5{{ form.csa.help_text }}</button>
+        <button class="btn btn-secondary" onclick="setFieldValue('{{ form.csa.id_for_label }}', '1.5');" tabindex="-1" type="button">1.5{{ form.csa.help_text }}</button>
+        <button class="btn btn-secondary" onclick="setFieldValue('{{ form.csa.id_for_label }}', '2.5');" tabindex="-1" type="button">2.5{{ form.csa.help_text }}</button>
       </div>
     </div>
   </div>

assets/templates/asset_form.html

@@ -5,13 +5,13 @@
 {% block css %}
     {{ block.super }}
     <link rel="stylesheet" href="{% static 'css/selects.css' %}"/>
-    <link rel="stylesheet" type="text/css" href="{% static 'css/easymde.min.css' %}">
+    <link rel="stylesheet" type="text/css" href="{% static 'css/simplemde.min.css' %}">
 {% endblock %}
 
 {% block preload_js %}
     {{ block.super }}
     <script src="{% static 'js/selects.js' %}"></script>
-    <script src="{% static 'js/easymde.min.js' %}"></script>
+    <script src="{% static 'js/simplemde.min.js' %}"></script>
     <script src="{% static 'js/interaction.js' %}"></script>
 {% endblock %}
 
@@ -31,8 +31,48 @@
         checkIfCableHidden();
     </script>
     <script>
-        $('document').ready(function(){
-            $(document).find(".selectpicker").selectpicker().each(function(){initPicker($(this))});
+    $('#parent_id')
+        .selectpicker({
+            liveSearch: true
+        })
+        .ajaxSelectPicker({
+            ajax: {
+                url: "{% url 'asset_search_json' %}",
+                type: "GET",
+                data: function () {
+                    let params = {
+                        {% verbatim %}query: '{{{q}}}'{% endverbatim  %}
+                    };
+                    return params;
+                }
+            },
+            locale: {
+                emptyTitle: 'Search for item...'
+            },
+            preprocessData: function(data){
+                var assets = [];
+                if(data.length){
+                    var len = data.length;
+                    for(var i = 0; i < len; i++){
+                        var curr = data[i];
+                        assets.push(
+                            {
+                                'value': curr.id,
+                                'text': curr.label,
+                                'disabled': false
+                            }
+                        );
+                    }
+                    assets.push(
+                    {
+                        'value': null,
+                        'text': "No parent"
+                    });
+                }
+
+                return assets;
+            },
+            preserveSelected: false
         });
     </script>
     <script>

assets/templates/asset_list.html

@@ -75,13 +75,13 @@
                 <div class="col">
                     <div id="category-group" class="form-group px-1" style="margin-bottom: 0;">
                         <label for="category" class="sr-only">Category</label>
-                        {% render_field form.category|attr:'multiple'|add_class:'selectpicker col-sm' data-none-selected-text="Categories" data-header="Categories" data-actions-box="true" %}
+                        {% render_field form.category|attr:'multiple'|add_class:'form-control custom-select selectpicker col-sm' data-none-selected-text="Categories" data-header="Categories" data-actions-box="true" %}
                     </div>
                 </div>
                 <div class="col">
                     <div id="status-group" class="form-group px-1" style="margin-bottom: 0;">
                         <label for="status" class="sr-only">Status</label>
-                        {% render_field form.status|attr:'multiple'|add_class:'selectpicker col-sm' data-none-selected-text="Statuses" data-header="Statuses" data-actions-box="true" %}
+                        {% render_field form.status|attr:'multiple'|add_class:'form-control custom-select selectpicker col-sm' data-none-selected-text="Statuses" data-header="Statuses" data-actions-box="true" %}
                     </div>
                 </div>
                 <div class="col mt-2">
@@ -121,7 +121,6 @@
 </button></span>{%endfor%}</p>
     </div>
 </div>
-<h3>{{ object_list.count }} assets</h3>
 <div class="row">
     <div class="col px-0">
     {% include 'partials/asset_list_table.html' %}

assets/templates/cable_list.html

@@ -1,162 +0,0 @@
-{% extends 'base_assets.html' %}
-{% load button from filters %}
-{% load ids_from_objects from asset_tags %}
-{% load widget_tweaks %}
-{% load static %}
-
-{% block css %}
-    {{ block.super }}
-    <link rel="stylesheet" href="{% static 'css/selects.css' %}"/>
-{% endblock %}
-
-{% block preload_js %}
-    {{ block.super }}
-    <script src="{% static 'js/selects.js' %}" async></script>
-{% endblock %}
-
-{% block js %}
-    {{ block.super }}
-    <script>
-        //Get querystring value
-        function getParameterByName(name) {
-            name = name.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]");
-            var regex = new RegExp("[\\?&]" + name + "=([^&#]*)"),
-            results = regex.exec(location.search);
-            return results === null ? "" : decodeURIComponent(results[1].replace(/\+/g, " "));
-        }
-        //Function used to remove querystring
-        function removeQString(key) {
-	        var urlValue=document.location.href;
-
-	        //Get query string value
-	        var searchUrl=location.search;
-
-	        if(key!=="") {
-		        oldValue = getParameterByName(key);
-		        removeVal=key+"="+oldValue;
-		        if(searchUrl.indexOf('?'+removeVal+'&')!== "-1") {
-			        urlValue=urlValue.replace('?'+removeVal+'&','?');
-		        }
-		        else if(searchUrl.indexOf('&'+removeVal+'&')!== "-1") {
-			        urlValue=urlValue.replace('&'+removeVal+'&','&');
-		        }
-		        else if(searchUrl.indexOf('?'+removeVal)!== "-1") {
-			        urlValue=urlValue.replace('?'+removeVal,'');
-		        }
-		        else if(searchUrl.indexOf('&'+removeVal)!== "-1") {
-			        urlValue=urlValue.replace('&'+removeVal,'');
-		        }
-	        }
-	        else {
-		        var searchUrl=location.search;
-		        urlValue=urlValue.replace(searchUrl,'');
-	        }
-	        history.pushState({state:1, rand: Math.random()}, '', urlValue);
-            window.location.reload(true);
-        }
-    </script>
-{% endblock %}
-
-{% block content %}
-<h3>{{ object_list.count }} cables with a total length of {{ total_length|default:"0" }}m</h3>
-<div class="row">
-    <div class="col px-0">
-        <form id="asset-search-form" method="GET">
-            <div class="form-row">
-                <div class="col">
-                    <div class="input-group px-1 mb-2 mb-sm-0 flex-nowrap">
-                        {% render_field form.q|add_class:'form-control' placeholder='Enter Asset ID/Desc/Serial' %}
-                        <label for="q" class="sr-only">Asset ID/Description/Serial Number:</label>
-                        <span class="input-group-append">{% button 'search' id="id_search" %}</span>
-                    </div>
-                </div>
-            </div>
-            <div class="form-row mt-2">
-                <div class="col">
-                    <div id="category-group" class="form-group px-1">
-                        <label for="category" class="sr-only">Category</label>
-                        {% render_field form.category|attr:'multiple'|add_class:'selectpicker col-sm pl-0' data-none-selected-text="Categories" data-header="Categories" data-actions-box="true" %}
-                    </div>
-                </div>
-                <div class="col">
-                    <div id="status-group" class="form-group px-1">
-                        <label for="status" class="sr-only">Status</label>
-                        {% render_field form.status|attr:'multiple'|add_class:'selectpicker col-sm' data-none-selected-text="Statuses" data-header="Statuses" data-actions-box="true" %}
-                    </div>
-                </div>
-                <div class="col">
-                    <div class="form-group d-flex flex-nowrap">
-                      <label for="cable_type" class="sr-only">Cable Type</label>
-                      {% render_field form.cable_type|attr:'multiple'|add_class:'selectpicker col-sm' data-none-selected-text="Cable Type" data-header="Cable Type" data-actions-box="true" %}
-                    </div>
-                </div>
-                <div class="col-auto">
-                    <div class="form-group d-flex flex-nowrap">
-                        <label for="date_acquired" class="text-nowrap mt-auto">Date Acquired</label>
-                        {% render_field form.date_acquired|add_class:'form-control mx-2' %}
-                    </div>
-                </div>
-                <div class="col-auto mr-auto">
-                      <button id="filter-submit" type="submit" class="btn btn-secondary" style="width: 6em">Filter</button>
-                </div>
-            </div>
-        </form>
-    </div>
-</div>
-<div class="row my-2">
-    <div class="col text-right px-0">
-    {% button 'new' 'asset_create' style="width: 6em" %}
-    {% if object_list %}
-    <a class="btn btn-primary" href="{% url 'generate_labels' object_list|ids_from_objects %}"><span class="fas fa-barcode"></span> Generate Labels</a>
-    {% endif %}
-    </div>
-</div>
-<div class="row my-2">
-    <div class="col bg-dark text-white rounded pt-3">
-        {# TODO Gotta be a cleaner way to do this... #}
-        <p><span class="ml-2">Active Filters: </span> {% for filter in category_filters %}<span class="badge badge-info mx-1 ">{{filter}}<button type="button" class="btn btn-link p-0 ml-1 align-baseline">
-  <span aria-hidden="true" class="fas fa-times" onclick="removeQString('category', '{{filter.id}}')"></span>
-</button></span>{%endfor%}{% for filter in status_filters %}<span class="badge badge-info mx-1 ">{{filter}}<button type="button" class="btn btn-link p-0 ml-1 align-baseline">
-  <span aria-hidden="true" class="fas fa-times" onclick="removeQString('status', '{{filter.id}}')"></span>
-</button></span>{%endfor%}</p>
-    </div>
-</div>
-<div class="row">
-    <div class="col px-0">
-<div class="table-responsive">
-    <table class="table">
-      <thead class="thead-dark">
-        <tr>
-          <th scope="col">Asset ID</th>
-          <th scope="col">Description</th>
-          <th scope="col">Category</th>
-          <th scope="col">Status</th>
-          <th scope="col">Length</th>
-          <th scope="col">Cable Type</th>
-          <th scope="col" class="d-none d-sm-table-cell">Quick Links</th>
-        </tr>
-      </thead>
-      <tbody id="asset_table_body">
-        {% for item in object_list %}
-            <tr class="table-{{ item.status.display_class|default:'' }} assetRow">
-                <th scope="row" class="align-middle"><a class="assetID" href="{% url 'asset_detail' item.asset_id %}">{{ item.asset_id }}</a></th>
-                <td class="assetDesc"><span class="text-truncate d-inline-block align-middle">{{ item.description }}</span></td>
-                <td class="assetCategory align-middle">{{ item.category }}</td>
-                <td class="assetStatus align-middle">{{ item.status }}</td>
-                <td style="background-color:{% if item.length == 20.0 %}#304486{% elif item.length == 10.0 %}green{%elif item.length == 5.0 %}red{% endif %} !important;">{{ item.length }}m</td>
-                <td>{{ item.cable_type }}</td>
-                <td class="d-none d-sm-table-cell">
-                    {% include 'partials/asset_list_buttons.html' %}
-                </td>
-            </tr>
-            {% empty %}
-            <tr>
-                <td colspan="6">Nothing found</td>
-            </tr>
-        {% endfor %}
-        </tbody>
-    </table>
-</div>
-    </div>
-</div>
-{% endblock %}

assets/templates/labels_print.xml

@@ -12,18 +12,22 @@
     </template>
     <stylesheet>
         <blockTableStyle id="table">
+        <!-- show a grid: this also comes in handy for debugging your tables.-->
+        <lineStyle kind="GRID" colorName="black" thickness="1" start="0,0" stop="-1,-1" />
         </blockTableStyle>
     </stylesheet>
     <story>
         <blockTable style="table">
             {% for i in images0 %}
             <tr>
-                <td>{% with images0|index:forloop.counter0 as image %}{% if image %}<illustration width="180" height="55" borderStrokeWidth="1"
-borderStrokeColor="black"><image file="data:image/png;base64,{{image.1}}" x="0" y="0"
-{% if image.0.csa >= 4 %}width="180" height="55"{% else %}width="130" height="38"{%endif%}/></illustration>{% endif %}{% endwith %}</td>
-                <td>{% with images1|index:forloop.counter0 as image %}{% if image %}<illustration width="180" height="55"><image file="data:image/png;base64,{{image.1}}" x="0" y="0"
-{% if image.0.csa >= 4 %}width="180" height="55"{% else %}width="130" height="38"{%endif%}/></illustration>{% endif %}{% endwith %}</td>
-                <td>{% with images2|index:forloop.counter0 as image %}{% if image %}<illustration width="180" height="55"><image file="data:image/png;base64,{{image.1}}" x="0" y="0" {% if image.0.csa >= 4 %}width="180" height="55"{% else %}width="130" height="38"{%endif%}/></illustration>{% endif %}{% endwith %}</td>
+                <td>{% with images0|index:forloop.counter0 as image %}{% if image %}<illustration width="120" height="35"><image file="data:image/png;base64,{{image}}" x="0" y="0"
+width="120" height="35"/></illustration>{% endif %}{% endwith %}</td>
+                <td>{% with images1|index:forloop.counter0 as image %}{% if image %}<illustration width="120" height="35"><image file="data:image/png;base64,{{image}}" x="0" y="0"
+width="120" height="35"/></illustration>{% endif %}{% endwith %}</td>
+                <td>{% with images2|index:forloop.counter0 as image %}{% if image %}<illustration width="120" height="35"><image file="data:image/png;base64,{{image}}" x="0" y="0"
+width="120" height="35"/></illustration>{% endif %}{% endwith %}</td>
+                <td>{% with images3|index:forloop.counter0 as image %}{% if image %}<illustration width="120" height="35"><image file="data:image/png;base64,{{image}}" x="0" y="0"
+width="120" height="35"/></illustration>{% endif %}{% endwith %}</td>
             </tr>
             {% endfor %}
         </blockTable>

assets/templates/partials/asset_detail_form.html

@@ -21,10 +21,6 @@
       <label for="{{ form.description.id_for_label }}">Description</label>
       {% render_field form.description|add_class:'form-control' value=object.description %}
     </div>
-    <div class="form-group">
-      <label for="{{ form.nickname.id_for_label }}">Nickname</label>
-      {% render_field form.nickname|add_class:'form-control' value=object.nickname %}
-    </div>
     <div class="form-group">
       <label for="{{ form.category.id_for_label }}" >Category</label>
       {% render_field form.category|add_class:'form-control'%}
@@ -49,10 +45,7 @@
     {% else %}
     <dt>Asset ID</dt>
     <dd>{{ object.asset_id }}</dd>
-    {% if object.nickname %}
-    <dt>Nickname</dt>
-    <dd>"{{ object.nickname }}"</dd>
-    {% endif %}
+
     <dt>Description</dt>
     <dd>{{ object.description }}</dd>
 

assets/templates/partials/asset_list_buttons.html

@@ -1,14 +0,0 @@
-{% load button from filters %}
-{% if audit %}
-<a type="button" class="btn btn-info btn-sm modal-href" href="{% url 'asset_audit' item.asset_id %}"><i class="fas fa-certificate"></i> Audit</a>
-{% else %}
-<div class="btn-group" role="group">
-    {% button 'view' url='asset_detail' pk=item.asset_id clazz="btn-sm" %}
-    {% if perms.assets.change_asset %}
-        {% button 'edit' url='asset_update' pk=item.asset_id clazz="btn-sm" %}
-    {% endif %}
-    {% if perms.assets.add_asset %}
-        {% button 'duplicate' url='asset_duplicate' pk=item.asset_id clazz="btn-sm" %}
-    {% endif %}
-</div>
-{% endif %}

assets/templates/partials/asset_list_table.html

@@ -18,7 +18,19 @@
                 <td class="assetCategory align-middle">{{ item.category }}</td>
                 <td class="assetStatus align-middle">{{ item.status }}</td>
                 <td class="d-none d-sm-table-cell">
-                    {% include 'partials/asset_list_buttons.html' %}
+                    {% if audit %}
+                    <a type="button" class="btn btn-info btn-sm modal-href" href="{% url 'asset_audit' item.asset_id %}"><i class="fas fa-certificate"></i> Audit</a>
+                    {% else %}
+                    <div class="btn-group" role="group">
+                        {% button 'view' url='asset_detail' pk=item.asset_id clazz="btn-sm" %}
+                        {% if perms.assets.change_asset %}
+                            {% button 'edit' url='asset_update' pk=item.asset_id clazz="btn-sm" %}
+                        {% endif %}
+                        {% if perms.assets.add_asset %}
+                            {% button 'duplicate' url='asset_duplicate' pk=item.asset_id clazz="btn-sm" %}
+                        {% endif %}
+                    </div>
+                    {% endif %}
                 </td>
             </tr>
             {% empty %}

assets/templates/partials/form_field.html

@@ -1,7 +1,7 @@
 {% load widget_tweaks %}
 {% load title_spaced from filters %}
 {% spaceless %}
-<label for="{{ field.id_for_label }}" {% if col %}class="col-4 col-form-label"{% endif %}>{% if title %}{{ title }}{%else%}{{field.name|title_spaced}}{%endif%}</label>
+<label for="{{ field.id_for_label }}" {% if col %}class="col-2 col-form-label"{% endif %}>{% if title %}{{ title }}{%else%}{{field.name|title_spaced}}{%endif%}</label>
 {% if append or prepend %}
 <div class="input-group {{col}}">
   {% if prepend %}

assets/templates/partials/parent_form.html

@@ -7,7 +7,7 @@
     {% if create or edit or duplicate %}
     <div class="form-group" id="parent-group">
       <label for="selectpicker">Set Parent</label>
-      <select name="parent" id="parent_id" class="selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='asset' %}?fields=asset_id,description">
+      <select name="parent" id="parent_id" class="form-control selectpicker" data-live-search="true">
         {% if object.parent %}
         <option value="{{object.parent.pk}}" selected>{{object.parent.description}}</option>
         {% endif %}

assets/templates/partials/purchasedetails_form.html

@@ -10,7 +10,7 @@
       <label for="{{ form.purchased_from.id_for_label }}">Supplier</label>
       <div class="row">
           <div class="col">
-              <select id="{{ form.purchased_from.id_for_label }}" name="{{ form.purchased_from.name }}" class="selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='supplier' %}">
+              <select id="{{ form.purchased_from.id_for_label }}" name="{{ form.purchased_from.name }}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='supplier' %}">
                 {% if object.purchased_from %}
                 <option value="{{form.purchased_from.value}}" selected="selected" data-update_url="{% url 'supplier_update' form.purchased_from.value %}">{{ object.purchased_from }}</option>
                 {% endif %}
@@ -39,10 +39,10 @@
     </div>
 
     <div class="form-group">
-      <label for="{{ form.salvage_value.id_for_label }}">Replacement Cost</label>
+      <label for="{{ form.salvage_value.id_for_label }}">Salvage Value</label>
       <div class="input-group">
         <div class="input-group-prepend"><span class="input-group-text">£</span></div>
-        {% render_field form.replacement_cost|add_class:'form-control' value=object.replacement_cost %}
+        {% render_field form.salvage_value|add_class:'form-control' value=object.salvage_value %}
       </div>
     </div>
 
@@ -70,8 +70,8 @@
         <dd>{% if object.purchased_from %}<a href="{{object.purchased_from.get_absolute_url}}">{{ object.purchased_from }}</a>{%else%}-{%endif%}</dd>
         <dt>Purchase Price</dt>
         <dd>£{{ object.purchase_price|default_if_none:'-' }}</dd>
-        <dt>Replacement Cost</dt>
-        <dd>£{{ object.replacement_cost|default_if_none:'-' }}</dd>
+        <dt>Salvage Value</dt>
+        <dd>£{{ object.salvage_value|default_if_none:'-' }}</dd>
         <dt>Date Acquired</dt>
         <dd>{{ object.date_acquired|default_if_none:'-' }}</dd>
         {% if object.date_sold %}

assets/tests/conftest.py

@@ -18,23 +18,18 @@ def status(db):
 
 
 @pytest.fixture
-def cable_type(db):
+def test_cable(db, category, status):
     connector = models.Connector.objects.create(description="16A IEC", current_rating=16, voltage_rating=240, num_pins=3)
     cable_type = models.CableType.objects.create(circuits=11, cores=3, plug=connector, socket=connector)
-    yield cable_type
+    cable = models.Asset.objects.create(asset_id="9666", description="125A -> Jack", comments="The cable from Hell...", status=status, category=category, date_acquired=datetime.date(2006, 6, 6), is_cable=True, cable_type=cable_type, length=10, csa="1.5")
+    yield cable
     connector.delete()
     cable_type.delete()
-
-
-@pytest.fixture
-def test_cable(db, category, status, cable_type):
-    cable = models.Asset.objects.create(asset_id="9666", description="125A -> Jack", comments="The cable from Hell...", status=status, category=category, date_acquired=datetime.date(2006, 6, 6), is_cable=True, cable_type=cable_type, length=10, csa="1.5", replacement_cost=50)
-    yield cable
     cable.delete()
 
 
 @pytest.fixture
 def test_asset(db, category, status):
-    asset, created = models.Asset.objects.get_or_create(asset_id="91991", description="Spaceflower", status=status, category=category, date_acquired=datetime.date(1991, 12, 26), replacement_cost=100)
+    asset, created = models.Asset.objects.get_or_create(asset_id="91991", description="Spaceflower", status=status, category=category, date_acquired=datetime.date(1991, 12, 26))
     yield asset
     asset.delete()

assets/tests/pages.py

@@ -79,7 +79,7 @@ class AssetForm(FormPage):
         'serial_number': (regions.TextBox, (By.ID, 'id_serial_number')),
         'comments': (regions.SimpleMDETextArea, (By.ID, 'id_comments')),
         'purchase_price': (regions.TextBox, (By.ID, 'id_purchase_price')),
-        'replacement_cost': (regions.TextBox, (By.ID, 'id_replacement_cost')),
+        'salvage_value': (regions.TextBox, (By.ID, 'id_salvage_value')),
         'date_acquired': (regions.DatePicker, (By.ID, 'id_date_acquired')),
         'date_sold': (regions.DatePicker, (By.ID, 'id_date_sold')),
         'category': (regions.SingleSelectPicker, (By.ID, 'id_category')),
@@ -221,7 +221,7 @@ class AssetAuditList(AssetList):
             'description': (regions.TextBox, (By.ID, 'id_description')),
             'is_cable': (regions.CheckBox, (By.ID, 'id_is_cable')),
             'serial_number': (regions.TextBox, (By.ID, 'id_serial_number')),
-            'replacement_cost': (regions.TextBox, (By.ID, 'id_replacement_cost')),
+            'salvage_value': (regions.TextBox, (By.ID, 'id_salvage_value')),
             'date_acquired': (regions.DatePicker, (By.ID, 'id_date_acquired')),
             'category': (regions.SingleSelectPicker, (By.ID, 'id_category')),
             'status': (regions.SingleSelectPicker, (By.ID, 'id_status')),

assets/tests/test_interaction.py

@@ -1,4 +1,3 @@
-import time
 import datetime
 
 from django.utils import timezone
@@ -94,55 +93,6 @@ class TestAssetList(AutoLoginTest):
         self.assertEqual("10", asset_ids[1])
 
 
-def test_cable_create(logged_in_browser, admin_user, live_server, test_asset, category, status, cable_type):
-    page = pages.AssetCreate(logged_in_browser.driver, live_server.url).open()
-    wait = WebDriverWait(logged_in_browser.driver, 20)
-    page.description = str(cable_type)
-    page.category = category.name
-    page.status = status.name
-    page.serial_number = "MELON-MELON-MELON"
-    page.comments = "You might need that"
-    page.replacement_cost = "666"
-    page.is_cable = True
-
-    assert logged_in_browser.driver.find_element(By.ID, 'cable-table').is_displayed()
-    wait.until(animation_is_finished())
-    page.cable_type = str(cable_type)
-    page.length = 10
-    page.csa = "1.5"
-
-    page.submit()
-    assert page.success
-
-
-def test_asset_edit(logged_in_browser, admin_user, live_server, test_asset):
-    page = pages.AssetEdit(logged_in_browser.driver, live_server.url, asset_id=test_asset.asset_id).open()
-
-    assert logged_in_browser.driver.find_element(By.ID, 'id_asset_id').get_attribute('readonly') is not None
-
-    new_description = "Big Shelf"
-    page.description = new_description
-
-    page.submit()
-    assert page.success
-
-    assert models.Asset.objects.get(asset_id=test_asset.asset_id).description == new_description
-
-
-def test_asset_duplicate(logged_in_browser, admin_user, live_server, test_asset):
-    page = pages.AssetDuplicate(logged_in_browser.driver, live_server.url, asset_id=test_asset.asset_id).open()
-
-    assert test_asset.asset_id != page.asset_id
-    assert test_asset.description == page.description
-    assert test_asset.status.name == page.status
-    assert test_asset.category.name == page.category
-    assert test_asset.date_acquired == page.date_acquired.date()
-
-    page.submit()
-    assert page.success
-    assert models.Asset.objects.last().description == test_asset.description
-
-
 @screenshot_failure_cls
 class TestAssetForm(AutoLoginTest):
     def setUp(self):
@@ -179,7 +129,7 @@ class TestAssetForm(AutoLoginTest):
         self.page.comments = comments = "This is actually a sledgehammer, not a cable..."
 
         self.page.purchase_price = "12.99"
-        self.page.replacement_cost = "99.12"
+        self.page.salvage_value = "99.12"
         self.page.date_acquired = acquired = datetime.date(2020, 5, 2)
         self.page.purchased_from_selector.toggle()
         self.assertTrue(self.page.purchased_from_selector.is_open)
@@ -188,14 +138,14 @@ class TestAssetForm(AutoLoginTest):
 
         self.page.parent_selector.toggle()
         self.assertTrue(self.page.parent_selector.is_open)
-        option = self.parent.asset_id
+        option = str(self.parent)
         self.page.parent_selector.search(option)
-        time.sleep(2)  # Slow down for javascript
-        # self.page.parent_selector.set_option(option, True)
-        # self.assertTrue(self.page.parent_selector.options[0].selected)
+        self.driver.implicitly_wait(1)
+        self.page.parent_selector.set_option(option, True)
+        self.assertTrue(self.page.parent_selector.options[0].selected)
         self.page.parent_selector.toggle()
 
-        self.assertFalse(self.driver.find_element(By.ID, 'cable-table').is_displayed())
+        self.assertFalse(self.driver.find_element_by_id('cable-table').is_displayed())
 
         self.page.submit()
         self.assertTrue(self.page.success)
@@ -209,6 +159,50 @@ class TestAssetForm(AutoLoginTest):
         # This one is important as it defaults to today's date
         self.assertEqual(asset.date_acquired, acquired)
 
+    def test_cable_create(self):
+        self.page.description = "IEC -> IEC"
+        self.page.category = "Health & Safety"
+        self.page.status = "O.K."
+        self.page.serial_number = "MELON-MELON-MELON"
+        self.page.comments = "You might need that"
+        self.page.is_cable = True
+
+        self.assertTrue(self.driver.find_element_by_id('cable-table').is_displayed())
+        self.wait.until(animation_is_finished())
+        self.page.cable_type = "IEC → IEC"
+        self.page.socket = "IEC"
+        self.page.length = 10
+        self.page.csa = "1.5"
+
+        self.page.submit()
+        self.assertTrue(self.page.success)
+
+    def test_asset_edit(self):
+        self.page = pages.AssetEdit(self.driver, self.live_server_url, asset_id=self.parent.asset_id).open()
+
+        self.assertIsNotNone(self.driver.find_element_by_id('id_asset_id').get_attribute('readonly'))
+
+        new_description = "Big Shelf"
+        self.page.description = new_description
+
+        self.page.submit()
+        self.assertTrue(self.page.success)
+
+        self.assertEqual(models.Asset.objects.get(asset_id=self.parent.asset_id).description, new_description)
+
+    def test_asset_duplicate(self):
+        self.page = pages.AssetDuplicate(self.driver, self.live_server_url, asset_id=self.parent.asset_id).open()
+
+        self.assertNotEqual(self.parent.asset_id, self.page.asset_id)
+        self.assertEqual(self.parent.description, self.page.description)
+        self.assertEqual(self.parent.status.name, self.page.status)
+        self.assertEqual(self.parent.category.name, self.page.category)
+        self.assertEqual(self.parent.date_acquired, self.page.date_acquired.date())
+
+        self.page.submit()
+        self.assertTrue(self.page.success)
+        self.assertEqual(models.Asset.objects.last().description, self.parent.description)
+
 
 @screenshot_failure_cls
 class TestSupplierList(AutoLoginTest):
@@ -288,28 +282,6 @@ def test_audit_search(logged_in_browser, live_server, test_asset):
     assert logged_in_browser.is_text_present("Asset with that ID does not exist!")
 
 
-def test_audit_success(logged_in_browser, admin_user, live_server, test_asset):
-    page = pages.AssetAuditList(logged_in_browser.driver, live_server.url).open()
-    wait = WebDriverWait(logged_in_browser.driver, 20)
-    page.set_query(test_asset.asset_id)
-    page.search()
-    wait.until(ec.visibility_of_element_located((By.ID, 'modal')))
-    # Now do it properly
-    page.modal.description = new_desc = "A BIG hammer"
-    page.modal.submit()
-    logged_in_browser.driver.implicitly_wait(4)
-    wait.until(animation_is_finished())
-    submit_time = timezone.now()
-    # Check data is correct
-    test_asset.refresh_from_db()
-    assert test_asset.description in new_desc
-    # Make sure audit 'log' was filled out
-    assert admin_user.initials == test_asset.last_audited_by.initials
-    assert_times_almost_equal(submit_time, test_asset.last_audited_at)
-    # Check we've removed it from the 'needing audit' list
-    assert test_asset.asset_id not in page.assets
-
-
 @screenshot_failure_cls
 class TestAssetAudit(AutoLoginTest):
     def setUp(self):
@@ -320,14 +292,14 @@ class TestAssetAudit(AutoLoginTest):
         self.connector = models.Connector.objects.create(description="Trailer Socket", current_rating=1,
                                                          voltage_rating=40, num_pins=13)
         models.Asset.objects.create(asset_id="1", description="Trailer Cable", status=self.status,
-                                    category=self.category, date_acquired=datetime.date(2020, 2, 1), replacement_cost=10)
+                                    category=self.category, date_acquired=datetime.date(2020, 2, 1))
         models.Asset.objects.create(asset_id="11", description="Trailerboard", status=self.status,
-                                    category=self.category, date_acquired=datetime.date(2020, 2, 1), replacement_cost=10)
+                                    category=self.category, date_acquired=datetime.date(2020, 2, 1))
         models.Asset.objects.create(asset_id="111", description="Erms", status=self.status, category=self.category,
-                                    date_acquired=datetime.date(2020, 2, 1), replacement_cost=10)
+                                    date_acquired=datetime.date(2020, 2, 1))
         self.asset = models.Asset.objects.create(asset_id="1111", description="A hammer", status=self.status,
                                                  category=self.category,
-                                                 date_acquired=datetime.date(2020, 2, 1), replacement_cost=10)
+                                                 date_acquired=datetime.date(2020, 2, 1))
         self.page = pages.AssetAuditList(self.driver, self.live_server_url).open()
         self.wait = WebDriverWait(self.driver, 20)
 
@@ -343,6 +315,25 @@ class TestAssetAudit(AutoLoginTest):
         self.driver.implicitly_wait(4)
         self.assertIn("This field is required.", self.page.modal.errors["Description"])
 
+    def test_audit_success(self):
+        self.page.set_query(self.asset.asset_id)
+        self.page.search()
+        self.wait.until(ec.visibility_of_element_located((By.ID, 'modal')))
+        # Now do it properly
+        self.page.modal.description = new_desc = "A BIG hammer"
+        self.page.modal.submit()
+        self.driver.implicitly_wait(4)
+        self.wait.until(animation_is_finished())
+        submit_time = timezone.now()
+        # Check data is correct
+        self.asset.refresh_from_db()
+        self.assertEqual(self.asset.description, new_desc)
+        # Make sure audit 'log' was filled out
+        self.assertEqual(self.profile.initials, self.asset.last_audited_by.initials)
+        assert_times_almost_equal(submit_time, self.asset.last_audited_at)
+        # Check we've removed it from the 'needing audit' list
+        self.assertNotIn(self.asset.asset_id, self.page.assets)
+
     def test_audit_list(self):
         self.assertEqual(models.Asset.objects.filter(last_audited_at=None).count(), len(self.page.assets))
         asset_row = self.page.assets[0]
@@ -350,7 +341,7 @@ class TestAssetAudit(AutoLoginTest):
         self.wait.until(ec.visibility_of_element_located((By.ID, 'modal')))
         self.assertEqual(self.page.modal.asset_id, asset_row.id)
         self.page.modal.close()
-        self.assertFalse(self.driver.find_element(By.ID, 'modal').is_displayed())
+        self.assertFalse(self.driver.find_element_by_id('modal').is_displayed())
         # Make sure audit log was NOT filled out
         audited = models.Asset.objects.get(asset_id=asset_row.id)
         assert audited.last_audited_by is None

assets/tests/test_unit.py

@@ -84,7 +84,7 @@ def test_oembed(client, test_asset):
 
 
 def test_asset_create(admin_client):
-    response = admin_client.post(reverse('asset_create'), {'date_sold': '2000-01-01', 'date_acquired': '2020-01-01', 'purchase_price': '-30', 'replacement_cost': '-30'})
+    response = admin_client.post(reverse('asset_create'), {'date_sold': '2000-01-01', 'date_acquired': '2020-01-01', 'purchase_price': '-30', 'salvage_value': '-30'})
     assertFormError(response, 'form', 'asset_id', 'This field is required.')
     assert_asset_form_errors(response)
 
@@ -99,7 +99,7 @@ def test_cable_create(admin_client):
 
 def test_asset_edit(admin_client, test_asset):
     url = reverse('asset_update', kwargs={'pk': test_asset.asset_id})
-    response = admin_client.post(url, {'date_sold': '2000-12-01', 'date_acquired': '2020-12-01', 'purchase_price': '-50', 'replacement_cost': '-50', 'description': "", 'status': "", 'category': ""})
+    response = admin_client.post(url, {'date_sold': '2000-12-01', 'date_acquired': '2020-12-01', 'purchase_price': '-50', 'salvage_value': '-50', 'description': "", 'status': "", 'category': ""})
     assert_asset_form_errors(response)
 
 
@@ -127,4 +127,4 @@ def assert_asset_form_errors(response):
     assertFormError(response, 'form', 'category', 'This field is required.')
     assertFormError(response, 'form', 'date_sold', 'Cannot sell an item before it is acquired')
     assertFormError(response, 'form', 'purchase_price', 'A price cannot be negative')
-    assertFormError(response, 'form', 'replacement_cost', 'A price cannot be negative')
+    assertFormError(response, 'form', 'salvage_value', 'A price cannot be negative')

assets/urls.py

@@ -20,14 +20,14 @@ urlpatterns = [
     path('asset/id/<asset:pk>/duplicate/', permission_required_with_403('assets.add_asset')
          (views.AssetDuplicate.as_view()), name='asset_duplicate'),
     path('asset/id/<asset:pk>/label', login_required(views.GenerateLabel.as_view()), name='generate_label'),
-    path('asset/<list:ids>/list/label', views.GenerateLabels.as_view(), name='generate_labels'),
+    path('asset/<list:ids>/list/label',  views.GenerateLabels.as_view(), name='generate_labels'),
 
-    path('cables/list/', login_required(views.CableList.as_view()), name='cable_list'),
     path('cabletype/list/', login_required(views.CableTypeList.as_view()), name='cable_type_list'),
     path('cabletype/create/', permission_required_with_403('assets.add_cable_type')(views.CableTypeCreate.as_view()), name='cable_type_create'),
     path('cabletype/<int:pk>/update/', permission_required_with_403('assets.change_cable_type')(views.CableTypeUpdate.as_view()), name='cable_type_update'),
     path('cabletype/<int:pk>/detail/', login_required(views.CableTypeDetail.as_view()), name='cable_type_detail'),
 
+    path('asset/search/', login_required(views.AssetSearch.as_view()), name='asset_search_json'),
     path('asset/id/<str:pk>/embed/',
          xframe_options_exempt(
              login_required(login_url='/user/login/embed/')(views.AssetEmbed.as_view())),
@@ -43,4 +43,6 @@ urlpatterns = [
          (views.SupplierCreate.as_view()), name='supplier_create'),
     path('supplier/<int:pk>/edit/', permission_required_with_403('assets.change_supplier')
          (views.SupplierUpdate.as_view()), name='supplier_update'),
+
+    path('supplier/search/', login_required(views.SupplierSearch.as_view()), name='supplier_search_json'),
 ]

assets/views.py

@@ -6,7 +6,7 @@ from io import BytesIO
 from django.contrib import messages
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.core import serializers
-from django.db.models import Q, Sum
+from django.db.models import Q
 from django.http import Http404, HttpResponse, JsonResponse
 from django.urls import reverse, reverse_lazy
 from django.utils import timezone
@@ -17,7 +17,7 @@ from django.shortcuts import get_object_or_404
 from django.template.loader import get_template
 
 from PyPDF2 import PdfFileMerger, PdfFileReader
-from PIL import Image, ImageDraw, ImageFont, ImageOps
+from PIL import Image, ImageDraw, ImageFont
 from barcode import Code39
 from barcode.writer import ImageWriter
 from z3c.rml import rml2pdf
@@ -25,12 +25,14 @@ from z3c.rml import rml2pdf
 from PyRIGS.views import GenericListView, GenericDetailView, GenericUpdateView, GenericCreateView, ModalURLMixin, \
     is_ajax, OEmbedView
 from assets import forms, models
+from assets.models import get_available_asset_id
 
 
 class AssetList(LoginRequiredMixin, generic.ListView):
     model = models.Asset
     template_name = 'asset_list.html'
     paginate_by = 40
+    ordering = ['-pk']
     hide_hidden_status = True
 
     def get_initial(self):
@@ -48,7 +50,13 @@ class AssetList(LoginRequiredMixin, generic.ListView):
 
         # TODO Feedback to user when search fails
         query_string = form.cleaned_data['q'] or ""
-        queryset = models.Asset.objects.search(query=query_string)
+        if len(query_string) == 0:
+            queryset = self.model.objects.all()
+        elif len(query_string) >= 3:
+            queryset = self.model.objects.filter(
+                Q(asset_id__exact=query_string.upper()) | Q(description__icontains=query_string) | Q(serial_number__exact=query_string))
+        else:
+            queryset = self.model.objects.filter(Q(asset_id__exact=query_string.upper()))
 
         if form.cleaned_data['is_cable']:
             queryset = queryset.filter(is_cable=True)
@@ -79,29 +87,28 @@ class AssetList(LoginRequiredMixin, generic.ListView):
         return context
 
 
-class CableList(AssetList):
-    template_name = 'cable_list.html'
-    paginator = None
+class AssetSearch(AssetList):
+    hide_hidden_status = False
 
-    def get_queryset(self):
-        queryset = super().get_queryset().filter(is_cable=True)
+    def render_to_response(self, context, **response_kwargs):
+        result = []
 
-        if self.form.cleaned_data['cable_type']:
-            queryset = queryset.filter(cable_type__in=self.form.cleaned_data['cable_type'])
+        for asset in context["object_list"]:
+            result.append({"id": asset.pk, "label": (asset.asset_id + " | " + asset.description)})
 
-        return queryset
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        context["page_title"] = "Cable List"
-        context["total_length"] = self.get_queryset().aggregate(Sum('length'))['length__sum']
-        return context
+        return JsonResponse(result, safe=False)
 
 
 class AssetIDUrlMixin:
     def get_object(self, queryset=None):
         pk = self.kwargs.get(self.pk_url_kwarg)
-        return get_object_or_404(models.Asset, asset_id=pk)
+        queryset = models.Asset.objects.filter(asset_id=pk)
+        try:
+            # Get the single item from the filtered queryset
+            obj = queryset.get()
+        except queryset.model.DoesNotExist:
+            raise Http404("No assets found matching the query")
+        return obj
 
 
 class AssetDetail(LoginRequiredMixin, AssetIDUrlMixin, generic.DetailView):
@@ -151,7 +158,7 @@ class AssetCreate(LoginRequiredMixin, generic.CreateView):
 
     def get_initial(self, *args, **kwargs):
         initial = super().get_initial(*args, **kwargs)
-        initial["asset_id"] = models.get_available_asset_id()
+        initial["asset_id"] = get_available_asset_id()
         return initial
 
     def get_success_url(self):
@@ -166,11 +173,6 @@ class DuplicateMixin:
 
 
 class AssetDuplicate(DuplicateMixin, AssetIDUrlMixin, AssetCreate):
-    def get_initial(self, *args, **kwargs):
-        initial = super().get_initial(*args, **kwargs)
-        initial["asset_id"] = models.get_available_asset_id()
-        return initial
-
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context["create"] = None
@@ -192,7 +194,7 @@ class AssetOEmbed(OEmbedView):
 
 class AssetAuditList(AssetList):
     template_name = 'asset_audit_list.html'
-    hide_hidden_status = True
+    hide_hidden_status = False
 
     # TODO Refresh this when the modal is submitted
     def get_queryset(self):
@@ -240,6 +242,17 @@ class SupplierList(GenericListView):
         return context
 
 
+class SupplierSearch(SupplierList):
+    hide_hidden_status = False
+
+    def render_to_response(self, context, **response_kwargs):
+        result = []
+
+        for supplier in context["object_list"]:
+            result.append({"id": supplier.pk, "name": supplier.name})
+        return JsonResponse(result, safe=False)
+
+
 class SupplierDetail(GenericDetailView):
     model = models.Supplier
 
@@ -279,7 +292,7 @@ class SupplierUpdate(GenericUpdateView, ModalURLMixin):
     form_class = forms.SupplierForm
 
     def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
+        context = super(SupplierUpdate, self).get_context_data(**kwargs)
         if is_ajax(self.request):
             context['override'] = "base_ajax.html"
         else:
@@ -323,6 +336,7 @@ class CableTypeCreate(generic.CreateView):
         context = super().get_context_data(**kwargs)
         context["create"] = True
         context["page_title"] = "Create Cable Type"
+
         return context
 
     def get_success_url(self):
@@ -338,6 +352,7 @@ class CableTypeUpdate(generic.UpdateView):
         context = super().get_context_data(**kwargs)
         context["edit"] = True
         context["page_title"] = f"Edit Cable Type {self.object}"
+
         return context
 
     def get_success_url(self):
@@ -348,9 +363,7 @@ def generate_label(pk):
     black = (0, 0, 0)
     white = (255, 255, 255)
     size = (700, 200)
-    font_size = 22
-    font = ImageFont.truetype("static/fonts/OpenSans-Regular.tff", font_size)
-    heavy_font = ImageFont.truetype("static/fonts/OpenSans-Bold.tff", font_size + 13)
+    font = ImageFont.truetype("static/fonts/OpenSans-Regular.tff", 20)
     obj = get_object_or_404(models.Asset, asset_id=pk)
 
     asset_id = f"Asset: {obj.asset_id}"
@@ -359,25 +372,22 @@ def generate_label(pk):
         csa = f"CSA: {obj.csa}mm²"
 
     image = Image.new("RGB", size, white)
-    image = ImageOps.expand(image, border=(5, 5, 5, 5), fill=black)
     logo = Image.open("static/imgs/square_logo.png")
     draw = ImageDraw.Draw(image)
 
-    draw.text((300, 0), asset_id, fill=black, font=heavy_font)
+    draw.text((210, 140), asset_id, fill=black, font=font)
     if obj.is_cable:
-        y = 140
-        draw.text((210, y), length, fill=black, font=font)
-        if obj.csa:
-            draw.text((365, y), csa, fill=black, font=font)
-    draw.text((210, size[1] - font_size - 8), "TEC PA & Lighting (0115) 84 68720", fill=black, font=font)
+        draw.text((210, 170), length, fill=black, font=font)
+        draw.text((360, 170), csa, fill=black, font=font)
+    draw.multiline_text((500, 140), "TEC PA & Lighting\n(0115) 84 68720", fill=black, font=font)
 
     barcode = Code39(str(obj.asset_id), writer=ImageWriter())
 
     logo_size = (200, 200)
-    image.paste(logo.resize(logo_size, Image.ANTIALIAS), box=(5, 5))
+    image.paste(logo.resize(logo_size, Image.ANTIALIAS))
     barcode_image = barcode.render(writer_options={"quiet_zone": 0, "write_text": False})
     width, height = barcode_image.size
-    image.paste(barcode_image.crop((0, 0, width, 100)), (int(((size[0] + logo_size[0]) - width) / 2), 40))
+    image.paste(barcode_image.crop((0, 0, width, 135)), (int(((size[0] + logo_size[0]) - width) / 2), 0))
 
     return image
 
@@ -406,16 +416,14 @@ class GenerateLabels(generic.View):
 
             base64_encoded_result_bytes = base64.b64encode(img_bytes)
             base64_encoded_result_str = base64_encoded_result_bytes.decode('ascii')
-            images.append((get_object_or_404(models.Asset, asset_id=asset_id), base64_encoded_result_str))
-
-        name = f"Asset Label Sheet generated at {timezone.now()}"
+            images.append(base64_encoded_result_str)
 
         context = {
-            'images0': images[::3],
-            'images1': images[1::3],
-            'images2': images[2::3],
-            # 'images3': images[3::4],
-            'filename': name
+            'images0': images[::4],
+            'images1': images[1::4],
+            'images2': images[2::4],
+            'images3': images[3::4],
+            'filename': "Asset Label Sheet generated at {}".format(timezone.now())
         }
         merger = PdfFileMerger()
 
@@ -427,6 +435,6 @@ class GenerateLabels(generic.View):
         merged = BytesIO()
         merger.write(merged)
 
-        response['Content-Disposition'] = f'filename="{name}"'
+        response['Content-Disposition'] = 'filename="{}"'.format(context['filename'])
         response.write(merged.getvalue())
         return response