Whoops

This reverts commit f5d875d153.

.coveragerc

@@ -1,3 +1,5 @@
 [run]
-plugins = django_coverage_plugin
-omit = */migrations/*, */tests/*
+omit = */migrations/*
+       */tests/*
+       */site-packages/*
+       */distutils/*

.github/workflows/django.yml

@@ -14,30 +14,33 @@ jobs:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - uses: actions/checkout@v2
-      - name: Cache Static Files
-        id: static-cache
-        uses: actions/cache@v2
-        with:
-            path: 'static/'
-            key: ${{ hashFiles('package-lock.json') }}-${{ hashFiles('pipeline/source_assets') }}
-      - uses: bahmutov/npm-install@v1
-        if: steps.static-cache.outputs.cache-hit != 'true'
-      - run: node node_modules/gulp/bin/gulp build
-        if: steps.static-cache.outputs.cache-hit != 'true'
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
             python-version: 3.9
-      - name: Cache python deps
-        uses: actions/cache@v2
+      - uses: actions/cache@v2
+        id: pcache
         with:
-            path: ${{ env.pythonLocation }}
-            key: ${{ env.pythonLocation }}-${{ hashFiles('Pipfile.lock') }}
+            path: ~/.local/share/virtualenvs
+            key: ${{ runner.os }}-pipenv-${{ hashFiles('Pipfile.lock') }}
+            restore-keys: |
+              ${{ runner.os }}-pipenv-
       - name: Install Dependencies
         run: |
               python -m pip install --upgrade pip
               pip install pipenv
               pipenv install -d
+        # if: steps.pcache.outputs.cache-hit != 'true'
+      - name: Cache Static Files
+        id: static-cache
+        uses: actions/cache@v2
+        with:
+            path: 'pipeline/built_assets'
+            key: ${{ hashFiles('package-lock.json') }}-${{ hashFiles('pipeline/source_assets') }}
+      - uses: bahmutov/npm-install@v1
+        if: steps.static-cache.outputs.cache-hit != 'true'
+      - run: node node_modules/gulp/bin/gulp build
+        if: steps.static-cache.outputs.cache-hit != 'true'
       - name: Basic Checks
         run: |
               pipenv run pycodestyle . --exclude=migrations,node_modules

Pipfile

@@ -85,11 +85,17 @@ coveralls = "*"
 django-coverage-plugin = "*"
 pytest-cov = "*"
 pytest-django = "*"
-pytest-xdist = {extras = ["psutil"], version = "==2.2.0"}
 pluggy = "*"
 pytest-splinter = "*"
 pytest = "*"
-pypom = {extras = ["splinter"], version = "*"}
 
 [requires]
 python_version = "3.9"
+
+[dev-packages.pytest-xdist]
+extras = [ "psutil",]
+version = "*"
+
+[dev-packages.PyPOM]
+extras = [ "splinter",]
+version = "*"

Pipfile.lock

@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "0753619e52ce97fd30a18327bdb679cc1ba3915a3fa617d29947c381d3929104"
+            "sha256": "4f5b2f535c10a1b2bcbb4f73aa01ccef700c679685311e740e47686b3942673c"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -176,11 +176,11 @@
         },
         "django": {
             "hashes": [
-                "sha256:169e2e7b4839a7910b393eec127fd7cbae62e80fa55f89c6510426abf673fe5f",
-                "sha256:c6c0462b8b361f8691171af1fb87eceb4442da28477e12200c40420176206ba7"
+                "sha256:32ce792ee9b6a0cbbec340123e229ac9f765dff8c2a4ae9247a14b2ba3a365a7",
+                "sha256:baf099db36ad31f970775d0be5587cc58a6256a6771a44eb795b554d45f211b8"
             ],
             "index": "pypi",
-            "version": "==3.1.6"
+            "version": "==3.1.7"
         },
         "django-debug-toolbar": {
             "hashes": [
@@ -279,7 +279,6 @@
                 "sha256:0d78f8fde1c230e99fe37986a60526d7049ed4bf8a9fadbad5f00e22e58e041d",
                 "sha256:b2e5b40261e20f354d198eae92afc10d750afb487ed5e50f9c4eaf07c184146f"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
             "version": "==1.1"
         },
         "icalendar": {
@@ -425,7 +424,6 @@
                 "sha256:ee957b9c60b6def20cbdf656d35859ce211eec02dafa3abb9d5ca937d32a3c3b",
                 "sha256:f9428d4b1f70af4f4560be4dccbbc5ab5308c00c5b62ed2f1c44ce9e2591b3d2"
             ],
-            "markers": "python_version >= '3.6'",
             "version": "==2.5.2"
         },
         "pillow": {
@@ -471,7 +469,6 @@
                 "sha256:15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0",
                 "sha256:966c145cd83c96502c3c3868f50408687b38434af77734af1e9ca461a4081d2d"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==0.13.1"
         },
         "premailer": {
@@ -669,10 +666,11 @@
         },
         "sentry-sdk": {
             "hashes": [
-                "sha256:3693cb47ba8d90c004ac002425770b32aaf0c83a846ec48e2d1364e7db1d072d"
+                "sha256:4ae8d1ced6c67f1c8ea51d82a16721c166c489b76876c9f2c202b8a50334b237",
+                "sha256:e75c8c58932bda8cd293ea8e4b242527129e1caaec91433d21b8b2f20fee030b"
             ],
             "index": "pypi",
-            "version": "==0.20.1"
+            "version": "==0.20.3"
         },
         "simplejson": {
             "hashes": [
@@ -739,6 +737,7 @@
                 "sha256:d3a5ea5b350423f47d07639f74475afedad48cf41c0ad7a82ca13a3928af34f6"
             ],
             "index": "pypi",
+            "markers": "python_version >= '3.0'",
             "version": "==2.2"
         },
         "sqlparse": {
@@ -776,7 +775,6 @@
                 "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b",
                 "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"
             ],
-            "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==0.10.2"
         },
         "tornado": {
@@ -1068,7 +1066,6 @@
                 "sha256:37228cda29411948b422fae072f57e31d3396d2ee1c9783775980ee9c9990af6",
                 "sha256:58587dd4dc3daefad0487f6d9ae32b4542b185e1c36db6993290e7c41ca2b47c"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==1.5"
         },
         "attrs": {
@@ -1076,7 +1073,6 @@
                 "sha256:31b2eced602aa8423c2aea9c76a724617ed67cf9513173fd3a4f03e3a929c7e6",
                 "sha256:832aa3cde19744e49938b91fea06d69ecb9e649c93ba974535d08ad92164f700"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==20.3.0"
         },
         "certifi": {
@@ -1147,7 +1143,6 @@
                 "sha256:fbb17c0d0822684b7d6c09915677a32319f16ff1115df5ec05bdcaaee40b35f3",
                 "sha256:fff1f3a586246110f34dc762098b5afd2de88de507559e63553d7da643053786"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'",
             "version": "==5.4"
         },
         "coveralls": {
@@ -1176,7 +1171,6 @@
                 "sha256:7a13113028b1e1cc4c6492b28098b3c6576c9dccc7973bfe47b342afadafb2ac",
                 "sha256:b73c5565e517f24b62dea8a5ceac178c661c4309d3aa0c3e420856c072c411b4"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
             "version": "==1.8.0"
         },
         "idna": {
@@ -1199,7 +1193,6 @@
                 "sha256:5b327ac1320dc863dca72f4514ecc086f31186744b84a230374cc1fd776feae5",
                 "sha256:67714da7f7bc052e064859c05c595155bd1ee9f69f76557e21f051443c20947a"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==20.9"
         },
         "pluggy": {
@@ -1207,7 +1200,6 @@
                 "sha256:15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0",
                 "sha256:966c145cd83c96502c3c3868f50408687b38434af77734af1e9ca461a4081d2d"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==0.13.1"
         },
         "psutil": {
@@ -1249,7 +1241,6 @@
                 "sha256:21b81bda15b66ef5e1a777a21c4dcd9c20ad3efd0b3f817e7a809035269e1bd3",
                 "sha256:3b80836aa6d1feeaa108e046da6423ab8f6ceda6468545ae8d02d9d58d18818a"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==1.10.0"
         },
         "pycodestyle": {
@@ -1305,7 +1296,6 @@
                 "sha256:6aa9ac7e00ad1a539c41bec6d21011332de671e938c7637378ec9710204e37ca",
                 "sha256:dc4147784048e70ef5d437951728825a131b81714b398d5d52f17c7c144d8815"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
             "version": "==1.3.0"
         },
         "pytest-splinter": {
@@ -1316,15 +1306,12 @@
             "version": "==3.3.1"
         },
         "pytest-xdist": {
-            "extras": [
-                "psutil"
-            ],
             "hashes": [
-                "sha256:1d8edbb1a45e8e1f8e44b1260583107fc23f8bc8da6d18cb331ff61d41258ecf",
-                "sha256:f127e11e84ad37cc1de1088cb2990f3c354630d428af3f71282de589c5bb779b"
+                "sha256:2447a1592ab41745955fb870ac7023026f20a5f0bfccf1b52a879bd193d46450",
+                "sha256:718887296892f92683f6a51f25a3ae584993b06f7076ce1e1fd482e59a8220a2"
             ],
             "index": "pypi",
-            "version": "==2.2.0"
+            "version": "==2.2.1"
         },
         "requests": {
             "hashes": [
@@ -1361,7 +1348,6 @@
                 "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b",
                 "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"
             ],
-            "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==0.10.2"
         },
         "urllib3": {

PyRIGS/settings.py

@@ -9,23 +9,18 @@ https://docs.djangoproject.com/en/1.7/ref/settings/
 """
 
 import datetime
-# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
-import os
+from pathlib import Path
 import secrets
 
 import sentry_sdk
 from sentry_sdk.integrations.django import DjangoIntegration
 from envparse import env
 
-BASE_DIR = os.path.dirname(os.path.dirname(__file__))
-
-# Quick-start development settings - unsuitable for production
-# See https://docs.djangoproject.com/en/1.7/howto/deployment/checklist/
+# Build paths inside the project like this: BASE_DIR / 'subdir'.
+BASE_DIR = Path(__file__).resolve(strict=True).parent.parent
 
 # SECURITY WARNING: keep the secret key used in production secret!
 SECRET_KEY = env('SECRET_KEY', default='gxhy(a#5mhp289_=6xx$7jh=eh$ymxg^ymc+di*0c*geiu3p_e')
-
-
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = env('DEBUG', cast=bool, default=True)
 STAGING = env('STAGING', cast=bool, default=False)
@@ -97,7 +92,7 @@ WSGI_APPLICATION = 'PyRIGS.wsgi.application'
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+        'NAME': str(BASE_DIR / 'db.sqlite3'),
     }
 }
 
@@ -235,19 +230,16 @@ DATETIME_INPUT_FORMATS = ('%Y-%m-%dT%H:%M', '%Y-%m-%dT%H:%M:%S')
 # Static files (CSS, JavaScript, Images)
 STATICFILES_STORAGE = 'whitenoise.storage.CompressedManifestStaticFilesStorage'
 STATIC_URL = '/static/'
-STATIC_ROOT = os.path.join(BASE_DIR, 'static/')
-STATIC_DIRS = [
-    os.path.join(BASE_DIR, 'static/'),
-]
+STATIC_ROOT = str(BASE_DIR / 'static/')
 STATICFILES_DIRS = [
-    os.path.join(BASE_DIR, 'pipeline/built_assets'),
+    str(BASE_DIR / 'pipeline/built_assets'),
 ]
 
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
         'DIRS': [
-            os.path.join(BASE_DIR, 'templates')
+            BASE_DIR / 'templates'
         ],
         'APP_DIRS': True,
         'OPTIONS': {
@@ -261,7 +253,7 @@ TEMPLATES = [
                 "django.template.context_processors.request",
                 "django.contrib.messages.context_processors.messages",
             ],
-            'debug': DEBUG or CI
+            'debug': DEBUG
         },
     },
 ]

PyRIGS/urls.py

@@ -27,13 +27,14 @@ urlpatterns = [
     path('', include('users.urls')),
 
     path('admin/', admin.site.urls),
+    path("robots.txt", TemplateView.as_view(template_name="robots.txt", content_type="text/plain")),
 ]
 
 if settings.DEBUG:
     urlpatterns += staticfiles_urlpatterns()
 
     import debug_toolbar
-    urlpatterns = [
+    urlpatterns += [
         path('__debug__/', include(debug_toolbar.urls)),
         path('bootstrap/', TemplateView.as_view(template_name="bootstrap.html")),
-    ] + urlpatterns
+    ]

RIGS/migrations/0042_auto_20210302_1121.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.1.7 on 2021-03-02 11:21
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('RIGS', '0041_auto_20210208_1603'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='profile',
+            name='phone',
+            field=models.CharField(blank=True, default='', max_length=13),
+        ),
+    ]

RIGS/models.py

@@ -21,7 +21,7 @@ from reversion.models import Version
 
 class Profile(AbstractUser):
     initials = models.CharField(max_length=5, unique=True, null=True, blank=False)
-    phone = models.CharField(max_length=13, null=True, default='')
+    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)
     # Currently only populated by the admin approval email. TODO: Populate it each time we send any email, might need that...
@@ -707,7 +707,7 @@ class RiskAssessment(models.Model, RevisionMixin):
         ]
 
     @cached_property
-    def fields(self):
+    def fieldz(self):
         return [n.name for n in list(self._meta.get_fields()) if n.name != 'reviewed_at' and n.name != 'reviewed_by' and not n.is_relation and not n.auto_created]
 
     @property
@@ -792,16 +792,16 @@ class EventChecklist(models.Model, RevisionMixin):
 
     inverted_fields = []
 
-    @cached_property
-    def fields(self):
-        return [n.name for n in list(self._meta.get_fields()) if n.name != 'reviewed_at' and n.name != 'reviewed_by' and not n.is_relation and not n.auto_created]
-
     class Meta:
         ordering = ['event']
         permissions = [
             ('review_eventchecklist', 'Can review Event Checklists')
         ]
 
+    @cached_property
+    def fieldz(self):
+        return [n.name for n in list(self._meta.get_fields()) if n.name != 'reviewed_at' and n.name != 'reviewed_by' and not n.is_relation and not n.auto_created]
+
     @property
     def activity_feed_string(self):
         return str(self.event)

RIGS/rigboard.py

@@ -11,7 +11,7 @@ import simplejson
 from PyPDF2 import PdfFileMerger, PdfFileReader
 from django.conf import settings
 from django.contrib import messages
-from django.contrib.staticfiles.storage import staticfiles_storage
+from django.contrib.staticfiles import finders
 from django.core import signing
 from django.core.exceptions import SuspiciousOperation
 from django.core.mail import EmailMultiAlternatives
@@ -274,6 +274,7 @@ class EventArchive(generic.ListView):
 class EventAuthorise(generic.UpdateView):
     template_name = 'eventauthorisation_form.html'
     success_template = 'eventauthorisation_success.html'
+    preview = False
 
     def form_valid(self, form):
         self.object = form.save()
@@ -301,6 +302,7 @@ class EventAuthorise(generic.UpdateView):
         context['page_title'] = "{}: {}".format(self.event.display_id, self.event.name)
         if self.event.dry_hire:
             context['page_title'] += ' <span class="badge badge-secondary align-top">Dry Hire</span>'
+        context['preview'] = self.preview
         return context
 
     def get(self, request, *args, **kwargs):
@@ -387,7 +389,7 @@ class EventAuthorisationRequest(generic.FormView, generic.detail.SingleObjectMix
             to=[email],
             reply_to=[self.request.user.email],
         )
-        css = staticfiles_storage.path('css/email.css')
+        css = finders.find('css/email.css')
         html = premailer.Premailer(get_template("eventauthorisation_client_request.html").render(context),
                                    external_styles=css).transform()
         msg.attach_alternative(html, 'text/html')
@@ -402,8 +404,7 @@ class EventAuthoriseRequestEmailPreview(generic.DetailView):
     model = models.Event
 
     def render_to_response(self, context, **response_kwargs):
-        from django.contrib.staticfiles.storage import staticfiles_storage
-        css = staticfiles_storage.path('css/email.css')
+        css = finders.find('css/email.css')
         response = super(EventAuthoriseRequestEmailPreview, self).render_to_response(context, **response_kwargs)
         assert isinstance(response, HttpResponse)
         response.content = premailer.Premailer(response.rendered_content, external_styles=css).transform()
@@ -417,4 +418,5 @@ class EventAuthoriseRequestEmailPreview(generic.DetailView):
             'sent_by': self.request.user.pk,
         })
         context['to_name'] = self.request.GET.get('to_name', None)
+        context['target'] = 'event_authorise_form_preview'
         return context

RIGS/signals.py

@@ -6,7 +6,7 @@ from io import BytesIO
 
 from PyPDF2 import PdfFileReader, PdfFileMerger
 from django.conf import settings
-from django.contrib.staticfiles.storage import staticfiles_storage
+from django.contrib.staticfiles import finders
 from django.core.cache import cache
 from django.core.mail import EmailMessage, EmailMultiAlternatives
 from django.db.models.signals import post_save
@@ -63,7 +63,7 @@ def send_eventauthorisation_success_email(instance):
         reply_to=[settings.AUTHORISATION_NOTIFICATION_ADDRESS],
     )
 
-    css = staticfiles_storage.path('css/email.css')
+    css = finders.find('css/email.css')
     html = Premailer(get_template("eventauthorisation_client_success.html").render(context),
                      external_styles=css).transform()
     client_email.attach_alternative(html, 'text/html')
@@ -121,7 +121,7 @@ def send_admin_awaiting_approval_email(user, request, **kwargs):
                 to=[admin.email],
                 reply_to=[user.email],
             )
-            css = staticfiles_storage.path('css/email.css')
+            css = finders.find('css/email.css')
             html = Premailer(get_template("admin_awaiting_approval.html").render(context),
                              external_styles=css).transform()
             email.attach_alternative(html, 'text/html')

RIGS/templates/base_rigs.html

@@ -74,6 +74,7 @@
 {% endblock %}
 
 {% block js %}
+{{ block.super }}
 <script src="{% static 'js/tooltip.js' %}"></script>
 <script src="{% static 'js/popover.js' %}"></script>
 <script>

RIGS/templates/event_archive.html

@@ -5,11 +5,13 @@
 {% load static %}
 
 {% block css %}
-    <link rel="stylesheet" href="{% static 'css/bootstrap-select.css' %}"/>
+    {{ block.super }}
+    <link rel="stylesheet" href="{% static 'css/selects.css' %}"/>
 {% endblock %}
 
 {% block preload_js %}
-    <script src="{% static 'js/bootstrap-select.js' %}"></script>
+    {{ block.super }}
+    <script src="{% static 'js/selects.js' %}" async></script>
 {% endblock %}
 
 {% block content %}

RIGS/templates/event_checklist_form.html

@@ -7,24 +7,18 @@
 
 {% block css %}
     {{ block.super }}
-    <link rel="stylesheet" href="{% static 'css/bootstrap-select.css' %}"/>
-    <link rel="stylesheet" href="{% static 'css/ajax-bootstrap-select.css' %}"/>
+    <link rel="stylesheet" href="{% static 'css/selects.css' %}"/>
 {% endblock %}
 
 {% block preload_js %}
     {{ block.super }}
-    <script src="{% static 'js/bootstrap-select.js' %}"></script>
-    <script src="{% static 'js/ajax-bootstrap-select.js' %}"></script>
+    <script src="{% static 'js/selects.js' %}"></script>
 {% endblock %}
 
 {% block js %}
     {{ block.super }}
-    <script src="{% static 'js/jquery-ui.js' %}"></script><!--TODO optimise-->
-    <script src="{% static 'js/interaction.js' %}"></script>
-    <script src="{% static 'js/modal.js' %}"></script>
-    <script src="{% static 'js/tooltip.js' %}"></script>
-
     <script src="{% static 'js/autocompleter.js' %}"></script>
+    <script src="{% static 'js/tooltip.js' %}"></script>
 
     {% include 'partials/datetime-fix.html' %}
 

RIGS/templates/event_detail.html

@@ -7,7 +7,7 @@
     {% if not request.is_ajax %}
         {% if perms.RIGS.view_event %}
         <div class="col-sm-12 text-right">
-            {% include 'event_detail_buttons.html' %}
+            {% include 'partials/event_detail_buttons.html' %}
         </div>
         {% endif %}
     {% endif %}
@@ -77,7 +77,7 @@
     {% endif %}
     {% if not request.is_ajax and perms.RIGS.view_event %}
     <div class="col-sm-12 text-right">
-        {% include 'event_detail_buttons.html' %}
+        {% include 'partials/event_detail_buttons.html' %}
     </div>
     {% endif %}
     {% if event.is_rig %}
@@ -97,7 +97,7 @@
         </div>
         {% if not request.is_ajax and perms.RIGS.view_event %}
         <div class="col-sm-12 text-right">
-            {% include 'event_detail_buttons.html' %}
+            {% include 'partials/event_detail_buttons.html' %}
         </div>
         {% endif %}
     {% endif %}

RIGS/templates/event_embed.html

@@ -1,8 +1,9 @@
 {% extends 'base_embed.html' %}
 {% load static %}
 
-{% block js %}
-<script src="{% static 'js/all.js' %}"></script>
+{% block extra-head %}
+<link href="{% static 'fontawesome_free/css/fontawesome.css' %}" rel="stylesheet" type="text/css">
+<link href="{% static 'fontawesome_free/css/solid.css' %}" rel="stylesheet" type="text/css">
 {% endblock %}
 
 {% block content %}

RIGS/templates/event_form.html

@@ -7,25 +7,19 @@
 
 {% block css %}
     {{ block.super }}
-    <link rel="stylesheet" href="{% static 'css/bootstrap-select.css' %}"/>
-    <link rel="stylesheet" href="{% static 'css/ajax-bootstrap-select.css' %}"/>
-    <link rel="stylesheet" href="{% static 'css/flatpickr.css' %}"/>
+    <link rel="stylesheet" type="text/css" href="{% static 'css/selects.css' %}"/>
 {% endblock %}
 
 {% block preload_js %}
     {{ block.super }}
-    <script src="{% static 'js/bootstrap-select.js' %}"></script>
-    <script src="{% static 'js/ajax-bootstrap-select.js' %}"></script>
+    <script src="{% static 'js/selects.js' %}"></script>
 {% endblock %}
 
 {% block js %}
     {{ block.super }}
-    <script src="{% static 'js/jquery-ui.js' %}"></script><!--TODO optimise--->
-    <script src="{% static 'js/interaction.js' %}"></script>
-    <script src="{% static 'js/modal.js' %}"></script>
-    <script src="{% static 'js/tooltip.js' %}"></script>
-
     <script src="{% static 'js/autocompleter.js' %}"></script>
+    <script src="{% static 'js/interaction.js' %}"></script>
+    <script src="{% static 'js/tooltip.js' %}"></script>
 
     {% include 'partials/datetime-fix.html' %}
 

RIGS/templates/event_print.xml

@@ -1,6 +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"/>

RIGS/templates/event_print_signature.xml

@@ -1,10 +0,0 @@
-<blockTable style="signatureTable" colWidths="50,120,60,120,35,110">
-    <tr>
-        <td>Signature</td>
-        <td></td>
-        <td>Print Name</td>
-        <td></td>
-        <td>Date</td>
-        <td></td>
-    </tr>
-</blockTable>

RIGS/templates/eventauthorisation_client_request.html

@@ -1,10 +1,10 @@
 {% extends 'base_client_email.html' %}
 
 {% block content %}
-    
+
     <p>Hi {{ to_name|default:"there" }},</p>
 
-    <p><b>{{ request.user.get_full_name }}</b> has requested that you authorise <b>N{{ object.pk|stringformat:"05d" }}
+    <p><b>{{ request.user.get_full_name }}</b> has requested that you authorise <b>{{ object.display_id }}
         | {{ object.name }}</b>{% if not to_name %} on behalf of <b>{{ object.person.name }}</b>{% endif %}.</p>
 
     <p>
@@ -23,7 +23,7 @@
             <table border="0" cellspacing="0" cellpadding="0">
               <tr>
                 <td class="button" align="center">
-                  <a href="{{ request.scheme }}://{{ request.get_host }}{% url 'event_authorise' object.pk hmac %}">
+                  <a href="{{ request.scheme }}://{{ request.get_host }}{% url target|default:'event_authorise' object.pk hmac %}">
                       Complete Authorisation Form
                   </a>
                 </td>

RIGS/templates/eventauthorisation_form.html

@@ -1,9 +1,6 @@
 {% extends 'eventauthorisation.html' %}
 {% load widget_tweaks %}
 
-{% block js %}
-{% endblock %}
-
 {% block authorisation %}
 <div class="row">
     <div class="col-sm-12">
@@ -86,7 +83,7 @@
 
                             <div class="text-right">
                                 <div class="btn-group">
-                                    <button class="btn btn-primary btn-lg" type="submit">Authorise</button>
+                                    <button class="btn btn-primary btn-lg" type="submit" {% if preview %}disabled="" data-toggle="tooltip" title="This is only a preview!"{%endif%}>Authorise</button>
                                 </div>
                             </div>
                         </div>

RIGS/templates/eventauthorisation_request.html

@@ -30,14 +30,6 @@
                         {% render_field form.email type="email" class+="form-control" %}
                     </div>
                 </div>
-                <div class="text-right col-sm-3 offset-sm-9">
-                    <div class="form-group">
-                        <button type="submit" class="form-control btn btn-primary">
-                            <i class="fas fa-paper-plane"></i>
-                            Send
-                        </button>
-                    </div>
-                </div>
             </form>
         </div>
     </div>
@@ -48,3 +40,14 @@
         });
     </script>
 {% endblock %}
+
+{% block footer %}
+<div class="form-row">
+    <div class="btn-group" role="group">
+        <a type="button" target="_blank" href="{% url 'event_authorise_preview' object.pk %}" class="btn btn-info text-nowrap"><span class="fas fa-drafting-compass"></span> Preview</a>
+        <button type="submit" class="form-control btn btn-primary" form="auth-request-form">
+            <span class="fas fa-paper-plane"></span> Send
+        </button>
+    </div>
+</div>
+{% endblock %}

RIGS/templates/hs_object_list.html

@@ -21,7 +21,7 @@
                             <th scope="col">Event</th>
                             {# mmm hax #}
                             {% if object_list.0 != None %}
-                                {% for field in object_list.0.fields %}
+                                {% for field in object_list.0.fieldz %}
                                     <th scope="col">{{ object_list.0|verbose_name:field|title }}</th>
                                 {% endfor %}
                             {% endif %}
@@ -33,7 +33,7 @@
                     <tr class="{% if object.reviewed_by %}table-success{%endif%}">
                         {# General #}
                         <th scope="row"><a href="{% url 'event_detail' object.event.pk %}">{{ object.event }}</a></th>
-                        {% for field in object_list.0.fields %}
+                        {% for field in object_list.0.fieldz %}
                             <td>{{ object|get_field:field }}</td>
                         {% endfor %}
                         {# Buttons #}

RIGS/templates/partials/auth_details.html

@@ -1,15 +1,15 @@
 <div class="card card-default
-    {% if object.authorised %}
-        card-success
+    {% if event.authorised %}
+        border-success
     {% elif event.authorisation and event.authorisation.amount != event.total and event.authorisation.last_edited_at > event.auth_request_at %}
-        card-warning
+        border-warning
     {% elif event.auth_request_to %}
-        card-info
+        border-info
     {% endif %}
     ">
     <div class="card-header">Client Authorisation</div>
     <div class="card-body row">
-        <dl class="col-md-6">
+        <dl class="col-sm-6">
             <dt>Authorisation Request</dt>
             <dd>{{ object.auth_request_to|yesno:"Yes,No" }}</dd>
 
@@ -22,8 +22,8 @@
             <dt>To</dt>
             <dd>{{ object.auth_request_to }}</dd>
         </dl>
-        <dd class="d-block d-sm-none">&nbsp;</dd>
-        <dl class="col-md-6">
+        <dl class="col-sm-6">
+            <hr class="d-block d-sm-none">
             <dt>Authorised</dt>
             <dd>{{ object.authorised|yesno:"Yes,No" }}</dd>
 

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
+                        btn-success active
                     {% elif event.authorisation and event.authorisation.amount != event.total and event.authorisation.last_edited_at > event.auth_request_at %}
                         btn-warning
                     {% elif event.auth_request_to %}
@@ -19,7 +19,7 @@
                     {% endif %}
                     "
                href="{% url 'event_authorise_request' object.pk %}">
-                <i class="fas fa-paper-plane"></i>
+                <span class="fas fa-paper-plane"></span>
                 <span class="d-none d-sm-inline">
                     {% if event.authorised %}
                         Authorised

RIGS/templates/partials/event_details.html

@@ -20,15 +20,7 @@
 
             {% if event.is_rig %}
                 <dt class="col-sm-6">Event MIC</dt>
-                <dd class="col-sm-6">
-                    {% if event.mic and perms.RIGS.view_profile %}
-                        <a href="{% url 'profile_detail' event.mic.pk %}" class="modal-href">
-                            {{ event.mic.name }}
-                        </a>
-                    {% else %}
-                        {{ event.mic.name }}
-                    {% endif %}
-                </dd>
+                <dd class="col-sm-6">{% include 'partials/linked_name.html' with profile=event.mic %}</dd>
             {% endif %}
 
             <dt class="col-sm-6">Status</dt>
@@ -71,7 +63,7 @@
 
             {% if event.dry_hire %}
                 <dt class="col-sm-6">Checked In By</dt>
-                <dd class="col-sm-6">{{ object.checked_in_by.name }}</dd>
+                <dd class="col-sm-6">{% include 'partials/linked_name.html' with profile=event.checked_in_by %}</dd>
             {% endif %}
 
             {% if event.is_rig %}

RIGS/templates/partials/linked_name.html

@@ -0,0 +1,7 @@
+{% if profile and perms.RIGS.view_profile %}
+    <a href="{% url 'profile_detail' profile.pk %}" class="modal-href">
+        {{ profile.name }}
+    </a>
+{% else %}
+    {{ profile.name }}
+{% endif %}

RIGS/templates/risk_assessment_form.html

@@ -6,24 +6,18 @@
 
 {% block css %}
     {{ block.super }}
-    <link rel="stylesheet" href="{% static 'css/bootstrap-select.css' %}"/>
-    <link rel="stylesheet" href="{% static 'css/ajax-bootstrap-select.css' %}"/>
+    <link rel="stylesheet" href="{% static 'css/selects.css' %}"/>
 {% endblock %}
 
 {% block preload_js %}
     {{ block.super }}
-    <script src="{% static 'js/bootstrap-select.js' %}"></script>
-    <script src="{% static 'js/ajax-bootstrap-select.js' %}"></script>
+    <script src="{% static 'js/selects.js' %}" async></script>
 {% endblock %}
 
 {% block js %}
     {{ block.super }}
-    <script src="{% static 'js/jquery-ui.js' %}"></script><!--TODO optimise--->
-    <script src="{% static 'js/interaction.js' %}"></script>
-    <script src="{% static 'js/modal.js' %}"></script>
-    <script src="{% static 'js/tooltip.js' %}"></script>
-
     <script src="{% static 'js/autocompleter.js' %}"></script>
+    <script src="{% static 'js/tooltip.js' %}"></script>
 
     <script>
         function parseBool(str) {

RIGS/templatetags/filters.py

@@ -173,7 +173,7 @@ def title_spaced(string):
 @register.filter(needs_autoescape=True)
 def namewithnotes(obj, url, autoescape=True):
     if hasattr(obj, 'notes') and obj.notes is not None and len(obj.notes) > 0:
-        return mark_safe(obj.name + " <a href='{}'><span class='far fa-sticky-note'></span></a>".format(reverse(url, kwargs={'pk': obj.pk})))
+        return mark_safe(obj.name + " <a href='{}'><span class='fas fa-sticky-note'></span></a>".format(reverse(url, kwargs={'pk': obj.pk})))
     else:
         return obj.name
 

RIGS/tests/pages.py

@@ -230,9 +230,11 @@ class CreateEventChecklist(FormPage):
     URL_TEMPLATE = 'event/{event_id}/checklist'
 
     _submit_locator = (By.XPATH, "//button[@type='submit' and contains(., 'Save')]")
-    _power_mic_selector = (By.XPATH, "//div[@id='id_power_mic-group']//div[contains(@class, 'bootstrap-select')]")
+    _power_mic_selector = (By.XPATH, "//div[select[@id='id_power_mic']]")
     _add_vehicle_locator = (By.XPATH, "//button[contains(., 'Vehicle')]")
     _add_crew_locator = (By.XPATH, "//button[contains(., 'Crew')]")
+    _vehicle_row_locator = ('xpath', "//tr[@id[starts-with(., 'vehicle') and not(contains(.,'new'))]]")
+    _crew_row_locator = ('xpath', "//tr[@id[starts-with(., 'crew') and not(contains(.,'new'))]]")
 
     form_items = {
         'safe_parking': (regions.CheckBox, (By.ID, 'id_safe_parking')),
@@ -271,16 +273,6 @@ class CreateEventChecklist(FormPage):
     def power_mic(self):
         return regions.BootstrapSelectElement(self, self.find_element(*self._power_mic_selector))
 
-    @property
-    def success(self):
-        return '{event_id}' not in self.driver.current_url
-
-
-class EditEventChecklist(CreateEventChecklist):
-    URL_TEMPLATE = '/event/checklist/{pk}/edit'
-    _vehicle_row_locator = ('xpath', "//tr[@id[starts-with(., 'vehicle') and not(contains(.,'new'))]]")
-    _crew_row_locator = ('xpath', "//tr[@id[starts-with(., 'crew') and not(contains(.,'new'))]]")
-
     @property
     def vehicles(self):
         return [self.VehicleRow(self, el) for el in self.find_elements(*self._vehicle_row_locator)]
@@ -323,6 +315,14 @@ class EditEventChecklist(CreateEventChecklist):
         def role(self):
             return regions.TextBox(self, self.root.find_element(*self._role_locator))
 
+    @property
+    def success(self):
+        return '{event_id}' not in self.driver.current_url
+
+
+class EditEventChecklist(CreateEventChecklist):
+    URL_TEMPLATE = '/event/checklist/{pk}/edit'
+
     @property
     def success(self):
         return 'edit' not in self.driver.current_url

RIGS/tests/test_interaction.py

@@ -16,6 +16,7 @@ from RIGS import models
 from RIGS.tests import regions
 from . import pages
 import pytest
+import time as t
 
 
 pytestmark = pytest.mark.django_db(transaction=True)
@@ -667,7 +668,7 @@ def test_ra_edit(logged_in_browser, live_server, ra):
     assert ra.nonstandard_equipment == nse
 
 
-def small_ec(page):
+def small_ec(page, admin_user):
     page.safe_parking = True
     page.safe_packing = True
     page.exits = True
@@ -688,7 +689,7 @@ def small_ec(page):
 
 def test_ec_create_small(logged_in_browser, live_server, admin_user, ra):
     page = pages.CreateEventChecklist(logged_in_browser.driver, live_server.url, event_id=ra.event.pk).open()
-    small_ec(page)
+    small_ec(page, admin_user)
     page.submit()
     assert page.success
 
@@ -733,12 +734,15 @@ def test_ec_create_medium(logged_in_browser, live_server, admin_user, medium_ra)
 
 def test_ec_create_vehicle(logged_in_browser, live_server, admin_user, checklist):
     page = pages.EditEventChecklist(logged_in_browser.driver, live_server.url, pk=checklist.pk).open()
-    small_ec(page)
+    small_ec(page, admin_user)
     page.add_vehicle()
     assert len(page.vehicles) == 1
     vehicle_name = 'Brian'
     page.vehicles[0].name.set_value(vehicle_name)
+    # Appears we're moving too fast for javascript...
+    t.sleep(1)
     page.vehicles[0].vehicle.search(admin_user.first_name)
+    t.sleep(1)
     page.submit()
     assert page.success
     # Check data is correct
@@ -750,17 +754,19 @@ def test_ec_create_vehicle(logged_in_browser, live_server, admin_user, checklist
 # TODO Test validation of end before start
 def test_ec_create_crew(logged_in_browser, live_server, admin_user, checklist):
     page = pages.EditEventChecklist(logged_in_browser.driver, live_server.url, pk=checklist.pk).open()
-    small_ec(page)
+    small_ec(page, admin_user)
     page.add_crew()
     assert len(page.crew) == 1
     role = "MIC"
     start_time = timezone.make_aware(datetime.datetime(2015, 1, 1, 9, 0))
     end_time = timezone.make_aware(datetime.datetime(2015, 1, 1, 10, 30))
     crew = page.crew[0]
+    t.sleep(2)
+    crew.crewmember.search(admin_user.first_name)
+    t.sleep(2)
     crew.role.set_value(role)
     crew.start_time.set_value(start_time)
     crew.end_time.set_value(end_time)
-    crew.crewmember.search(admin_user.first_name)
     page.submit()
     assert page.success
     # Check data is correct

RIGS/urls.py

@@ -132,6 +132,8 @@ urlpatterns = [
          name='event_authorise_preview'),
     re_path(r'^event/(?P<pk>\d+)/(?P<hmac>[-:\w]+)/$', rigboard.EventAuthorise.as_view(),
             name='event_authorise'),
+    re_path(r'^event/(?P<pk>\d+)/(?P<hmac>[-:\w]+)/preview/$', rigboard.EventAuthorise.as_view(preview=True),
+            name='event_authorise_form_preview'),
 
     # ICS Calendar - API key authentication
     re_path(r'^ical/(?P<api_pk>\d+)/(?P<api_key>\w+)/rigs.ics$', api_key_required(ical.CalendarICS()),

assets/templates/asset_audit_list.html

@@ -4,9 +4,6 @@
 {% load widget_tweaks %}
 
 {% block js %}
-    <script src="{% static 'js/jquery-ui.js' %}"></script>
-    <script src="{% static "js/interaction.js" %}"></script>
-    <script src="{% static "js/modal.js" %}"></script>
     <script>
     $('document').ready(function(){
         $('#asset-search-form').submit(function () {

assets/templates/asset_form.html

@@ -3,13 +3,17 @@
 {% load static %}
 
 {% block css %}
-    <link rel="stylesheet" href="{% static 'css/bootstrap-select.css' %}"/>
-    <link rel="stylesheet" href="{% static 'css/ajax-bootstrap-select.css' %}"/>
+    {{ block.super }}
+    <link rel="stylesheet" href="{% static 'css/selects.css' %}"/>
+{% endblock %}
+
+{% block preload_js %}
+    {{ block.super }}
+    <script src="{% static 'js/selects.js' %}"></script>
 {% endblock %}
 
 {% block js %}
-    <script src="{% static 'js/bootstrap-select.js' %}"></script>
-    <script src="{% static 'js/ajax-bootstrap-select.js' %}"></script>
+    {{ block.super }}
     <script src="{% static 'js/autocompleter.js' %}"></script>
     <script>
         const matches = window.matchMedia("(prefers-reduced-motion: reduce)").matches || window.matchMedia("(update: slow)").matches;

assets/templates/asset_list.html

@@ -5,16 +5,17 @@
 {% load static %}
 
 {% block css %}
-    <link rel="stylesheet" href="{% static 'css/bootstrap-select.css' %}"/>
-    <link rel="stylesheet" href="{% static 'css/ajax-bootstrap-select.css' %}"/>
+    {{ block.super }}
+    <link rel="stylesheet" href="{% static 'css/selects.css' %}"/>
 {% endblock %}
 
 {% block preload_js %}
-    <script src="{% static 'js/bootstrap-select.js' %}"></script>
-    <script src="{% static 'js/ajax-bootstrap-select.js' %}"></script>
+    {{ block.super }}
+    <script src="{% static 'js/selects.js' %}" async></script>
 {% endblock %}
 
 {% block js %}
+    {{ block.super }}
     <script>
         //Get querystring value
         function getParameterByName(name) {

assets/templates/partials/asset_buttons.html

@@ -5,7 +5,7 @@
     {% button 'submit' %}
     {% elif duplicate %}
     <!--duplicate-->
-    <button type="submit" class="btn btn-success"><i class="fas fa-check"></i> Create Duplicate</button>
+    <button type="submit" class="btn btn-success"><span class="fas fa-check"></span> Create Duplicate</button>
     {% else %}
     <!--detail view-->
     <div class="btn-group">

assets/tests/pages.py

@@ -17,6 +17,7 @@ class AssetList(BasePage):
     _status_select_locator = (By.CSS_SELECTOR, 'div#status-group>div.bootstrap-select')
     _category_select_locator = (By.CSS_SELECTOR, 'div#category-group>div.bootstrap-select')
     _go_button_locator = (By.ID, 'id_search')
+    _filter_button_locator = (By.ID, 'filter-submit')
 
     class AssetListRow(Region):
         _asset_id_locator = (By.CLASS_NAME, "assetID")
@@ -56,6 +57,9 @@ class AssetList(BasePage):
     def search(self):
         self.find_element(*self._go_button_locator).click()
 
+    def filter(self):
+        self.find_element(*self._filter_button_locator).click()
+
     @property
     def status_selector(self):
         return regions.BootstrapSelectElement(self, self.find_element(*self._status_select_locator))

assets/tests/test_interaction.py

@@ -78,7 +78,7 @@ class TestAssetList(AutoLoginTest):
         self.page.status_selector.select_all()
         self.page.status_selector.toggle()
         self.assertFalse(self.page.status_selector.is_open)
-        self.page.search()
+        self.page.filter()
         self.assertTrue(len(self.page.assets) == 4)
 
         self.page.category_selector.toggle()
@@ -86,7 +86,7 @@ class TestAssetList(AutoLoginTest):
         self.page.category_selector.set_option("Sound", True)
         self.page.category_selector.close()
         self.assertFalse(self.page.category_selector.is_open)
-        self.page.search()
+        self.page.filter()
         self.assertTrue(len(self.page.assets) == 2)
         asset_ids = list(map(lambda x: x.id, self.page.assets))
         self.assertEqual("1", asset_ids[0])
@@ -128,19 +128,18 @@ class TestAssetForm(AutoLoginTest):
         self.page.serial_number = sn = "0124567890-SAUSAGE"
         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.date_acquired = acquired = datetime.date(2020, 5, 2)
         self.page.purchased_from_selector.toggle()
         self.assertTrue(self.page.purchased_from_selector.is_open)
         self.page.purchased_from_selector.search(self.supplier.name[:-8])
         self.page.purchased_from_selector.set_option(self.supplier.name, True)
-        self.page.purchase_price = "12.99"
-        self.page.salvage_value = "99.12"
-        self.page.date_acquired = acquired = datetime.date(2020, 5, 2)
 
         self.page.parent_selector.toggle()
         self.assertTrue(self.page.parent_selector.is_open)
         option = str(self.parent)
         self.page.parent_selector.search(option)
-        # Needed here but not earlier for whatever reason
         self.driver.implicitly_wait(1)
         self.page.parent_selector.set_option(option, True)
         self.assertTrue(self.page.parent_selector.options[0].selected)

gulpfile.js

@@ -12,17 +12,27 @@ const browsersync = require('browser-sync').create();
 const { exec } = require("child_process");
 const spawn = require('child_process').spawn;
 const cssnano = require('cssnano');
+const con = require('gulp-concat');
+const gulpif = require('gulp-if');
 
 sass.compiler = require('node-sass');
 
+function fonts(done) {
+    return gulp.src('node_modules/@fortawesome/fontawesome-free/webfonts/fa-solid-900.*')
+        .pipe(gulp.dest('pipeline/built_assets/fonts'))
+        .pipe(browsersync.stream());
+}
+
 function styles(done) {
+    const bs_select = ["bootstrap-select.css", "ajax-bootstrap-select.css"]
     return gulp.src(['pipeline/source_assets/scss/**/*.scss',
                     'node_modules/fullcalendar/main.css',
                     'node_modules/bootstrap-select/dist/css/bootstrap-select.css',
                     'node_modules/ajax-bootstrap-select/dist/css/ajax-bootstrap-select.css',
