Merge dependabot/npm_and_yarn/engine.io-and-socket.io-6.4.2 into combine-prs-branch1

Bumps [django](https://github.com/django/django) from 3.2.18 to 3.2.19.
- [Commits](https://github.com/django/django/compare/3.2.18...3.2.19)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/workflows/combine-prs.yml

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

@@ -0,0 +1,14 @@
+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,26 +13,20 @@ jobs:
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
-            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-
+            python-version: 3.9
+            cache: 'pipenv'
       - name: Install Dependencies
         run: |
-              python -m pip install --upgrade pip pipenv
+              python3 -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@v2
+        uses: actions/cache@v3
         with:
             path: 'pipeline/built_assets'
             key: ${{ hashFiles('package-lock.json') }}-${{ hashFiles('pipeline/source_assets') }}
@@ -43,9 +37,9 @@ jobs:
       - name: Basic Checks
         run: |
               pipenv run pycodestyle . --exclude=migrations,node_modules
-              pipenv run python manage.py check
-              pipenv run python manage.py makemigrations --check --dry-run
-              pipenv run python manage.py collectstatic --noinput
+              pipenv run python3 manage.py check
+              pipenv run python3 manage.py makemigrations --check --dry-run
+              pipenv run python3 manage.py collectstatic --noinput
       - name: Run Tests
         run: pipenv run pytest -n auto -vv --cov
       - uses: actions/upload-artifact@v2

Pipfile

@@ -11,7 +11,6 @@ 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"
@@ -26,26 +25,24 @@ 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 = "~=0.2.0"
+envparse = "*"
 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.0.0"
+Pillow = "~=9.3.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.26.0"
-PyPOM = "~=2.2.0"
+PyPDF2 = "~=1.27.5"
+PyPOM = "~=2.2.4"
 python-dateutil = "~=2.8.1"
 pytoml = "~=0.1.21"
 pytz = "~=2020.5"
@@ -80,10 +77,12 @@ importlib-metadata = "*"
 django-hcaptcha = "*"
 "z3c.rml" = "*"
 pikepdf = "*"
+django-queryable-properties = "*"
+django-mass-edit = "*"
+selenium = "~=3.141.0"
 
 [dev-packages]
-selenium = "~=3.141.0"
-pycodestyle = "*"
+pycodestyle = "~=2.9.1"
 coveralls = "*"
 django-coverage-plugin = "*"
 pytest-cov = "*"

PyRIGS/decorators.py

@@ -9,9 +9,8 @@ from RIGS import models
 
 def get_oembed(login_url, request, oembed_view, kwargs):
     context = {}
-    context['oembed_url'] = "{0}://{1}{2}".format(request.scheme, request.META['HTTP_HOST'],
-                                                  reverse(oembed_view, kwargs=kwargs))
-    context['login_url'] = "{0}?{1}={2}".format(login_url, REDIRECT_FIELD_NAME, request.get_full_path())
+    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()}"
     resp = render(request, 'login_redirect.html', context=context)
     return resp
 
@@ -25,7 +24,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('%s?%s=%s' % (login_url, REDIRECT_FIELD_NAME, request.get_full_path()))
+                    return HttpResponseRedirect(f'{login_url}?{REDIRECT_FIELD_NAME}={request.get_full_path()}')
 
         _checklogin.__doc__ = view_func.__doc__
         _checklogin.__dict__ = view_func.__dict__
@@ -55,7 +54,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('%s?%s=%s' % (login_url, REDIRECT_FIELD_NAME, request.get_full_path()))
+                    return HttpResponseRedirect(f'{login_url}?{REDIRECT_FIELD_NAME}={request.get_full_path()}')
             else:
                 resp = render(request, '403.html')
                 resp.status_code = 403

PyRIGS/settings.py

@@ -42,8 +42,9 @@ if not DEBUG:
 
 INTERNAL_IPS = ['127.0.0.1']
 
-ADMINS = [('Tom Price', 'tomtom5152@gmail.com'), ('IT Manager', 'it@nottinghamtec.co.uk'),
-          ('Arona Jones', 'arona.jones@nottinghamtec.co.uk')]
+DOMAIN = env('DOMAIN', default='example.com')
+
+ADMINS = [('IT Manager', f'it@{DOMAIN}'), ('Arona Jones', f'arona.jones@{DOMAIN}')]
 if DEBUG:
     ADMINS.append(('Testing Superuser', 'superuser@example.com'))
 
@@ -68,6 +69,7 @@ INSTALLED_APPS = (
     'reversion',
     'widget_tweaks',
     'hcaptcha',
+    'massadmin',
 )
 
 MIDDLEWARE = (

PyRIGS/tests/test_unit.py

@@ -10,6 +10,7 @@ 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
@@ -135,3 +136,11 @@ 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,10 +23,12 @@ 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,7 +1,18 @@
 import datetime
 import operator
-from functools import reduce
+import re
+import urllib.error
+import urllib.parse
+import urllib.request
 
+from functools import reduce
+from itertools import chain
+from io import BytesIO
+
+from PyPDF2 import PdfFileMerger, PdfFileReader
+from z3c.rml import rml2pdf
+
+from django.conf import settings
 from django.contrib.auth.decorators import login_required
 from django.contrib import messages
 from django.core import serializers
@@ -12,6 +23,8 @@ 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
@@ -22,6 +35,13 @@ 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'
 
@@ -120,7 +140,7 @@ class SecureAPIRequest(generic.View):
                     'text': o.name,
                 }
                 try:  # See if there is a valid update URL
-                    data['update'] = reverse("%s_update" % model, kwargs={'pk': o.pk})
+                    data['update'] = reverse(f"{model}_update", kwargs={'pk': o.pk})
                 except NoReverseMatch:
                     pass
                 results.append(data)
@@ -182,20 +202,7 @@ class GenericListView(generic.ListView):
         return context
 
     def get_queryset(self):
-        q = self.request.GET.get('q', "")
-
-        filter = Q(name__icontains=q) | Q(email__icontains=q) | Q(address__icontains=q) | Q(notes__icontains=q) | Q(
-            phone__startswith=q) | Q(phone__endswith=q)
-
-        # try and parse an int
-        try:
-            val = int(q)
-            filter = filter | Q(pk=val)
-        except:  # noqa
-            # not an integer
-            pass
-
-        object_list = self.model.objects.filter(filter)
+        object_list = self.model.objects.search(query=self.request.GET.get('q', ""))
 
         orderBy = self.request.GET.get('orderBy', "name")
         if orderBy != "":
@@ -236,6 +243,53 @@ class GenericCreateView(generic.CreateView):
         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'
 
@@ -265,3 +319,62 @@ class OEmbedView(generic.View):
         }
 
         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)

RIGS/admin.py

@@ -8,6 +8,7 @@ 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
 
@@ -21,17 +22,139 @@ admin.site.register(models.EventItem, VersionAdmin)
 admin.site.register(models.Invoice, VersionAdmin)
 
 
-def approve_user(modeladmin, request, queryset):
-    queryset.update(is_approved=True)
+@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
 
 
-approve_user.short_description = "Approve selected users"
+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)
 
 
 @admin.register(models.Profile)
-class ProfileAdmin(UserAdmin):
-    # Don't know how to add 'is_approved' whilst preserving the default list...
-    list_filter = ('is_approved', 'is_active', 'is_staff', 'is_superuser', 'groups')
+class ProfileAdmin(UserAdmin, AssociateAdmin):
+    list_display = ('username', 'name', 'is_approved', 'is_staff', 'is_superuser', 'is_supervisor', 'number_of_events')
+    list_display_links = ['username']
     fieldsets = (
         (None, {'fields': ('username', 'password')}),
         (_('Personal info'), {
@@ -49,62 +172,12 @@ class ProfileAdmin(UserAdmin):
     )
     form = user_forms.ProfileChangeForm
     add_form = user_forms.ProfileCreationForm
-    actions = [approve_user]
+    actions = ['approve_user', 'merge']
 
+    merge_fields = ['username', 'first_name', 'last_name', 'initials', 'email', 'phone', 'is_supervisor']
 
-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)
+    def approve_user(modeladmin, request, queryset):
+        queryset.update(is_approved=True)
 
 
 @admin.register(models.Person)

RIGS/forms.py

@@ -153,6 +153,10 @@ 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():
@@ -172,9 +176,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("<li>{}</li>".format(self._meta.model._meta.get_field(field).help_text))
+                unexpected_values.append(f"<li>{self._meta.model._meta.get_field(field).help_text}</li>")
         if len(unexpected_values) > 0 and not self.cleaned_data.get('supervisor_consulted'):
-            raise forms.ValidationError("Your answers to these questions: <ul>{}</ul> require consulting with a supervisor.".format(''.join([str(elem) for elem in unexpected_values])), code='unusual_answers')
+            raise forms.ValidationError(f"Your answers to these questions: <ul>{''.join([str(elem) for elem in unexpected_values])}</ul> require consulting with a supervisor.", code='unusual_answers')
         return super(EventRiskAssessmentForm, self).clean()
 
     class Meta:
@@ -213,7 +217,7 @@ class EventChecklistForm(forms.ModelForm):
         for key in vehicles:
             pk = int(key.split('_')[1])
             driver_key = 'driver_' + str(pk)
-            if(self.data[driver_key] == ''):
+            if (self.data[driver_key] == ''):
                 raise forms.ValidationError('Add a driver to vehicle ' + str(pk), code='vehicle_mismatch')
             else:
                 try:
@@ -235,9 +239,9 @@ class EventChecklistForm(forms.ModelForm):
             pk = int(key.split('_')[1])
 
             for field in other_fields:
-                value = self.data['{}_{}'.format(field, pk)]
+                value = self.data[f'{field}_{pk}']
                 if value == '':
-                    raise forms.ValidationError('Add a {} to crewmember {}'.format(field, pk), code='{}_mismatch'.format(field))
+                    raise forms.ValidationError(f'Add a {field} to crewmember {pk}', code=f'{field}_mismatch')
 
             try:
                 item = models.EventChecklistCrew.objects.get(pk=pk)

RIGS/management/commands/send_reminders.py

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

@@ -0,0 +1,18 @@
+# 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/models.py

@@ -8,6 +8,7 @@ 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
@@ -20,11 +21,22 @@ 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)
+    is_approved = models.BooleanField(default=False, verbose_name="Approval Status", help_text="Designates whether a staff member has approved this user.")
     # Currently only populated by the admin approval email. TODO: Populate it each time we send any email, might need that...
     last_emailed = models.DateTimeField(blank=True, null=True)
     dark_theme = models.BooleanField(default=False)