-                    'node_modules/flatpickr/dist/flatpickr.css'])
+                    'node_modules/flatpickr/dist/flatpickr.css',])
     .pipe(sourcemaps.init())
     .pipe(sass().on('error', sass.logError))
+    .pipe(gulpif(function(file) { return bs_select.includes(file.relative);}, con('selects.css')))
     .pipe(postcss([ autoprefixer(), cssnano() ]))
     .pipe(sourcemaps.write())
     .pipe(gulp.dest('pipeline/built_assets/css'))
@@ -30,12 +40,14 @@ function styles(done) {
 }
 
 function scripts() {
-    return gulp.src(['pipeline/source_assets/js/**/*.js',
-                    'node_modules/jquery/dist/jquery.js',
+    const dest = 'pipeline/built_assets/js';
+    const base_scripts = ["src.js", "util.js", "alert.js", "collapse.js", "dropdown.js", "modal.js", "konami.js"];
+    const bs_select = ["bootstrap-select.js", "ajax-bootstrap-select.js"]
+    const interaction = ["html5sortable.min.js", "interaction.js"]
+    const jpop = ["jquery.min.js", "popper.min.js"]
+    return gulp.src(['node_modules/jquery/dist/jquery.min.js',
                     /* JQuery Plugins */
-                    'node_modules/jquery-ui-dist/jquery-ui.js',
-
-                    'node_modules/popper.js/dist/umd/popper.js',
+                    'node_modules/popper.js/dist/umd/popper.min.js',
                     /* Bootstrap Plugins */
                     'node_modules/bootstrap/js/dist/util.js',
                     'node_modules/bootstrap/js/dist/tooltip.js',
@@ -45,17 +57,22 @@ function scripts() {
                     'node_modules/bootstrap/js/dist/modal.js',
                     'node_modules/bootstrap/js/dist/alert.js',
 
+                    'node_modules/html5sortable/dist/html5sortable.min.js',
                     'node_modules/clipboard/dist/clipboard.min.js',
                     'node_modules/flatpickr/dist/flatpickr.min.js',
-                    'node_modules/@fortawesome/fontawesome-free/js/all.js',
                     'node_modules/moment/moment.js',
                     'node_modules/fullcalendar/main.js',
                     'node_modules/bootstrap-select/dist/js/bootstrap-select.js',
                     'node_modules/ajax-bootstrap-select/dist/js/ajax-bootstrap-select.js',
-                    'node_modules/konami/konami.js'])
+                    'node_modules/konami/konami.js',
+                    'pipeline/source_assets/js/**/*.js',])
+    .pipe(gulpif(function(file) { return base_scripts.includes(file.relative);}, con('base.js')))
+    .pipe(gulpif(function(file) { return bs_select.includes(file.relative);}, con('selects.js')))
+    .pipe(gulpif(function(file) { return interaction.includes(file.relative);}, con('interaction.js')))
+    .pipe(gulpif(function(file) { return jpop.includes(file.relative);}, con('jpop.js')))
     .pipe(flatten())
     .pipe(terser())
-    .pipe(gulp.dest('pipeline/built_assets/js'))
+    .pipe(gulp.dest(dest))
     .pipe(browsersync.stream());
 }
 
@@ -82,5 +99,5 @@ function watchFiles() {
   gulp.watch("**/templates/*.html", browserSyncReload);
 }
 
-exports.build = gulp.parallel(styles, scripts);
+exports.build = gulp.parallel(styles, scripts, fonts);
 exports.watch = gulp.parallel(watchFiles, browserSync);

package-lock.json

@@ -5,12 +5,11 @@
   "requires": true,
   "packages": {
     "": {
-      "name": "PyRIGS",
       "version": "1.0.0",
       "license": "Custom",
       "dependencies": {
         "@forevolve/bootstrap-dark": "^1.0.0-alpha.1075",
-        "@fortawesome/fontawesome-free": "^5.13.1",
+        "@fortawesome/fontawesome-free": "^5.15.2",
         "ajax-bootstrap-select": "^1.4.5",
         "autocompleter": "^6.0.3",
         "autoprefixer": "^9.8.0",
@@ -21,13 +20,15 @@
         "flatpickr": "^4.6.6",
         "fullcalendar": "^5.3.2",
         "gulp": "^4.0.2",
+        "gulp-concat": "^2.6.1",
         "gulp-flatten": "^0.4.0",
+        "gulp-if": "^3.0.0",
         "gulp-postcss": "^8.0.0",
         "gulp-sass": "^4.1.0",
         "gulp-sourcemaps": "^2.6.5",
         "gulp-uglify": "^3.0.2",
+        "html5sortable": "^0.10.0",
         "jquery": "^3.5.1",
-        "jquery-ui-dist": "^1.12.1",
         "konami": "^1.6.2",
         "moment": "^2.27.0",
         "node-sass": "^5.0.0",
@@ -1006,7 +1007,6 @@
       "dependencies": {
         "anymatch": "~3.1.1",
         "braces": "~3.0.2",
-        "fsevents": "~2.3.1",
         "glob-parent": "~5.1.0",
         "is-binary-path": "~2.1.0",
         "is-glob": "~4.0.1",
@@ -1349,6 +1349,14 @@
         "typedarray": "^0.0.6"
       }
     },
+    "node_modules/concat-with-sourcemaps": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz",
+      "integrity": "sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==",
+      "dependencies": {
+        "source-map": "^0.6.1"
+      }
+    },
     "node_modules/connect": {
       "version": "3.6.6",
       "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.6.tgz",
@@ -1874,6 +1882,30 @@
         "node": ">=8"
       }
     },
+    "node_modules/duplexify": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-4.1.1.tgz",
+      "integrity": "sha512-DY3xVEmVHTv1wSzKNbwoU6nVjzI369Y6sPoqfYr0/xlx3IdX2n94xIszTcjPO8W8ZIv0Wb0PXNcjuZyT4wiICA==",
+      "dependencies": {
+        "end-of-stream": "^1.4.1",
+        "inherits": "^2.0.3",
+        "readable-stream": "^3.1.1",
+        "stream-shift": "^1.0.0"
+      }
+    },
+    "node_modules/duplexify/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/each-props": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/each-props/-/each-props-1.3.2.tgz",
@@ -2699,6 +2731,11 @@
         "node": "*"
       }
     },
+    "node_modules/fork-stream": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/fork-stream/-/fork-stream-0.0.4.tgz",
+      "integrity": "sha1-24Sfznf2cIpfjzhq5TOgkHtUrnA="
+    },
     "node_modules/form-data": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
@@ -3066,7 +3103,6 @@
         "anymatch": "^2.0.0",
         "async-each": "^1.0.1",
         "braces": "^2.3.2",
-        "fsevents": "^1.2.7",
         "glob-parent": "^3.1.0",
         "inherits": "^2.0.3",
         "is-binary-path": "^1.0.0",
@@ -3462,6 +3498,19 @@
         "object.assign": "^4.1.0"
       }
     },
+    "node_modules/gulp-concat": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/gulp-concat/-/gulp-concat-2.6.1.tgz",
+      "integrity": "sha1-Yz0WyV2IUEYorQJmVmPO5aR5M1M=",
+      "dependencies": {
+        "concat-with-sourcemaps": "^1.0.0",
+        "through2": "^2.0.0",
+        "vinyl": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
     "node_modules/gulp-flatten": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/gulp-flatten/-/gulp-flatten-0.4.0.tgz",
@@ -3536,6 +3585,33 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/gulp-if": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/gulp-if/-/gulp-if-3.0.0.tgz",
+      "integrity": "sha512-fCUEngzNiEZEK2YuPm+sdMpO6ukb8+/qzbGfJBXyNOXz85bCG7yBI+pPSl+N90d7gnLvMsarthsAImx0qy7BAw==",
+      "dependencies": {
+        "gulp-match": "^1.1.0",
+        "ternary-stream": "^3.0.0",
+        "through2": "^3.0.1"
+      }
+    },
+    "node_modules/gulp-if/node_modules/through2": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz",
+      "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==",
+      "dependencies": {
+        "inherits": "^2.0.4",
+        "readable-stream": "2 || 3"
+      }
+    },
+    "node_modules/gulp-match": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/gulp-match/-/gulp-match-1.1.0.tgz",
+      "integrity": "sha512-DlyVxa1Gj24DitY2OjEsS+X6tDpretuxD6wTfhXE/Rw2hweqc1f6D/XtsJmoiCwLWfXgR87W9ozEityPCVzGtQ==",
+      "dependencies": {
+        "minimatch": "^3.0.3"
+      }
+    },
     "node_modules/gulp-postcss": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/gulp-postcss/-/gulp-postcss-8.0.0.tgz",