@@ -51,7 +63,7 @@ class Profile(AbstractUser):
     def name(self):
         name = self.get_full_name()
         if self.initials:
-            name += ' "{}"'.format(self.initials)
+            name += f' "{self.initials}"'
         return name
 
     @property
@@ -70,15 +82,28 @@ class Profile(AbstractUser):
         return self.name
 
 
+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)
+
+            or_lookup = filter_by_pk(or_lookup, query)
+
+            qs = qs.filter(or_lookup).distinct()  # distinct() is often necessary with Q lookups
+        return qs
+
+
 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()
+
     def __str__(self):
         string = self.name
         if self.notes is not None:
@@ -110,12 +135,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:
@@ -184,9 +209,10 @@ 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()
+
     def __str__(self):
         string = self.name
         if self.notes and len(self.notes) > 0:
@@ -260,6 +286,23 @@ 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):
@@ -314,10 +357,8 @@ class Event(models.Model, RevisionMixin):
     def display_id(self):
         if self.pk:
             if self.is_rig:
-                return str("N%05d" % self.pk)
-
+                return f"N{self.pk:05d}"
             return self.pk
-
         return "????"
 
     # Calculated values
@@ -530,6 +571,34 @@ 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):
@@ -569,14 +638,14 @@ class Invoice(models.Model, RevisionMixin):
 
     @property
     def activity_feed_string(self):
-        return f"#{self.display_id} for Event {self.event.display_id}"
+        return f"{self.display_id} for Event {self.event.display_id}"
 
     def __str__(self):
-        return "%i: %s (%.2f)" % (self.pk, self.event, self.balance)
+        return f"{self.display_id}: {self.event} (£{self.balance:.2f})"
 
     @property
     def display_id(self):
-        return "{:05d}".format(self.pk)
+        return f"#{self.pk:05d}"
 
     class Meta:
         ordering = ['-invoice_date']
@@ -681,7 +750,7 @@ class RiskAssessment(models.Model, RevisionMixin):
         'contractors': False,
         'other_companies': False,
         'crew_fatigue': False,
-        'big_power': False,
+        # 'big_power': False Doesn't require checking with a super either way
         'generators': False,
         'other_companies_power': False,
         'nonstandard_equipment_power': False,
@@ -723,15 +792,22 @@ class RiskAssessment(models.Model, RevisionMixin):
         else:
             return self.SMALL[0]
 
+    def get_event_size_display(self):
+        return self.SIZES[self.event_size][1] + " Event"
+
     @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)
+        return f"{self.pk} | {self.event}"
 
 
 @reversion.register(follow=['vehicles', 'crew'])
@@ -813,7 +889,7 @@ class EventChecklist(models.Model, RevisionMixin):
         return reverse('ec_detail', kwargs={'pk': self.pk})
 
     def __str__(self):
-        return "%i - %s" % (self.pk, self.event)
+        return f"{self.pk} - {self.event}"
 
 
 @reversion.register
@@ -825,7 +901,7 @@ class EventChecklistVehicle(models.Model, RevisionMixin):
     reversion_hide = True
 
     def __str__(self):
-        return "{} driven by {}".format(self.vehicle, str(self.driver))
+        return f"{self.vehicle} driven by {self.driver}"
 
 
 @reversion.register
@@ -843,4 +919,4 @@ class EventChecklistCrew(models.Model, RevisionMixin):
             raise ValidationError('Unless you\'ve invented time travel, crew can\'t finish before they have started.')
 
     def __str__(self):