@@ -3996,6 +4072,11 @@
       "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.2.tgz",
       "integrity": "sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ=="
     },
+    "node_modules/html5sortable": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/html5sortable/-/html5sortable-0.10.0.tgz",
+      "integrity": "sha512-/F2sUHnSlqXY8Pg1AxLjR5i/ijngpkl2u1x6a6JfwSsoVRZ5b/ZO9MDZopSSzjo7bTZinQbXACTrZI6mpGugMw=="
+    },
     "node_modules/http-errors": {
       "version": "1.7.3",
       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz",
@@ -4564,11 +4645,6 @@
       "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz",
       "integrity": "sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg=="
     },
-    "node_modules/jquery-ui-dist": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/jquery-ui-dist/-/jquery-ui-dist-1.12.1.tgz",
-      "integrity": "sha1-XAgV08xvkP9fqvWyaKbiO0ypBPo="
-    },
     "node_modules/js-base64": {
       "version": "2.6.4",
       "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz",
@@ -4621,9 +4697,6 @@
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz",
       "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=",
       "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.6"
-      },
       "optionalDependencies": {
         "graceful-fs": "^4.1.6"
       }
@@ -5281,6 +5354,11 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
+    },
     "node_modules/micromatch": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
@@ -8334,6 +8412,26 @@
         "node": ">=10"
       }
     },