-        return "{} ({})".format(str(self.crewmember), self.role)
+        return f"{self.crewmember} ({self.role})"

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 = "N%05d | %s - Event Authorised" % (instance.event.pk, instance.event.name)
+    subject = f"{instance.event.display_id} | {instance.event.name} - Event Authorised"
 
     client_email = EmailMultiAlternatives(
         subject,
-        get_template("eventauthorisation_client_success.txt").render(context),
+        get_template("email/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("eventauthorisation_client_success.html").render(context),
+    html = Premailer(get_template("email/eventauthorisation_client_success.html").render(context),
                      external_styles=css).transform()
     client_email.attach_alternative(html, 'text/html')
 
     escapedEventName = re.sub(r'[^a-zA-Z0-9 \n\.]', '', instance.event.name)
 
-    client_email.attach('N%05d - %s - CONFIRMATION.pdf' % (instance.event.pk, escapedEventName),
+    client_email.attach(f'{instance.event.display_id} - {escapedEventName} - CONFIRMATION.pdf',
                         merged.getvalue(),
                         'application/pdf'
                         )
@@ -82,7 +82,7 @@ def send_eventauthorisation_success_email(instance):
 
     mic_email = EmailMessage(
         subject,
-        get_template("eventauthorisation_mic_success.txt").render(context),
+        get_template("email/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(
-                "%s new users awaiting approval on RIGS" % (context['number_of_users']),
-                get_template("admin_awaiting_approval.txt").render(context),
+                f"{context['number_of_users']} new users awaiting approval on RIGS",
+                get_template("email/admin_awaiting_approval.txt").render(context),
                 to=[admin.email],
                 reply_to=[user.email],
             )
             css = finders.find('css/email.css')
-            html = Premailer(get_template("admin_awaiting_approval.html").render(context),
+            html = Premailer(get_template("email/admin_awaiting_approval.html").render(context),
                              external_styles=css).transform()
             email.attach_alternative(html, 'text/html')
             email.send()

RIGS/templates/base_print.xml

@@ -0,0 +1,142 @@
+<?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/calendar.html

@@ -27,15 +27,12 @@
 
             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
@@ -58,8 +55,10 @@
                             };
                             $(doc).each(function() {
                                 end = $(this).attr('latest')
+                                allDay = false
                                 if(end.indexOf("T") < 0){ //If latest does not contain a time
-                                   end = moment(end).add(1, 'days') //End date is non-inclusive, so add a day
+                                   end = moment(end + " 23:59").format("YYYY-MM-DD[T]HH:mm:ss")
+                                   allDay = true
                                 }
 
                                 thisEvent = {
@@ -67,7 +66,8 @@
                                     'end': end,
                                     'className': 'modal-href',
                                     'title': $(this).attr('title'),
-                                    'url': $(this).attr('url')
+                                    'url': $(this).attr('url'),
+                                    'allDay': allDay
                                 }
 
                                 if($(this).attr('is_rig')===true || $(this).attr('status') === "Cancelled"){

RIGS/templates/email/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.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

@@ -0,0 +1,16 @@
+{% 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

@@ -0,0 +1,9 @@
+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_form.html

@@ -122,7 +122,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="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='person' %}">
+                                    <select id="{{ form.person.id_for_label }}" name="{{ form.person.name }}" class="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 +149,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="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='organisation' %}" >
+                                    <select id="{{ form.organisation.id_for_label }}" name="{{ form.organisation.name }}" class="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 +207,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="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='venue' %}">
+                                        <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="{{form.venue.value}}" selected="selected" data-update_url="{% url 'venue_update' form.venue.value %}">{{ venue }}</option>
                                         {% endif %}
@@ -277,10 +277,8 @@
                             </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">
-                                            {% render_field form.dry_hire %}{{ form.dry_hire.label }}
-                                        </label>
+                                        {{ form.dry_hire.label }} {% render_field form.dry_hire %}
                                     </div>
                                 </div>
                             </div>
@@ -302,7 +300,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="form-control 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="px-0 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 %}
@@ -316,7 +314,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="form-control 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="px-0 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,136 +1,5 @@
-<?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>
+{% extends 'base_print.xml' %}
 
-    <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>
+{% block content %}
+{% include "event_print_page.xml" %}
+{% endblock %}

RIGS/templates/event_print_page.xml

@@ -1,12 +1,10 @@
 {% 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 }}'<small></small></h1>
+        <h1><b>N{{ object.pk|stringformat:"05d" }}:</b> '{{ object.name }}'</h1>
 
         <para style="style.event_description">
         <b>{{object.start_date|date:"D jS N Y"}}</b>
@@ -180,7 +178,7 @@
 {% for item in object.items.all %}
     <tr>
         <td>
-            <para>{{ item.name }}</para>
+            <para><b>{{ item.name }}</b></para>
             {% if item.description %}
                 {{ item.description|markdown:"rml" }}
             {% endif %}

RIGS/templates/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.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,21 +5,6 @@
 
 {% 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">
@@ -33,11 +18,11 @@
                 <dl class="dl-horizontal">
                     {% if object.person.email %}
                     <dt>Person Email</dt>
-                    <dd><span id="person-email">{{ object.person.email }}</span>{% button 'copy' id='#person-email' %}</dd>
+                    <dd><span id="person-email" class="pr-1">{{ object.person.email }}</span> {% button 'copy' id='#person-email' %}</dd>
                     {% endif %}
                     {% if object.organisation.email %}
                     <dt>Organisation Email</dt>
-                    <dd><span id="org-email">{{ object.organisation.email }}</span>{% button 'copy' id='#org-email' %}</dd>
+                    <dd><span id="org-email" class="pr-1">{{ object.organisation.email }}</span> {% button 'copy' id='#org-email' %}</dd>
                     {% endif %}
                 </dl>
                 {% else %}
@@ -57,11 +42,20 @@
             </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/ra_print.xml

@@ -0,0 +1,135 @@
+{% 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/risk_assessment_detail.html

@@ -1,7 +1,5 @@
 {% extends request.is_ajax|yesno:"base_ajax.html,base_rigs.html" %}
-{% load help_text from filters %}
-{% load yesnoi from filters %}
-{% load linkornone from filters %}
+{% load filters %}
 
 {% block content %}
     <div class="row py-3">
@@ -47,7 +45,7 @@
                         </dd>
                         <dt class="col-sm-6">{{ object|help_text:'power_mic'|safe }}</dt>
                         <dd class="col-sm-6">
-                            {{ object.power_mic.name|default:'None' }}
+                            {{ object.power_mic.name|default:object.event.mic }}
                         </dd>
                         <dt class="col-sm-6">{{ object|help_text:'outside' }}</dt>
                         <dd class="col-sm-6">
@@ -144,7 +142,7 @@
                                 </dd>
                                 <dt class="col-12">{{ object|help_text:'persons_responsible_structures' }}</dt>
                                 <dd class="col-12">
-                                    {{ object.persons_responsible_structures.name|default:'N/A'|linebreaks }}
+                                    {{ object.persons_responsible_structures|default:'N/A'|linebreaks }}
                                 </dd>
                                 <dt class="col-12">{{ object|help_text:'rigging_plan'|safe }}</dt>
                                 <dd class="col-12">
@@ -157,6 +155,7 @@
             </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/hs/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="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>
+                                <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>
                                     {% endif %}
                                 </select>
                             </div>

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">{{ event.organisation.union_account|yesno|capfirst }}</dd>
+                <dd class="col-sm-6">{{ object.organisation.union_account|yesno|capfirst }}</dd>
             </dl>
         </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
+                        btn-success active disabled
                     {% 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 %}
                     "
-               href="{% url 'event_authorise_request' object.pk %}">
+               {% if event.authorised %}aria-disabled="true"{% else %}href="{% url 'event_authorise_request' object.pk %}"{% endif %}>
                 <span class="fas fa-paper-plane"></span>
                 <span class="d-none d-sm-inline">
                     {% if event.authorised %}

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 }}{% if object.venue.three_phase_available %}<br>(Three phase available){%endif%}
+                {{ object.venue.notes|markdown }}{% if object.venue.three_phase_available %}<br>(Three phase available){%endif%}
             </dd>
             {% endif %}
 

RIGS/templates/partials/event_status.html

@@ -16,7 +16,7 @@
     {% endif %}
     {% if not event.dry_hire %}
         {% 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>
+            <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>
         {% else %}
             <span class="badge badge-danger">RA: <span class="fas fa-times"></span></span>
         {% endif %}

RIGS/templates/partials/event_table.html

@@ -1,4 +1,5 @@
 {% load namewithnotes from filters %}
+{% load markdown_tags %}
 <div class="table-responsive">
     <table class="table mb-0" id="event_table">
         <thead>
@@ -29,7 +30,15 @@
             <!---Number-->
             <th scope="row" id="event_number">{{ event.display_id }}</th>
             <!--Dates & Times-->
-            <td id="event_dates">
+            <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 %}
                 <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" }}
@@ -43,14 +52,6 @@
                     {% 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">
@@ -74,7 +75,7 @@
                     </h5>
                 {% endif %}
                 {% if not event.cancelled and event.description %}
-                    <p>{{ event.description|linebreaksbr }}</p>
+                    <p>{{ event.description|markdown }}</p>
                 {% endif %}
                 {% include 'partials/event_status.html' %}
             </td>

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-print"
-        text = "Print"
+        icon = "fa-download"
+        text = "Export"
     elif type == 'duplicate':
         clazz += " btn-info "
         icon = "fa-copy"
@@ -216,6 +216,8 @@ 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/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()

RIGS/urls.py

@@ -75,7 +75,7 @@ urlpatterns = [
 
     path('event/<int:pk>/ra/', permission_required_with_403('RIGS.add_riskassessment')(views.EventRiskAssessmentCreate.as_view()),
          name='event_ra'),
-    path('event/ra/<int:pk>/', permission_required_with_403('RIGS.view_riskassessment')(views.EventRiskAssessmentDetail.as_view()),
+    path('event/ra/<int:pk>/', login_required(views.EventRiskAssessmentDetail.as_view()),
          name='ra_detail'),
     path('event/ra/<int:pk>/edit/', permission_required_with_403('RIGS.change_riskassessment')(views.EventRiskAssessmentEdit.as_view()),
          name='ra_edit'),
@@ -83,10 +83,11 @@ urlpatterns = [
          name='ra_list'),
     path('event/ra/<int:pk>/review/', permission_required_with_403('RIGS.review_riskassessment')(views.EventRiskAssessmentReview.as_view()),
          name='ra_review'),
+    path('event/ra/<int:pk>/print/', permission_required_with_403('RIGS.view_riskassessment')(views.RAPrint.as_view()), name='ra_print'),
 
     path('event/<int:pk>/checklist/', permission_required_with_403('RIGS.add_eventchecklist')(views.EventChecklistCreate.as_view()),
          name='event_ec'),
-    path('event/checklist/<int:pk>/', permission_required_with_403('RIGS.view_eventchecklist')(views.EventChecklistDetail.as_view()),
+    path('event/checklist/<int:pk>/', login_required(views.EventChecklistDetail.as_view()),
          name='ec_detail'),
     path('event/checklist/<int:pk>/edit/', permission_required_with_403('RIGS.change_eventchecklist')(views.EventChecklistEdit.as_view()),
          name='ec_edit'),

RIGS/views/finance.py

@@ -28,7 +28,8 @@ class InvoiceIndex(generic.ListView):
         total = 0
         for i in context['object_list']:
             total += i.balance
-        context['page_title'] = "Outstanding Invoices ({} Events, £{:.2f})".format(len(list(context['object_list'])), total)
+        event_count = len(list(context['object_list']))
+        context['page_title'] = f"Outstanding Invoices ({event_count} Events, £{total:.2f})"
         context['description'] = "Paperwork for these events has been sent to treasury, but the full balance has not yet appeared on a ledger"
         return context
 
@@ -43,7 +44,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:
@@ -59,11 +60,14 @@ 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': 'Invoice {} for {} {}.pdf'.format(invoice.display_id, object.display_id, re.sub(r'[^a-zA-Z0-9 \n\.]', '', object.name))
+            'filename': filename
         }
 
         rml = template.render(context)
@@ -73,7 +77,7 @@ class InvoicePrint(generic.View):
         pdfData = buffer.read()
 
         response = HttpResponse(content_type='application/pdf')
-        response['Content-Disposition'] = 'filename="{}"'.format(context['filename'])
+        response['Content-Disposition'] = f'filename="{filename}"'
         response.write(pdfData)
         return response
 
@@ -124,32 +128,7 @@ class InvoiceArchive(generic.ListView):
         return context
 
     def get_queryset(self):
-        q = self.request.GET.get('q', "")
-
-        filter = Q(event__name__icontains=q)
-
-        # try and parse an int
-        try:
-            val = int(q)
-            filter = filter | Q(pk=val)
-            filter = filter | Q(event__pk=val)
-        except:  # noqa
-            # not an integer
-            pass
-
-        try:
-            if q[0] == "N":
-                val = int(q[1:])
-                filter = Q(event__pk=val)  # If string is Nxxxxx then filter by event number
-            elif q[0] == "#":
-                val = int(q[1:])
-                filter = Q(pk=val)  # If string is #xxxxx then filter by invoice number
-        except:  # noqa
-            pass
-
-        object_list = self.model.objects.filter(filter).order_by('-invoice_date')
-
-        return object_list
+        return self.model.objects.search(self.request.GET.get('q')).order_by('-invoice_date')
 
 
 class InvoiceWaiting(generic.ListView):
@@ -163,7 +142,7 @@ class InvoiceWaiting(generic.ListView):
         objects = self.get_queryset()
         for obj in objects:
             total += obj.sum_total
-        context['page_title'] = "Events for Invoice ({} Events, £{:.2f})".format(len(objects), total)
+        context['page_title'] = f"Events for Invoice ({len(objects)} Events, £{total:.2f})"
         return context
 
     def get_queryset(self):

RIGS/views/hs.py

@@ -6,11 +6,13 @@ 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
 
 
 class EventRiskAssessmentCreate(generic.CreateView):
     model = models.RiskAssessment
-    template_name = 'risk_assessment_form.html'
+    template_name = 'hs/risk_assessment_form.html'
     form_class = forms.EventRiskAssessmentForm
 
     def get(self, *args, **kwargs):
@@ -37,7 +39,8 @@ class EventRiskAssessmentCreate(generic.CreateView):
         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)
+        context['page_title'] = f'Create Risk Assessment for Event {event.display_id}'
+        get_related(context['form'], context)
         return context
 
     def get_success_url(self):
@@ -46,7 +49,7 @@ class EventRiskAssessmentCreate(generic.CreateView):
 
 class EventRiskAssessmentEdit(generic.UpdateView):
     model = models.RiskAssessment
-    template_name = 'risk_assessment_form.html'
+    template_name = 'hs/risk_assessment_form.html'
     form_class = forms.EventRiskAssessmentForm
 
     def get_success_url(self):
@@ -62,24 +65,25 @@ class EventRiskAssessmentEdit(generic.UpdateView):
         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)
+        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 = 'risk_assessment_detail.html'
+    template_name = 'hs/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)
+        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 EventRiskAssessmentList(generic.ListView):
     paginate_by = 20
     model = models.RiskAssessment
-    template_name = 'hs_object_list.html'
+    template_name = 'hs/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')
@@ -108,17 +112,17 @@ class EventRiskAssessmentReview(generic.View):
 
 class EventChecklistDetail(generic.DetailView):
     model = models.EventChecklist
-    template_name = 'event_checklist_detail.html'
+    template_name = 'hs/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)
+        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 = 'event_checklist_form.html'
+    template_name = 'hs/event_checklist_form.html'
     form_class = forms.EventChecklistForm
 
     def get_success_url(self):
@@ -134,19 +138,14 @@ class EventChecklistEdit(generic.UpdateView):
         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)
+        context['page_title'] = f'Edit Event Checklist for Event {ec.event.display_id}'
+        get_related(context['form'], context)
         return context
 
 
 class EventChecklistCreate(generic.CreateView):
     model = models.EventChecklist
-    template_name = 'event_checklist_form.html'
+    template_name = 'hs/event_checklist_form.html'
     form_class = forms.EventChecklistForm
 
     # From both business logic and programming POVs, RAs must exist before ECs!
@@ -158,7 +157,7 @@ class EventChecklistCreate(generic.CreateView):
         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))
+            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_lazy('event_ra', kwargs={'pk': epk}))
 
         return super(EventChecklistCreate, self).get(self)
@@ -175,7 +174,7 @@ class EventChecklistCreate(generic.CreateView):
         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)
+        context['page_title'] = f'Create Event Checklist for Event {event.display_id}'
         return context
 
     def get_success_url(self):
@@ -185,7 +184,7 @@ class EventChecklistCreate(generic.CreateView):
 class EventChecklistList(generic.ListView):
     paginate_by = 20
     model = models.EventChecklist
-    template_name = 'hs_object_list.html'
+    template_name = 'hs/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')
@@ -215,7 +214,7 @@ class EventChecklistReview(generic.View):
 class HSList(generic.ListView):
     paginate_by = 20
     model = models.Event
-    template_name = 'hs_list.html'
+    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')
@@ -224,3 +223,13 @@ class HSList(generic.ListView):
         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

RIGS/views/ical.py

@@ -93,7 +93,7 @@ class CalendarICS(ICalFeed):
         title += item.name
 
         # Add the status
-        title += ' (' + str(item.get_status_display()) + ')'
+        title += f' ({item.get_status_display()})'
 
         return title
 
@@ -101,9 +101,8 @@ class CalendarICS(ICalFeed):
         return item.earliest_time
 
     def item_end_datetime(self, item):
-        if isinstance(item.latest_time, datetime.date):  # Ical end_datetime is non-inclusive, so add a day
-            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):
@@ -115,13 +114,13 @@ class CalendarICS(ICalFeed):
 
         tz = pytz.timezone(self.timezone)
 
-        desc = 'Rig ID = ' + str(item.pk) + '\n'
-        desc += 'Event = ' + item.name + '\n'
+        desc = f'Rig ID = {item.display_id}\n'
+        desc += f'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 += 'Status = ' + str(item.get_status_display()) + '\n'
+        desc += f'Status = {item.get_status_display()}\n'
         desc += 'MIC = ' + (item.mic.name if item.mic else '---') + '\n'
 
         desc += '\n'
@@ -140,23 +139,18 @@ class CalendarICS(ICalFeed):
 
         desc += '\n'
         if item.description:
-            desc += 'Event Description:\n' + item.description + '\n\n'
+            desc += f'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'
 
-        base_url = "https://rigs.nottinghamtec.co.uk"
-        desc += 'URL = ' + base_url + str(item.get_absolute_url())
+        desc += f'URL = https://rigs.nottinghamtec.co.uk{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/views/rigboard.py

@@ -1,14 +1,9 @@
 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
@@ -24,10 +19,9 @@ 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
+from PyRIGS.views import OEmbedView, is_ajax, ModalURLMixin, PrintView, get_related
 from RIGS import models, forms
 
 __author__ = 'ghost'
@@ -98,11 +92,8 @@ 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 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)
+        get_related(form, context)
+
         return context
 
     def get_success_url(self):
@@ -121,11 +112,7 @@ class EventUpdate(generic.UpdateView):
 
         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)
+        get_related(form, context)
 
         return context
 
@@ -178,35 +165,16 @@ class EventDuplicate(EventUpdate):
         return context
 
 
-class EventPrint(generic.View):
-    def get(self, request, pk):
-        object = get_object_or_404(models.Event, pk=pk)
-        template = get_template('event_print.xml')
+class EventPrint(PrintView):
+    model = models.Event
+    template_name = 'event_print.xml'
+    append_terms = True
 
-        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
+    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
 
 
 class EventArchive(generic.ListView):
@@ -216,7 +184,6 @@ 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
@@ -240,32 +207,17 @@ class EventArchive(generic.ListView):
             filter &= Q(start_date__gte=start)
 
         q = self.request.GET.get('q', "")
+        objects = self.model.objects.all()
 
-        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
+        if q:
+            objects = self.model.objects.search(q)
 
         status = self.request.GET.getlist('status', "")
 
         if len(status) > 0:
             filter &= Q(status__in=status)
 
-        qs = self.model.objects.filter(filter).order_by('-start_date')
+        qs = objects.filter(filter).order_by('-start_date')
 
         # Preselect related for efficiency
         qs.select_related('person', 'organisation', 'venue', 'mic')
@@ -320,7 +272,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(EventAuthorise, self).get(request, *args, **kwargs)
+        return super().get(request, *args, **kwargs)
 
     def get_form(self, **kwargs):
         form = super().get_form(**kwargs)
@@ -389,13 +341,13 @@ class EventAuthorisationRequest(generic.FormView, generic.detail.SingleObjectMix
             context['to_name'] = event.organisation.name
 
         msg = EmailMultiAlternatives(
-            "N%05d | %s - Event Authorisation Request" % (self.object.pk, self.object.name),
-            get_template("eventauthorisation_client_request.txt").render(context),
+            f"{self.object.display_id} | {self.object.name} - Event Authorisation Request",
+            get_template("email/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("eventauthorisation_client_request.html").render(context),
+        html = premailer.Premailer(get_template("email/eventauthorisation_client_request.html").render(context),
                                    external_styles=css).transform()
         msg.attach_alternative(html, 'text/html')
 
@@ -405,7 +357,7 @@ class EventAuthorisationRequest(generic.FormView, generic.detail.SingleObjectMix
 
 
 class EventAuthoriseRequestEmailPreview(generic.DetailView):
-    template_name = "eventauthorisation_client_request.html"
+    template_name = "email/eventauthorisation_client_request.html"
     model = models.Event
 
     def render_to_response(self, context, **response_kwargs):

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,9 +17,13 @@ class AssetStatusAdmin(admin.ModelAdmin):
 
 
 @admin.register(assets.Supplier)
-class SupplierAdmin(VersionAdmin):
+class SupplierAdmin(AssociateAdmin):
     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,6 +33,7 @@ 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,6 +2,7 @@ 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
 
@@ -104,8 +105,7 @@ class Command(BaseCommand):
 
         for i in range(100):
             prefix = random.choice(asset_prefixes)
-            asset_id = str(get_available_asset_id(wanted_prefix=prefix))
-            asset_id = prefix + asset_id
+            asset_id = get_available_asset_id(wanted_prefix=prefix)
             asset = models.Asset(
                 asset_id=asset_id,
                 description=random.choice(asset_description),
@@ -125,5 +125,9 @@ class Command(BaseCommand):
             if i % 3 == 0:
                 asset.purchased_from = random.choice(self.suppliers)
 
-            asset.clean()
-            asset.save()
+            with transaction.atomic():
+                try:
+                    asset.clean()
+                    asset.save()
+                except IntegrityError:
+                    pass

assets/migrations/0023_alter_asset_purchased_from.py

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

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

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

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

@@ -0,0 +1,18 @@
+# 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,11 +2,12 @@ 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
+from RIGS.models import Profile, ContactableManager
 from versioning.versioning import RevisionMixin
 
 
@@ -46,6 +47,8 @@ class Supplier(models.Model, RevisionMixin):
 
     notes = models.TextField(blank=True, default="")
 
+    objects = ContactableManager()
+
     class Meta:
         ordering = ['name']
 
@@ -88,23 +91,24 @@ 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=""):
-    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()
+    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")
 
 
 @reversion.register
@@ -116,12 +120,13 @@ 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.CASCADE, blank=True, null=True, related_name="assets")
+    purchased_from = models.ForeignKey(to=Supplier, on_delete=models.SET_NULL, 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)
-    salvage_value = models.DecimalField(blank=True, null=True, decimal_places=2, max_digits=10)
+    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])
     comments = models.TextField(blank=True)
+    nickname = models.CharField(max_length=120, blank=True)
 
     # Audit
     last_audited_at = models.DateTimeField(blank=True, null=True)
@@ -142,6 +147,8 @@ class Asset(models.Model, RevisionMixin):
 
     reversion_perm = 'assets.asset_finance'
 
+    objects = AssetManager()
+
     class Meta:
         ordering = ['asset_id_prefix', 'asset_id_number']
         permissions = [
@@ -165,12 +172,6 @@ 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"]

assets/templates/asset_audit.html

@@ -9,9 +9,11 @@
             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;
@@ -39,16 +41,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-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 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>
   </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.salvage_value col="col-6" prepend="£" %}
+      {% include 'partials/form_field.html' with field=form.replacement_cost col="col-6" prepend="£" %}
   </div>
   <hr>
   <div class="form-group form-row">
@@ -64,16 +66,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="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>
+        <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>
       </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="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>
+        <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>
       </div>
     </div>
   </div>

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:'form-control custom-select selectpicker col-sm' data-none-selected-text="Categories" data-header="Categories" data-actions-box="true" %}
+                        {% render_field form.category|attr:'multiple'|add_class:'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:'form-control custom-select selectpicker col-sm' data-none-selected-text="Statuses" data-header="Statuses" data-actions-box="true" %}
+                        {% 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 mt-2">
@@ -121,6 +121,7 @@
 </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

@@ -0,0 +1,162 @@
+{% 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,22 +12,18 @@
     </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="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>
+                <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>
             </tr>
             {% endfor %}
         </blockTable>

assets/templates/partials/asset_detail_form.html

@@ -21,6 +21,10 @@
       <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'%}
@@ -45,7 +49,10 @@
     {% 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

@@ -0,0 +1,14 @@
+{% 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,19 +18,7 @@
                 <td class="assetCategory align-middle">{{ item.category }}</td>
                 <td class="assetStatus align-middle">{{ item.status }}</td>
                 <td class="d-none d-sm-table-cell">
-                    {% 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 %}
+                    {% include 'partials/asset_list_buttons.html' %}
                 </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-2 col-form-label"{% endif %}>{% if title %}{{ title }}{%else%}{{field.name|title_spaced}}{%endif%}</label>
+<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>
 {% 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="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='asset' %}?fields=asset_id,description">
+      <select name="parent" id="parent_id" class="selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='asset' %}?fields=asset_id,description">
         {% 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="form-control 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="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 }}">Salvage Value</label>
+      <label for="{{ form.salvage_value.id_for_label }}">Replacement Cost</label>
       <div class="input-group">
         <div class="input-group-prepend"><span class="input-group-text">£</span></div>
-        {% render_field form.salvage_value|add_class:'form-control' value=object.salvage_value %}
+        {% render_field form.replacement_cost|add_class:'form-control' value=object.replacement_cost %}
       </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>Salvage Value</dt>
-        <dd>£{{ object.salvage_value|default_if_none:'-' }}</dd>
+        <dt>Replacement Cost</dt>
+        <dd>£{{ object.replacement_cost|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,18 +18,23 @@ def status(db):
 
 
 @pytest.fixture
-def test_cable(db, category, status):
+def cable_type(db):
     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)
-    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
+    yield cable_type
     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))
+    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)
     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')),
-        'salvage_value': (regions.TextBox, (By.ID, 'id_salvage_value')),
+        'replacement_cost': (regions.TextBox, (By.ID, 'id_replacement_cost')),
         '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')),
-            'salvage_value': (regions.TextBox, (By.ID, 'id_salvage_value')),
+            'replacement_cost': (regions.TextBox, (By.ID, 'id_replacement_cost')),
             '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

@@ -94,6 +94,55 @@ 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):
@@ -130,7 +179,7 @@ class TestAssetForm(AutoLoginTest):
         self.page.comments = comments = "This is actually a sledgehammer, not a cable..."
 
         self.page.purchase_price = "12.99"