+    "node_modules/ternary-stream": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/ternary-stream/-/ternary-stream-3.0.0.tgz",
+      "integrity": "sha512-oIzdi+UL/JdktkT+7KU5tSIQjj8pbShj3OASuvDEhm0NT5lppsm7aXWAmAq4/QMaBIyfuEcNLbAQA+HpaISobQ==",
+      "dependencies": {
+        "duplexify": "^4.1.1",
+        "fork-stream": "^0.0.4",
+        "merge-stream": "^2.0.0",
+        "through2": "^3.0.1"
+      }
+    },
+    "node_modules/ternary-stream/node_modules/through2": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz",
+      "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==",
+      "dependencies": {
+        "inherits": "^2.0.4",
+        "readable-stream": "2 || 3"
+      }
+    },
     "node_modules/tfunk": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/tfunk/-/tfunk-4.0.0.tgz",
@@ -10328,6 +10426,14 @@
         "typedarray": "^0.0.6"
       }
     },
+    "concat-with-sourcemaps": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz",
+      "integrity": "sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==",
+      "requires": {
+        "source-map": "^0.6.1"
+      }
+    },
     "connect": {
       "version": "3.6.6",
       "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.6.tgz",
@@ -10745,6 +10851,29 @@
         "is-obj": "^2.0.0"
       }
     },