-        self.page.salvage_value = "99.12"
+        self.page.replacement_cost = "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)
@@ -160,50 +209,6 @@ 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):
@@ -283,6 +288,28 @@ 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):
@@ -293,14 +320,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))
+                                    category=self.category, date_acquired=datetime.date(2020, 2, 1), replacement_cost=10)
         models.Asset.objects.create(asset_id="11", description="Trailerboard", status=self.status,
-                                    category=self.category, date_acquired=datetime.date(2020, 2, 1))
+                                    category=self.category, date_acquired=datetime.date(2020, 2, 1), replacement_cost=10)
         models.Asset.objects.create(asset_id="111", description="Erms", status=self.status, category=self.category,
-                                    date_acquired=datetime.date(2020, 2, 1))
+                                    date_acquired=datetime.date(2020, 2, 1), replacement_cost=10)
         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))
+                                                 date_acquired=datetime.date(2020, 2, 1), replacement_cost=10)
         self.page = pages.AssetAuditList(self.driver, self.live_server_url).open()
         self.wait = WebDriverWait(self.driver, 20)
 
@@ -316,25 +343,6 @@ 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]

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', 'salvage_value': '-30'})
+    response = admin_client.post(reverse('asset_create'), {'date_sold': '2000-01-01', 'date_acquired': '2020-01-01', 'purchase_price': '-30', 'replacement_cost': '-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', 'salvage_value': '-50', 'description': "", 'status': "", 'category': ""})
+    response = admin_client.post(url, {'date_sold': '2000-12-01', 'date_acquired': '2020-12-01', 'purchase_price': '-50', 'replacement_cost': '-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', 'salvage_value', 'A price cannot be negative')
+    assertFormError(response, 'form', 'replacement_cost', 'A price cannot be negative')

assets/urls.py

@@ -20,8 +20,9 @@ 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'),

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
+from django.db.models import Q, Sum
 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
+from PIL import Image, ImageDraw, ImageFont, ImageOps
 from barcode import Code39
 from barcode.writer import ImageWriter
 from z3c.rml import rml2pdf
@@ -25,14 +25,12 @@ 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):
@@ -50,13 +48,7 @@ class AssetList(LoginRequiredMixin, generic.ListView):
 
         # TODO Feedback to user when search fails
         query_string = form.cleaned_data['q'] or ""
-        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()))
+        queryset = models.Asset.objects.search(query=query_string)
 
         if form.cleaned_data['is_cable']:
             queryset = queryset.filter(is_cable=True)
@@ -87,6 +79,25 @@ class AssetList(LoginRequiredMixin, generic.ListView):
         return context
 
 
+class CableList(AssetList):
+    template_name = 'cable_list.html'
+    paginator = None
+
+    def get_queryset(self):
+        queryset = super().get_queryset().filter(is_cable=True)
+
+        if self.form.cleaned_data['cable_type']:
+            queryset = queryset.filter(cable_type__in=self.form.cleaned_data['cable_type'])
+
+        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
+
+
 class AssetIDUrlMixin:
     def get_object(self, queryset=None):
         pk = self.kwargs.get(self.pk_url_kwarg)
@@ -140,7 +151,7 @@ class AssetCreate(LoginRequiredMixin, generic.CreateView):
 
     def get_initial(self, *args, **kwargs):
         initial = super().get_initial(*args, **kwargs)
-        initial["asset_id"] = get_available_asset_id()
+        initial["asset_id"] = models.get_available_asset_id()
         return initial
 
     def get_success_url(self):
@@ -155,6 +166,11 @@ 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
@@ -176,6 +192,7 @@ class AssetOEmbed(OEmbedView):
 
 class AssetAuditList(AssetList):
     template_name = 'asset_audit_list.html'
+    hide_hidden_status = True
 
     # TODO Refresh this when the modal is submitted
     def get_queryset(self):
@@ -262,7 +279,7 @@ class SupplierUpdate(GenericUpdateView, ModalURLMixin):
     form_class = forms.SupplierForm
 
     def get_context_data(self, **kwargs):
-        context = super(SupplierUpdate, self).get_context_data(**kwargs)
+        context = super().get_context_data(**kwargs)
         if is_ajax(self.request):
             context['override'] = "base_ajax.html"
         else:
@@ -306,7 +323,6 @@ 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):
@@ -322,7 +338,6 @@ 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):
@@ -333,7 +348,9 @@ def generate_label(pk):
     black = (0, 0, 0)
     white = (255, 255, 255)
     size = (700, 200)
-    font = ImageFont.truetype("static/fonts/OpenSans-Regular.tff", 20)
+    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)
     obj = get_object_or_404(models.Asset, asset_id=pk)
 
     asset_id = f"Asset: {obj.asset_id}"
@@ -342,22 +359,25 @@ 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((210, 140), asset_id, fill=black, font=font)
+    draw.text((300, 0), asset_id, fill=black, font=heavy_font)
     if obj.is_cable:
-        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)
+        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)
 
     barcode = Code39(str(obj.asset_id), writer=ImageWriter())
 
     logo_size = (200, 200)
-    image.paste(logo.resize(logo_size, Image.ANTIALIAS))
+    image.paste(logo.resize(logo_size, Image.ANTIALIAS), box=(5, 5))
     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, 135)), (int(((size[0] + logo_size[0]) - width) / 2), 0))
+    image.paste(barcode_image.crop((0, 0, width, 100)), (int(((size[0] + logo_size[0]) - width) / 2), 40))
 
     return image
 
@@ -386,14 +406,16 @@ class GenerateLabels(generic.View):
 
             base64_encoded_result_bytes = base64.b64encode(img_bytes)
             base64_encoded_result_str = base64_encoded_result_bytes.decode('ascii')
-            images.append(base64_encoded_result_str)
+            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()}"
 
         context = {
-            'images0': images[::4],
-            'images1': images[1::4],
-            'images2': images[2::4],
-            'images3': images[3::4],
-            'filename': "Asset Label Sheet generated at {}".format(timezone.now())
+            'images0': images[::3],
+            'images1': images[1::3],
+            'images2': images[2::3],
+            # 'images3': images[3::4],
+            'filename': name
         }
         merger = PdfFileMerger()
 
@@ -405,6 +427,6 @@ class GenerateLabels(generic.View):
         merged = BytesIO()
         merger.write(merged)
 
-        response['Content-Disposition'] = 'filename="{}"'.format(context['filename'])
+        response['Content-Disposition'] = f'filename="{name}"'
         response.write(merged.getvalue())
         return response

conftest.py

@@ -27,6 +27,8 @@ def admin_user(admin_user):
     admin_user.first_name = "Event"
     admin_user.last_name = "Test"
     admin_user.initials = "ETU"