+    "duplexify": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-4.1.1.tgz",
+      "integrity": "sha512-DY3xVEmVHTv1wSzKNbwoU6nVjzI369Y6sPoqfYr0/xlx3IdX2n94xIszTcjPO8W8ZIv0Wb0PXNcjuZyT4wiICA==",
+      "requires": {
+        "end-of-stream": "^1.4.1",
+        "inherits": "^2.0.3",
+        "readable-stream": "^3.1.1",
+        "stream-shift": "^1.0.0"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        }
+      }
+    },
     "each-props": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/each-props/-/each-props-1.3.2.tgz",
@@ -11425,6 +11554,11 @@
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
       "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
     },
+    "fork-stream": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/fork-stream/-/fork-stream-0.0.4.tgz",
+      "integrity": "sha1-24Sfznf2cIpfjzhq5TOgkHtUrnA="
+    },
     "form-data": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
@@ -12047,6 +12181,16 @@
         }
       }
     },
+    "gulp-concat": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/gulp-concat/-/gulp-concat-2.6.1.tgz",
+      "integrity": "sha1-Yz0WyV2IUEYorQJmVmPO5aR5M1M=",
+      "requires": {
+        "concat-with-sourcemaps": "^1.0.0",
+        "through2": "^2.0.0",
+        "vinyl": "^2.0.0"
+      }
+    },
     "gulp-flatten": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/gulp-flatten/-/gulp-flatten-0.4.0.tgz",
@@ -12102,6 +12246,35 @@
         }
       }
     },
+    "gulp-if": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/gulp-if/-/gulp-if-3.0.0.tgz",
+      "integrity": "sha512-fCUEngzNiEZEK2YuPm+sdMpO6ukb8+/qzbGfJBXyNOXz85bCG7yBI+pPSl+N90d7gnLvMsarthsAImx0qy7BAw==",
+      "requires": {
+        "gulp-match": "^1.1.0",
+        "ternary-stream": "^3.0.0",
+        "through2": "^3.0.1"
+      },
+      "dependencies": {
+        "through2": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz",
+          "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==",
+          "requires": {
+            "inherits": "^2.0.4",
+            "readable-stream": "2 || 3"
+          }
+        }
+      }
+    },
+    "gulp-match": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/gulp-match/-/gulp-match-1.1.0.tgz",
+      "integrity": "sha512-DlyVxa1Gj24DitY2OjEsS+X6tDpretuxD6wTfhXE/Rw2hweqc1f6D/XtsJmoiCwLWfXgR87W9ozEityPCVzGtQ==",
+      "requires": {
+        "minimatch": "^3.0.3"
+      }
+    },
     "gulp-postcss": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/gulp-postcss/-/gulp-postcss-8.0.0.tgz",
@@ -12479,6 +12652,11 @@
       "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.2.tgz",
       "integrity": "sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ=="
     },
+    "html5sortable": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/html5sortable/-/html5sortable-0.10.0.tgz",
+      "integrity": "sha512-/F2sUHnSlqXY8Pg1AxLjR5i/ijngpkl2u1x6a6JfwSsoVRZ5b/ZO9MDZopSSzjo7bTZinQbXACTrZI6mpGugMw=="
+    },
     "http-errors": {
       "version": "1.7.3",
       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz",
@@ -12898,11 +13076,6 @@
       "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz",
       "integrity": "sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg=="
     },
-    "jquery-ui-dist": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/jquery-ui-dist/-/jquery-ui-dist-1.12.1.tgz",
-      "integrity": "sha1-XAgV08xvkP9fqvWyaKbiO0ypBPo="
-    },
     "js-base64": {
       "version": "2.6.4",
       "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz",
@@ -13481,6 +13654,11 @@
         "trim-newlines": "^1.0.0"
       }
     },
+    "merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
+    },
     "micromatch": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
@@ -15960,6 +16138,28 @@
         }
       }
     },
+    "ternary-stream": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/ternary-stream/-/ternary-stream-3.0.0.tgz",
+      "integrity": "sha512-oIzdi+UL/JdktkT+7KU5tSIQjj8pbShj3OASuvDEhm0NT5lppsm7aXWAmAq4/QMaBIyfuEcNLbAQA+HpaISobQ==",
+      "requires": {
+        "duplexify": "^4.1.1",
+        "fork-stream": "^0.0.4",
+        "merge-stream": "^2.0.0",
+        "through2": "^3.0.1"
+      },
+      "dependencies": {
+        "through2": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz",
+          "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==",
+          "requires": {
+            "inherits": "^2.0.4",
+            "readable-stream": "2 || 3"
+          }
+        }
+      }
+    },
     "tfunk": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/tfunk/-/tfunk-4.0.0.tgz",

package.json