+    admin_user.is_approved = True
+    admin_user.is_supervisor = True
     admin_user.save()
     return admin_user
 

package.json

@@ -11,7 +11,7 @@
     "autocompleter": "^6.1.2",
     "autoprefixer": "^10.4.0",
     "bootstrap": "^4.6.1",
-    "bootstrap-select": "^1.13.17",
+    "bootstrap-select": "^1.13.18",
     "clipboard": "^2.0.8",
     "cssnano": "^5.0.13",
     "easymde": "^2.16.1",
@@ -27,14 +27,14 @@
     "html5sortable": "^0.13.3",
     "jquery": "^3.6.0",
     "konami": "^1.6.3",
-    "moment": "^2.27.0",
-    "node-sass": "^7.0.0",
+    "moment": "^2.29.4",
+    "node-sass": "^7.0.3",
     "popper.js": "^1.16.1",
     "postcss": "^8.4.5",
     "uglify-js": "^3.14.5"
   },
   "devDependencies": {
-    "browser-sync": "^2.27.7"
+    "browser-sync": "^2.27.11"
   },
   "scripts": {
     "gulp": "gulp",

pipeline/source_assets/js/autocompleter.js

@@ -47,14 +47,16 @@ function initPicker(obj) {
         //log: 3,
         preprocessData: function (data) {
             var i, l = data.length, array = [];
-            array.push({
-                        text: clearSelectionLabel,
-                        value: '',
-                        data:{
-                        	update_url: '',
-                        	subtext:''
-                        }
-                    });
+            if (!obj.data('noclear')) {
+                array.push({
+                            text: clearSelectionLabel,
+                            value: '',
+                            data:{
+                            	update_url: '',
+                            	subtext:''
+                            }
+                        });
+            }
 
             if (l) {
                 for(i = 0; i < l; i++){
@@ -71,11 +73,13 @@ function initPicker(obj) {
             return array;
         }
     };
-
-    obj.prepend($("<option></option>")
-		.attr("value",'')
-		.text(clearSelectionLabel)
-		.data('update_url',''));  //Add "clear selection" option
+    console.log(obj.data);
+    if (!obj.data('noclear')) {
+        obj.prepend($("<option></option>")
+		    .attr("value",'')
+		    .text(clearSelectionLabel)
+		    .data('update_url',''));  //Add "clear selection" option
+    }
 
 
 	obj.selectpicker().ajaxSelectPicker(options); //Initiaise selectPicker

pipeline/source_assets/scss/dark_screen.scss

@@ -77,13 +77,13 @@
         border-collapse: separate !important;
         border-spacing: 0;
     }
-    .table tr th {
+    #event_table tr th {
       border-right: 0 !important;
     }
-    .table tr td {
+    #event_table tr td {
       border-left: 0 !important;
     }
-    .table tr td:not(:last-child) {
+    #event_table tr td:not(:last-child) {
         border-right: 0 !important;
     }
     @each $color, $value in $theme-colors {

pipeline/source_assets/scss/screen.scss

@@ -33,6 +33,25 @@ $fa-font-path: '/static/fonts';
 @import "node_modules/@fortawesome/fontawesome-free/scss/fontawesome";
 @import "node_modules/@fortawesome/fontawesome-free/scss/solid";
 
+html {
+  --brand: #3F58AA;
+  scrollbar-color: #3F58AA Canvas !important;
+}
+
+:root { accent-color: var(--brand); }
+:focus-visible { outline-color: var(--brand); }
+::selection { background-color: var(--brand); }
+::marker { color: var(--brand); }
+
+:is(
+  ::-webkit-calendar-picker-indicator,
+  ::-webkit-clear-button,
+  ::-webkit-inner-spin-button,
+  ::-webkit-outer-spin-button
+) {
+  color: var(--brand);
+}
+
 @media screen and
   (prefers-reduced-motion: reduce),
   (update: slow) {
@@ -175,7 +194,7 @@ svg {
 
 span.fas {
     padding-left: 0.1em !important;
-    padding-right: 0.1em !important;
+    padding-right: 0.3em !important;
 }
 
 html.embedded {
@@ -252,3 +271,13 @@ html.embedded {
     }
   }
 }
+
+.card, .card-header, .btn, input, select, .CodeMirror, .editor-toolbar, .card-img-top {
+    border-radius: 0 !important;
+    border-top-left-radius: 0 !important;
+    border-top-right-radius: 0 !important;
+}
+
+.bootstrap-select, button.btn.dropdown-toggle.bs-placeholder.btn-light {
+    padding-right: 1rem !important;
+}

templates/admin_associate_merge.html

@@ -3,7 +3,7 @@
 
 {% block content %}
 <form action="" method="post">{% csrf_token %}
-    <p>The following objects will be merged. Please select the 'master' record which you would like to keep. Other records will have associated events moved to the 'master' copy, and then will be deleted.</p>
+    <p>The following objects will be merged. Please select the 'master' record which you would like to keep. This may take some time.</p>
 
     <table>
     {% for form in forms %}
@@ -15,8 +15,8 @@
                     <th>{{ field.label }}</th>
                 {% endfor %}
             </tr>
-        {% endif %}     
-        
+        {% endif %}
+
         <tr>
             <td><input type="radio" name="master" value="{{form.instance.pk|unlocalize}}"></td>
             <td>{{form.instance.pk}}</td>
@@ -37,4 +37,4 @@
     <input type="submit" value="Merge them" />
     </div>
 </form>
-{% endblock %}
+{% endblock %}

templates/form_errors.html

@@ -1,13 +1,12 @@
 {% load nice_errors from filters %}
 {% if form.errors %}
-	<div class="alert alert-danger alert-dismissable">
-		<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+	<div class="alert alert-danger mb-0">
 		<dl>
 			{% with form|nice_errors as qq %}
 				{% for error_name,desc in qq.items %}
                 <span class="row">
-				    <dt class="col-4">{{error_name}}</dt>
-				    <dd class="col-8">{{desc}}</dd>
+				    <dt class="col-3">{{error_name}}</dt>
+				    <dd class="col-9">{{desc}}</dd>
                 </span>
 				{% endfor %}
 			{% endwith %}

templates/generic_detail.html

@@ -1,6 +1,7 @@
 {% extends override|default:"base_rigs.html" %}
 {% load widget_tweaks %}
 {% load button from filters %}
+{% load markdown_tags %}
 
 {% block content %}
     <div class="row">
@@ -22,7 +23,7 @@
                         <dd>{{ object.address|linebreaksbr }}</dd>
 
                         <dt>Notes</dt>
-                        <dd>{{ object.notes|linebreaksbr }}</dd>
+                        <dd>{{ object.notes|markdown }}</dd>
 
                         {% if object.three_phase_available is not None %}
                         <dt>Three Phase Available</dt>

templates/generic_form.html

@@ -1,6 +1,27 @@
 {% extends override|default:"base_rigs.html" %}
 {% load button from filters %}
 {% load widget_tweaks %}
+{% load static %}
+
+{% block css %}
+    {{ block.super }}
+    <link rel="stylesheet" type="text/css" href="{% static 'css/easymde.min.css' %}">
+{% endblock %}
+
+{% block preload_js %}
+    {{ block.super }}
+    <script src="{% static 'js/easymde.min.js' %}"></script>
+    <script src="{% static 'js/interaction.js' %}"></script>
+{% endblock %}
+
+{% block js %}
+    {{ block.super }}
+    <script>
+    $(document).ready(function () {
+        setupMDE('.md-enabled');
+    });
+    </script>
+{% endblock %}
 
 {% block content %}
 <div class="col">
@@ -43,7 +64,7 @@
                     <label for="{{ form.notes.id_for_label }}"
                            class="col-sm-2 control-label">{{ form.notes.label }}</label>
                     <div class="col-sm-10">
-                        {% render_field form.notes class+="form-control" placeholder=form.notes.label %}
+                        {% render_field form.notes class+="form-control md-enabled" placeholder=form.notes.label %}
                     </div>
                 </div>
                 {% if form.three_phase_available is not None %}

templates/index.html

@@ -16,8 +16,9 @@
                 <a class="list-group-item list-group-item-action" href="{% url 'rigboard' %}"><span class="fas fa-list align-middle"></span><span class="align-middle"> Rigboard</span></a>
                 <a class="list-group-item list-group-item-action" href="{% url 'web_calendar' %}"><span class="fas fa-calendar align-middle"></span><span class="align-middle"> Calendar</span></a>
                 {% if perms.RIGS.add_event %}
-                    <a class="list-group-item list-group-item-action" href="{% url 'event_create' %}"><span class="fas fa-plus align-middle"></span><span class="align-middle"> New Event</span></a>
+                    <a class="list-group-item list-group-item-action" href="{% url 'event_create' %}"><span class="fas fa-plus align-middle text-success"></span><span class="align-middle"> New Event</span></a>
                 {% endif %}
+                <a class="list-group-item list-group-item-action" href="{% url 'event_archive' %}"><span class="fas fa-book align-middle"></span><span class="align-middle"> Event Archive</span></a>
             </div>
         </div>
     </div>
@@ -29,11 +30,11 @@
             <div class="list-group list-group-flush">
                 <a class="list-group-item list-group-item-action" href="{% url 'asset_index' %}"><span class="fas fa-tag align-middle"></span><span class="align-middle"> Asset List</span></a>
                 {% if perms.assets.add_asset %}
-                    <a class="list-group-item list-group-item-action" href="{% url 'asset_create' %}"><span class="fas fa-plus align-middle"></span><span class="align-middle"> New Asset</span></a>
+                    <a class="list-group-item list-group-item-action" href="{% url 'asset_create' %}"><span class="fas fa-plus align-middle text-success"></span><span class="align-middle"> New Asset</span></a>
                 {% endif %}
                 <a class="list-group-item list-group-item-action" href="{% url 'supplier_list' %}"><span class="fas fa-parachute-box align-middle"></span><span class="align-middle"> Supplier List</span></a>
                 {% if perms.assets.add_supplier %}
-                    <a class="list-group-item list-group-item-action" href="{% url 'supplier_create' %}"><span class="fas fa-plus align-middle"></span><span class="align-middle"> New Supplier</span></a>
+                    <a class="list-group-item list-group-item-action" href="{% url 'supplier_create' %}"><span class="fas fa-plus align-middle text-success"></span><span class="align-middle"> New Supplier</span></a>
                 {% endif %}
             </div>
         </div>
@@ -43,10 +44,10 @@
             <img class="card-img-top d-none d-sm-block" src="{% static 'imgs/training.jpg' %}" alt="People watching a presentation" style="height: 150px; object-fit: cover;">
             <h4 class="card-header">Training Database</h4>
             <div class="list-group list-group-flush">
-                <a class="list-group-item list-group-item-action text-info" href="{% url 'trainee_detail' request.user.pk %}"><span class="fas fa-file-signature align-middle"></span><span class="align-middle"> My Training Record</span></a>
-                <a class="list-group-item list-group-item-action" href="{% url 'trainee_list' %}"><span class="fas fa-users"></span> Trainee List</a>
-                <a class="list-group-item list-group-item-action" href="{% url 'level_list' %}"><span class="fas fa-layer-group"></span> Level List</a></a>
-                <a class="list-group-item list-group-item-action" href="{% url 'item_list' %}"><span class="fas fa-sitemap"></span> Item List</a></a>
+                <a class="list-group-item list-group-item-action" href="{% url 'trainee_detail' request.user.pk %}"><span class="fas fa-file-signature align-middle text-info"></span><span class="align-middle"> My Training Record</span></a>
+                <a class="list-group-item list-group-item-action" href="{% url 'trainee_list' %}"><span class="fas fa-users"></span><span class="align-middle"> Trainee List</span></a>
+                <a class="list-group-item list-group-item-action" href="{% url 'level_list' %}"><span class="fas fa-layer-group"></span> <span class="align-middle">Level List</span></a>
+                <a class="list-group-item list-group-item-action" href="{% url 'item_list' %}"><span class="fas fa-sitemap"></span> <span class="align-middle">Item List</span></a>
             </div>
         </div>
     </div>
@@ -57,6 +58,7 @@
                     <a class="list-group-item list-group-item-action" href="https://forum.nottinghamtec.co.uk" target="_blank" rel="noopener noreferrer"><span class="fas fa-comment-alt text-primary align-middle"></span><span class="align-middle"> TEC Forum</span></a>
                     <a class="list-group-item list-group-item-action" href="//nottinghamtec.sharepoint.com" target="_blank" rel="noopener noreferrer"><span class="fas fa-folder text-info align-middle"></span><span class="align-middle"> TEC Sharepoint</span></a>
                     <a class="list-group-item list-group-item-action" href="//wiki.nottinghamtec.co.uk" target="_blank" rel="noopener noreferrer"><span class="fas fa-pen-square align-middle"></span><span class="align-middle"> TEC Wiki</span></a>
+                    <a class="list-group-item list-group-item-action" href="https://secure.jotformeu.com/UoNSU/accident_report_form?studentGroup=Media+or+Service+Group&mediaserviceGroup=TEC" target="_blank" rel="noopener noreferrer"><span class="fas fa-heartbeat  align-middle text-danger"></span><span class="align-middle"> H&S Report Form</span></a>
                     {% if perms.RIGS.change_event %}
                         <a class="list-group-item list-group-item-action" href="//members.nottinghamtec.co.uk/price" target="_blank" rel="noopener noreferrer"><span class="fas fa-pound-sign text-warning align-middle"></span><span class="align-middle"> Price List</span></a>
                     {% endif %}

templates/partials/button.html

@@ -4,6 +4,8 @@
 <a href="{% url target pk %}" class="btn {{ class }}" {% if id %}id="{{id}}"{%endif%} {% if style %}style="{{style}}"{%endif%} {% if text == 'Print' %}target="_blank"{%endif%}><span class="fas {{ icon }} align-middle"></span> <span class="d-none d-sm-inline align-middle">{{ text }}</span></a>
 {% elif copy %}
 <button class="btn btn-secondary btn-sm mr-1" data-clipboard-target="{{id}}" data-content="Copied to clipboard!"><span class="fas fa-copy"></span></button>
+{% elif today %}
+<button class="btn btn-info col-sm-2" onclick="var date = new Date(); $('#{{id}}').val([date.getFullYear(), ('0' + (date.getMonth()+1)).slice(-2), ('0' + date.getDate()).slice(-2)].join('-'))" tabindex="-1" type="button">Today</button>
 {% else %}
 <a href="{% url target %}" class="btn {{ class }}" {% if id %}id="{{id}}"{%endif%} {% if style %}style="{{style}}"{%endif%}><span class="fas {{ icon }} align-middle"></span> <span class="d-none d-sm-inline align-middle">{{ text }}</span></a>
 {% endif %}

templates/partials/search.html

@@ -1,38 +1,11 @@
 {% if user.is_authenticated %}
-<form id="searchForm" class="form-inline flex-nowrap mx-md-3 px-2 border border-light rounded w-75" role="form" method="GET" action="{% url 'event_archive' %}">
-    <div class="input-group input-group-sm flex-nowrap">
-        <div class="input-group-prepend">
-            <input id="id_search_input" type="search" name="q" class="form-control form-control-sm" placeholder="Search..." value="{{ request.GET.q }}" />
+<form id="searchForm" class="form-inline flex-nowrap mx-md-3 px-2 border border-light rounded" role="form" method="GET" action="{% url 'search' %}">
+    <div class="input-group">
+        <input id="id_search_input" type="search" name="q" class="form-control form-control-sm" placeholder="Search..." value="{{ request.GET.q }}" />
+        <div class="input-group-append">
+            <button class="btn btn-info form-control form-control-sm btn-sm"><span class="fas fa-search"></span><span class="sr-only"> Search</span></button>
         </div>
-        <select id="search-options" class="custom-select form-control" style="border-top-right-radius: 0px; border-bottom-right-radius: 0px; width: 15ch;">
-          <option selected data-action="{% url 'event_archive' %}" href="#">Events</option>
-          <option data-action="{% url 'person_list' %}" href="#">People</option>
-          <option data-action="{% url 'organisation_list' %}" href="#">Organisations</option>
-          <option data-action="{% url 'venue_list' %}" href="#">Venues</option>
-          {% if perms.RIGS.view_invoice %}
-          <option data-action="{% url 'invoice_archive' %}" href="#">Invoices</option>
-          {% endif %}
-          <option data-action="{% url 'asset_list' %}" href="#">Assets</option>
-          <option data-action="{% url 'supplier_list' %}" href="#">Suppliers</option>
-        </select>
     </div>
-    <button class="btn btn-info form-control form-control-sm btn-sm w-25" style="border-top-left-radius: 0px;border-bottom-left-radius: 0px;"><span class="fas fa-search"></span><span class="sr-only"> Search</span></button>
     <a href="{% url 'search_help' %}" class="nav-link modal-href ml-1"><span class="fas fa-question-circle"></span></a>
 </form>
 {% endif %}
-
-{% block js %}
-<script>
-    $('#search-options').change(function(){
-      $('#searchForm').attr('action', $(this).children('option:selected').data('action'));
-    });
-    $(document).ready(function(){
-        $('#id_search_input').keypress(function (e) {
-          if (e.which == 13) {
-            $('#searchForm').attr('action', $('#search-options option').first().data('action')).submit();
-            return false;
-          }
-        });
-    });
-</script>
-{% endblock %}

templates/registration/loginform.html

@@ -1,5 +1,10 @@
 {% load widget_tweaks %}
 {% include 'form_errors.html' %}
+{% if form.errors %}
+	<div class="alert alert-info">
+		<p><strong>Please note:</strong> If it has been more than a year since you last logged in, your account will have been automatically deactivated. Contact <a href="mailto:it@nottinghamtec.co.uk">it@nottinghamtec.co.uk</a> for assistance.</p>
+	</div>
+{% endif %}
 <div class="col-sm-6 offset-sm-3 col-lg-4 offset-lg-4">
     <form action="{% url 'login' %}" method="post" role="form" target="_self">{% csrf_token %}
         <div class="form-group">

templates/search_results.html

@@ -0,0 +1,48 @@
+{% extends "base_rigs.html" %}
+
+{% load to_class_name from filters %}
+{% load markdown_tags %}
+
+{% block content %}
+{% include 'partials/search.html' %}
+{% for object in object_list %}
+    {% with object|to_class_name as klass %}
+    <div class="card m-2">
+       <h4 class="card-header"><a href='{{ object.get_absolute_url }}'>[{{ klass }}] {{ object }}</a>
+       <small>
+       {% if klass == "Event" %}
+        {% if object.venue %}
+        <strong>Venue:</strong> {{ object.venue }}
+        {% endif %}
+        {% if object.is_rig %}
+        <strong>Client:</strong> {{ object.person.name }}
+        {% if object.organisation %}
+        for {{ object.organisation.name }}
+        {% endif %}
+        {% if object.dry_hire %}(Dry Hire){% endif %}
+        {% else %}
+        <strong>Non-Rig</strong>
+        {% endif %}
+        <strong>Times:</strong>
+        {{ object.start_date|date:"D d/m/Y" }}
+        {% if object.has_start_time %}
+        {{ object.start_time|date:"H:i" }}
+        {% endif %}
+        {% if object.end_date or object.has_end_time %}
+        &ndash;
+        {% endif %}
+        {% if object.end_date and object.end_date != object.start_date %}
+        {{ object.end_date|date:"D d/m/Y"  }}
+        {% endif %}
+        {% if object.has_end_time %}
+        {{ object.end_time|date:"H:i" }}
+        {% endif %}
+       {% endif %}
+       </small>
+       </h4>
+    </div>
+    {% endwith %}
+{% empty %}
+<h3 class="py-3 text-warning">No results found</h3>
+{% endfor %}
+{% endblock content %}

training/admin.py

@@ -2,10 +2,14 @@ from django.contrib import admin
 from training import models
 from reversion.admin import VersionAdmin
 
-# admin.site.register(models.Trainee, VersionAdmin)
+
 admin.site.register(models.TrainingCategory, VersionAdmin)
 admin.site.register(models.TrainingItem, VersionAdmin)
 admin.site.register(models.TrainingLevel, VersionAdmin)
-admin.site.register(models.TrainingItemQualification, VersionAdmin)
 admin.site.register(models.TrainingLevelQualification, VersionAdmin)
 admin.site.register(models.TrainingLevelRequirement, VersionAdmin)
+
+
+@admin.register(models.TrainingItemQualification)
+class TrainingItemQualificationAdmin(VersionAdmin):
+    list_display = ['__str__', 'trainee']

training/decorators.py

@@ -1,5 +1,5 @@
 from PyRIGS.decorators import user_passes_test_with_403
 
 
-def has_perm_or_supervisor(perm, login_url=None, oembed_view=None):
-    return user_passes_test_with_403(lambda u: (hasattr(u, 'is_supervisor') and u.is_supervisor) or u.has_perm(perm), login_url=login_url, oembed_view=oembed_view)
+def is_supervisor(login_url=None, oembed_view=None):
+    return user_passes_test_with_403(lambda u: (hasattr(u, 'is_supervisor') and u.is_supervisor))

training/forms.py

@@ -1,36 +1,50 @@
+import datetime
+
 from django import forms
 
 from training import models
-from RIGS.models import Profile
 
 
 class QualificationForm(forms.ModelForm):
+    related_models = {
+        'item': models.TrainingItem,
+        'supervisor': models.Trainee
+    }
+
     class Meta:
         model = models.TrainingItemQualification
         fields = '__all__'
 
-    def __init__(self, *args, **kwargs):
-        pk = kwargs.pop('pk', None)
-        super().__init__(*args, **kwargs)
-        self.fields['trainee'].initial = Profile.objects.get(pk=pk)
-        self.fields['date'].widget.format = '%Y-%m-%d'
-
     def clean_date(self):
-        date = self.cleaned_data['date']
+        date = self.cleaned_data.get('date')
         if date > date.today():
             raise forms.ValidationError('Qualification date may not be in the future')
         return date
 
     def clean_supervisor(self):
-        supervisor = self.cleaned_data['supervisor']
-        if supervisor.pk == self.cleaned_data['trainee'].pk:
+        supervisor = self.cleaned_data.get('supervisor')
+        if supervisor.pk == self.cleaned_data.get('trainee').pk:
             raise forms.ValidationError('One may not supervise oneself...')
-        if not supervisor.is_supervisor:
-            raise forms.ValidationError('Selected supervisor must actually *be* a supervisor...')
         return supervisor
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields['date'].widget.format = '%Y-%m-%d'
+
+
+class AddQualificationForm(QualificationForm):
+    def __init__(self, *args, **kwargs):
+        pk = kwargs.pop('pk', None)
+        super().__init__(*args, **kwargs)
+        if pk:
+            self.fields['trainee'].initial = models.Trainee.objects.get(pk=pk)
+
 
 class RequirementForm(forms.ModelForm):
+    related_models = {
+        'item': models.TrainingItem
+    }
+
     depth = forms.ChoiceField(choices=models.TrainingItemQualification.CHOICES)
 
     class Meta:
@@ -41,3 +55,26 @@ class RequirementForm(forms.ModelForm):
         pk = kwargs.pop('pk', None)
         super().__init__(*args, **kwargs)
         self.fields['level'].initial = models.TrainingLevel.objects.get(pk=pk)
+
+
+class SessionLogForm(forms.Form):
+    trainees = forms.ModelMultipleChoiceField(models.Trainee.objects.all())
+    items_0 = forms.ModelMultipleChoiceField(models.TrainingItem.objects.all(), required=False)
+    items_1 = forms.ModelMultipleChoiceField(models.TrainingItem.objects.all(), required=False)
+    items_2 = forms.ModelMultipleChoiceField(models.TrainingItem.objects.all(), required=False)
+    supervisor = forms.ModelChoiceField(models.Trainee.objects.all())
+    date = forms.DateField(initial=datetime.date.today)
+    notes = forms.CharField(required=False, widget=forms.Textarea)
+
+    related_models = {
+        'supervisor': models.Trainee
+    }
+
+    def clean_date(self):
+        return QualificationForm.clean_date(self)
+
+    def clean_supervisor(self):
+        supervisor = self.cleaned_data['supervisor']
+        if supervisor in self.cleaned_data.get('trainees', []):
+            raise forms.ValidationError('One may not supervise oneself...')
+        return supervisor

training/management/commands/generateSampleTrainingData.py

@@ -143,6 +143,15 @@ class Command(BaseCommand):
             "Bin Diving",
             "Wiki Editing"]
 
+        descriptions = [
+            "Physical training concentrates on mechanistic goals: training programs in this area develop specific motor skills, agility, strength or physical fitness, often with an intention of peaking at a particular time.",
+            "In military use, training means gaining the physical ability to perform and survive in combat, and learn the many skills needed in a time of war.",
+            "These include how to use a variety of weapons, outdoor survival skills, and how to survive being captured by the enemy, among many others.  See military education and training.",
+            "While some studies have indicated relaxation training is useful for some medical conditions, autogenic training has limited results or has been the result of few studies.",
+            "Some occupations are inherently hazardous, and require a minimum level of competence before the practitioners can perform the work at an acceptable level of safety to themselves or others in the vicinity.",
+            "Occupational diving, rescue, firefighting and operation of certain types of machinery and vehicles may require assessment and certification of a minimum acceptable competence before the person is allowed to practice as a licensed instructor."
+        ]
+
         for i, name in enumerate(names):
             category = random.choice(self.categories)
             previous_item = models.TrainingItem.objects.filter(category=category).last()
@@ -150,7 +159,7 @@ class Command(BaseCommand):
                 number = previous_item.reference_number + 1
             else:
                 number = 0
-            item = models.TrainingItem.objects.create(category=category, reference_number=number, name=name)
+            item = models.TrainingItem.objects.create(category=category, reference_number=number, name=name, description=random.choice(descriptions) + random.choice(descriptions) + random.choice(descriptions))
             self.items.append(item)
 
     def setup_levels(self):

training/management/commands/generate_sample_training_users.py

@@ -55,7 +55,7 @@ class Command(BaseCommand):
         supervisor = Profile.objects.create(username="supervisor", first_name="Super", last_name="Visor",
                                             initials="SV",
                                             email="supervisor@example.com", is_active=True,
-                                            is_staff=True, is_approved=True)
+                                            is_staff=True, is_approved=True, is_supervisor=True)
         supervisor.set_password('supervisor')
         supervisor.groups.add(Group.objects.get(name="Keyholders"))
         supervisor.save()

training/management/commands/import_old_db.py

@@ -104,19 +104,19 @@ class Command(BaseCommand):
                 obj, created = models.TrainingItem.objects.update_or_create(
                     pk=int(child.find('ID').text),
                     reference_number=number,
-                    name=name,
+                    description=name,
                     category=category,
                     active=active
                 )
             except IntegrityError:
-                print("Training Item {}.{} {} has a duplicate reference number".format(category.reference_number, number, name))
+                print(f"Training Item {category.reference_number}.{number} {name} has a duplicate reference number")
 
             if created:
                 tally[1] += 1
             else:
                 tally[0] += 1
 
-        print('Training Items - Updated: {}, Created: {}'.format(tally[0], tally[1]))
+        print(f'Training Items - Updated: {tally[0]}, Created: {tally[1]}')
 
     def import_TrainingItemQualification(self):
         tally = [0, 0, 0]
@@ -129,9 +129,9 @@ class Command(BaseCommand):
                       ("Competency_Assessed", models.TrainingItemQualification.PASSED_OUT), ]
 
             for (depth, depth_index) in depths:
-                if child.find('{}_Date'.format(depth)) is not None:
-                    if child.find('{}_Assessor_ID'.format(depth)) is None:
-                        print("Training Record #{} had no supervisor. Assigning System User.".format(child.find('ID').text))
+                if child.find(f'{depth}_Date') is not None:
+                    if child.find(f'{depth}_Assessor_ID') is None:
+                        print(f"Training Record #{child.find('ID').text} had no supervisor. Assigning System User.")
                         supervisor = Profile.objects.get(first_name="God")
                         continue
                     supervisor = Profile.objects.get(pk=self.id_map[child.find('{}_Assessor_ID'.format(depth)).text])

training/migrations/0003_trainingcategory_training_level.py

@@ -0,0 +1,19 @@
+# Generated by Django 3.2.11 on 2022-01-25 12:58
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('training', '0002_alter_traininglevel_options'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='trainingcategory',
+            name='training_level',
+            field=models.ForeignKey(help_text='If this is set, any user with the selected level may pass out users within this category, regardless of other status', null=True, on_delete=django.db.models.deletion.CASCADE, to='training.traininglevel'),
+        ),
+    ]

training/migrations/0004_rename_name_trainingitem_description.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.11 on 2022-01-30 11:59
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('training', '0003_trainingcategory_training_level'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='trainingitem',
+            old_name='name',
+            new_name='description',
+        ),
+    ]