@@ -6,7 +6,7 @@
   "license": "Custom",
   "dependencies": {
     "@forevolve/bootstrap-dark": "^1.0.0-alpha.1075",
-    "@fortawesome/fontawesome-free": "^5.13.1",
+    "@fortawesome/fontawesome-free": "^5.15.2",
     "ajax-bootstrap-select": "^1.4.5",
     "autocompleter": "^6.0.3",
     "autoprefixer": "^9.8.0",
@@ -17,13 +17,15 @@
     "flatpickr": "^4.6.6",
     "fullcalendar": "^5.3.2",
     "gulp": "^4.0.2",
+    "gulp-concat": "^2.6.1",
     "gulp-flatten": "^0.4.0",
+    "gulp-if": "^3.0.0",
     "gulp-postcss": "^8.0.0",
     "gulp-sass": "^4.1.0",
     "gulp-sourcemaps": "^2.6.5",
     "gulp-uglify": "^3.0.2",
+    "html5sortable": "^0.10.0",
     "jquery": "^3.5.1",
-    "jquery-ui-dist": "^1.12.1",
     "konami": "^1.6.2",
     "moment": "^2.27.0",
     "node-sass": "^5.0.0",

pipeline/source_assets/js/interaction.js

@@ -117,23 +117,9 @@ $('body').on('submit', '.itemised_form', function (e) {
     $('#id_items_json').val(JSON.stringify(objectitems));
 });
 
-// Return a helper with preserved width of cells
-var fixHelper = function (e, ui) {
-    ui.children().each(function () {
-        $(this).width($(this).width());
-    });
-    return ui;
-};
-
-$("#item-table tbody").sortable({
-    helper: fixHelper,
-    update: function (e, ui) {
-        info = $(this).sortable("toArray");
-        itemorder = new Array();
-        $.each(info, function (key, value) {
-            pk = $('#' + value).data('pk');
-            objectitems[pk].fields.order = key;
-        });
-
+sortable("#item-table tbody")[0].addEventListener('sortupdate', function (e) {
+    var items = e.detail.destination.items;
+    for(var i in items) {
+        objectitems[items[i].dataset.pk].fields.order = i;
     }
 });

pipeline/source_assets/js/src.js

@@ -0,0 +1,39 @@
+Date.prototype.getISOString = function () {
+        var yyyy = this.getFullYear().toString();
+        var mm = (this.getMonth() + 1).toString(); // getMonth() is zero-based
+        var dd = this.getDate().toString();
+        return yyyy + '-' + (mm[1] ? mm : "0" + mm[0]) + '-' + (dd[1] ? dd : "0" + dd[0]); // padding
+};
+jQuery(document).ready(function () {
+    jQuery(document).on('click', '.modal-href', function (e) {
+        $link = jQuery(this);
+        // Anti modal inception
+        if ($link.parents('#modal').length == 0) {
+            e.preventDefault();
+            modaltarget = $link.data('target');
+            modalobject = "";
+            jQuery('#modal').load($link.attr('href'), function (e) {
+                jQuery('#modal').modal();
+            });
+        }
+    });
+    var easter_egg = new Konami();
+    easter_egg.code = function () {
+        var s = document.createElement('script');
+        s.type = 'text/javascript';
+        document.body.appendChild(s);
+        s.src = '{% static "js/asteroids.min.js"%}';
+        ga('send', 'event', 'easter_egg', 'activated');
+    }
+    easter_egg.load();
+});
+//CTRL-Enter form submission
+document.body.addEventListener('keydown', function(e) {
+    if(e.keyCode == 13 && (e.metaKey || e.ctrlKey)) {
+        var target = e.target;
+        if(target.form) {
+            target.form.submit();
+        }
+    }
+});
+$('.navbar-collapse').addClass('collapse');

pipeline/source_assets/scss/screen.scss

@@ -6,8 +6,6 @@
 @import "node_modules/bootstrap/scss/root";
 @import "node_modules/bootstrap/scss/type";
 @import "node_modules/bootstrap/scss/images";
-//@import "node_modules/bootstrap/scss/code";
-//@import "node_modules/bootstrap/scss/grid";
 @import "node_modules/bootstrap/scss/tables";
 @import "node_modules/bootstrap/scss/forms";
 @import "node_modules/bootstrap/scss/buttons";
@@ -19,23 +17,21 @@
 @import "node_modules/bootstrap/scss/nav";
 @import "node_modules/bootstrap/scss/navbar";
 @import "node_modules/bootstrap/scss/card";
-//@import "node_modules/bootstrap/scss/breadcrumb";
 @import "node_modules/bootstrap/scss/pagination";
 @import "node_modules/bootstrap/scss/badge";
-//@import "node_modules/bootstrap/scss/jumbotron";
 @import "node_modules/bootstrap/scss/alert";
-//@import "node_modules/bootstrap/scss/progress";
 @import "node_modules/bootstrap/scss/media";
 @import "node_modules/bootstrap/scss/list-group";
 @import "node_modules/bootstrap/scss/close";
-//@import "node_modules/bootstrap/scss/toasts";
 @import "node_modules/bootstrap/scss/modal";
 @import "node_modules/bootstrap/scss/tooltip";
 @import "node_modules/bootstrap/scss/popover";
-//@import "node_modules/bootstrap/scss/carousel";
 @import "node_modules/bootstrap/scss/spinners";
 @import "node_modules/bootstrap/scss/utilities";
-//@import "node_modules/bootstrap/scss/print";
+//FontAwesome
+$fa-font-path: '/static/fonts';
+@import "node_modules/@fortawesome/fontawesome-free/scss/fontawesome";
+@import "node_modules/@fortawesome/fontawesome-free/scss/solid";
 
 @media screen and
   (prefers-reduced-motion: reduce),

templates/base.html

@@ -15,15 +15,13 @@
 
     <link rel="icon" type="image/png" href="{% static 'imgs/pyrigs-avatar.png' %}">
     <link rel="apple-touch-icon" href="{% static 'imgs/pyrigs-avatar.png' %}">
-    <link href="{% static 'fonts/OpenSans-Regular.tff' %}">
+    <link rel="preload" href="{% static 'fonts/fa-solid-900.woff2' %}" as="font" type="font/woff2" crossorigin>
 
-    <link rel="stylesheet" type="text/css" href="{% static 'css/dark_screen.css' %}" {% if not request.user.dark_theme %}media="(prefers-color-scheme: dark)"{% endif %}>
     <link rel="stylesheet" type="text/css" href="{% static 'css/screen.css' %}">
     {% block css %}
     {% endblock %}
 
-    <script src="{% static 'js/jquery.js' %}"></script>
-    <script src="{% static 'js/popper.js' %}"></script>
+    <script src="{% static 'js/jpop.js' %}"></script>
     {% block preload_js %}
     {% endblock %}
 
@@ -36,7 +34,7 @@
 {% block navbar %}
 <nav class="navbar navbar-expand-lg navbar-dark bg-dark flex-nowrap" role="navigation">
   <a class="navbar-brand" href="{% if request.user.is_authenticated %}https://members.nottinghamtec.co.uk{%else%}https://nottinghamtec.co.uk{%endif%}">
-    <img src="{% static 'imgs/logo.png' %}" width="40" height="40" alt="TEC's Logo: Serif 'TEC' vertically next to a blue box with the words 'PA and Lighting', surrounded by graduated rings">
+    <img src="{% static 'imgs/logo.webp' %}" width="40" height="40" alt="TEC's Logo: Serif 'TEC' vertically next to a blue box with the words 'PA and Lighting', surrounded by graduated rings">
   </a>
   <div class="container">
       {% block titleheader %}
@@ -80,67 +78,8 @@
 </div>
 
 <div class="modal fade" id="modal" role="dialog" tabindex=-1></div>
-<script>
-if({{ request.user.dark_theme|lower }} || window.matchMedia('(prefers-color-scheme: dark)').matches) {
-    document.body.setAttribute('data-theme', 'dark');
-}
-</script>
-<script>
-    Date.prototype.getISOString = function () {
-        var yyyy = this.getFullYear().toString();
-        var mm = (this.getMonth() + 1).toString(); // getMonth() is zero-based
-        var dd = this.getDate().toString();
-        return yyyy + '-' + (mm[1] ? mm : "0" + mm[0]) + '-' + (dd[1] ? dd : "0" + dd[0]); // padding
-    };
-</script>
-<script src="{% static 'js/util.js' %}"></script>
-<script src="{% static 'js/alert.js' %}"></script>
-<script src="{% static 'js/collapse.js' %}"></script>
-<script>
-    $('.navbar-collapse').addClass('collapse')
-</script>
-<script src="{% static 'js/dropdown.js' %}"></script>
-<script src="{% static 'js/modal.js' %}"></script>
-<script src="{% static 'js/konami.js' %}"></script>
-<script src="{% static 'js/all.js' %}"></script> <!---FontAwesome--->
-<script>
-    jQuery(document).ready(function () {
-        jQuery(document).on('click', '.modal-href', function (e) {
-            $link = jQuery(this);
-            // Anti modal inception
-            if ($link.parents('#modal').length == 0) {
-                e.preventDefault();
-                modaltarget = $link.data('target');
-                modalobject = "";
-                jQuery('#modal').load($link.attr('href'), function (e) {
-                    jQuery('#modal').modal();
-                });
-            }
-        });
-
-
-        var easter_egg = new Konami();
-        easter_egg.code = function () {
-            var s = document.createElement('script');
-            s.type = 'text/javascript';
-            document.body.appendChild(s);
-            s.src = '{% static "js/asteroids.min.js"%}';
-            ga('send', 'event', 'easter_egg', 'activated');
-        }
-        easter_egg.load();
-    });
-</script>
-<script>
-    //CTRL-Enter form submission
-    document.body.addEventListener('keydown', function(e) {
-        if(e.keyCode == 13 && (e.metaKey || e.ctrlKey)) {
-            var target = e.target;
-            if(target.form) {
-                target.form.submit();
-            }
-        }
-    });
-</script>
+<script src="{% static 'js/base.js' %}"></script>
+{% include 'partials/dark_theme.html' %}
 {% block js %}
 {% endblock %}
 </body>

templates/base_embed.html

@@ -10,12 +10,8 @@
     <base target="_blank" /><!-- Open all links in a new tab, not in the iframe -->
 
     <meta name="color-scheme" content="light dark">
-    <link rel="stylesheet" type="text/css" href="{% static 'css/dark_screen.css' %}" {% if not request.user.dark_theme %}media="(prefers-color-scheme: dark)"{% endif %}>
-
-    <link href="{% static 'fonts/OpenSans-Regular.tff' %}">
 
     <link rel="stylesheet" type="text/css" href="{% static 'css/screen.css' %}">
-
 </head>
 
 <body>
@@ -36,11 +32,7 @@
         {% endblock %}
     </div>
 </div>
-<script>
-if({{ request.user.dark_theme|lower }} || window.matchMedia('(prefers-color-scheme: dark)')) {
-    document.body.setAttribute('data-theme', 'dark');
-}
-</script>
+{% include 'partials/dark_theme.html' %}
 {% block js %}
 {% endblock %}
 </body>

templates/index.html

@@ -6,7 +6,7 @@
 {% block content %}
 <div class="row">
     <h1 class="col-sm-12 pb-3">R<small class="text-muted">ig</small> I<small class="text-muted">nformation</small> G<small class="text-muted">athering</small> S<small class="text-muted">ystem</small></h1>
-    <h4 class="col-sm-12 pb-3">Welcome back {{ user.get_full_name }}, there {%if rig_count == 1 %}is one rig coming up{%else%}are {{ rig_count|apnumber }} rigs coming up.{%endif%}</h4>
+    <h2 class="col-sm-12 pb-3">Welcome back {{ user.get_full_name }}, there {%if rig_count == 1 %}is one rig coming up{%else%}are {{ rig_count|apnumber }} rigs coming up.{%endif%}</h2>
     <div class="col-sm mb-3">
         <div class="card">
             <h4 class="card-header">Rigboard</h4>
@@ -33,7 +33,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-info align-middle"></span><span class="align-middle"> TEC Forum</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>
                     {% if perms.RIGS.view_event %}
-                        <a class="list-group-item list-group-item-action" href="//members.nottinghamtec.co.uk/price" target="_blank"><span class="fas fa-pound-sign text-warning align-middle"></span><span class="align-middle"> Price List</span></a>
+                        <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 %}
             </div>
         </div>

templates/partials/dark_theme.html

@@ -0,0 +1,7 @@
+{% load static %}
+<script>
+if({{ request.user.dark_theme|lower|default:'false' }} || window.matchMedia('(prefers-color-scheme: dark)').matches) {
+    $('<link>').prependTo('head').attr({type : 'text/css', rel : 'stylesheet'}).attr('href', '{% static "css/dark_screen.css" %}');
+    document.body.setAttribute('data-theme', 'dark');
+}
+</script>

templates/robots.txt

@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /

versioning/templates/activity_feed_data.html

@@ -31,7 +31,7 @@
                     <div class="media-body">
                     <h5>
                         {{ version.revision.user.name|default:'System' }}
-                        <span class="float-right"><small><span class="fas fa-clock"></span> {{version.revision.date_created|naturaltime}}</small></span>
+                        <span class="float-right"><small><span class="fas fa-clock"></span> <span class="time">{{version.revision.date_created|date:"c"}}</span> ({{version.revision.date_created}})</small></span>
                     </h5>
             {% endif %}
                     <p>
@@ -48,3 +48,15 @@
 </div>
 {% endcache %}
 {% endblock %}
+
+{% block js %}
+<script>
+$(document).ready(function() {
+    const times = document.getElementsByClassName("time");
+    var i;
+    for(i = 0; i < times.length; i++) {
+        times[i].innerHTML = moment(times[i].innerHTML).fromNow();
+    }
+});
+</script>
+{% endblock %}

versioning/templates/partials/activity_table_body.html

@@ -16,7 +16,7 @@
                 <th scope="row">{{ version.revision.date_created }}</th>
                 <td><a href="{{ version.changes.new.get_absolute_url }}">{{ version.changes.new.display_id|default:version.changes.new.pk }} | {{version.changes.new|to_class_name}}</a></td>
                 <td>{{ version.pk }}|{{ version.revision.pk }}</td>
-                <td>{{ version.revision.user.name|default:"System" }}</td>
+                <td>{% include 'partials/linked_name.html' with profile=version.revision.user %}</td>
                 <td>
                     {% if version.changes.old == None %}
                         Created {{version.changes.new|to_class_name}}