Use new crew list partial on event checklist

.dockerignore

@@ -1,49 +0,0 @@
-*.sqlite3
-*.md
-**/tests
-conftest.py
-pytest.ini
-Dockerfile
-node_modules
-npm-debug.log
-.git
-.env
-__pycache__
-*.pyc
-*.pyo
-*.pyd
-.Python
-pip-log.txt
-pip-delete-this-directory.txt
-.tox/
-.coverage
-.coverage.*
-.cache
-nosetests.xml
-coverage.xml
-*.cover
-*.log
-.git
-.gitignore
-.mypy_cache
-.pytest_cache
-.hypothesis
-.env
-.venv
-env/
-venv/
-ENV/
-env.bak/
-venv.bak/
-.vscode
-.idea
-.DS_Store
-*.swp
-*.swo
-*~
-docs/
-tests/
-*.md
-docker-compose*.yml
-Dockerfile*
-.dockerignore

.github/workflows/django.yml

@@ -18,37 +18,34 @@ jobs:
       - name: Install build dependencies
         run: |
           sudo apt-get install libcairo2-dev
-
+      - name: Set up Python
-      - name: "Set up Python"
         uses: actions/setup-python@v5
         with:
-          python-version-file: ".python-version"
+            python-version: "3.10"
-
+            cache: 'pipenv'
-      - name: Install uv
-        uses: astral-sh/setup-uv@v6
-
       - name: Install Dependencies
-        run: uv sync --locked --all-extras --dev
+        run: |
-
+              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@v4
         with:
             path: 'pipeline/built_assets'
             key: ${{ hashFiles('package-lock.json') }}-${{ hashFiles('pipeline/source_assets') }}
-
       - uses: bahmutov/npm-install@v1
         if: steps.static-cache.outputs.cache-hit != 'true'
       - run: node node_modules/gulp/bin/gulp build
         if: steps.static-cache.outputs.cache-hit != 'true'
       - name: Basic Checks
         run: |
-              uv run pycodestyle . --exclude=.venv,migrations,node_modules
+              pipenv run pycodestyle . --exclude=migrations,node_modules
-              uv run python3 manage.py check
+              pipenv run python3 manage.py check
-              uv run python3 manage.py makemigrations --check --dry-run
+              pipenv run python3 manage.py makemigrations --check --dry-run
-              uv run python3 manage.py collectstatic --noinput
+              pipenv run python3 manage.py collectstatic --noinput
       - name: Run Tests
-        run: uv run pytest -n auto --cov
+        run: pipenv run pytest -n auto --cov
       - uses: actions/upload-artifact@v4
         if: failure()
         with:
@@ -56,4 +53,4 @@ jobs:
             path: screenshots/
             retention-days: 5
       - name: Coveralls
-        run: uv run coveralls --service=github
+        run: pipenv run coveralls --service=github

.gitignore

@@ -101,7 +101,3 @@ crashlytics.properties
 crashlytics-build.properties
 .vscode/
 screenshots/
-
-# Virutal Environments
-.venv/
-/.env

.python-version

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

.slugignore

@@ -0,0 +1,6 @@
+*.sqlite3
+*.md
+**/tests
+conftest.py
+pytest.ini
+Dockerfile

Dockerfile

@@ -1,41 +0,0 @@
-# Stage 1: Base build stage
-FROM combos/python_node:3.10_22 AS base
-COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
-FROM base AS builder
-
-# Set up environment
-ENV PYTHONDONTWRITEBYTECODE=1 \
-    PYTHONUNBUFFERED=1 \
-    UV_COMPILE_BYTECODE=1 \
-    UV_LINK_MODE=copy
-
-# Create non-root user
-RUN addgroup --system app && adduser --system --group app
-
-WORKDIR /app
-
-# Copy uv project files first (for better caching)
-COPY pyproject.toml uv.lock ./
-
-WORKDIR /app
-
-# Install the project's dependencies using the lockfile and settings
-RUN --mount=type=cache,target=/root/.cache/uv \
-    --mount=type=bind,source=uv.lock,target=uv.lock \
-    --mount=type=bind,source=pyproject.toml,target=pyproject.toml \
-    uv sync --frozen --no-install-project --all-groups
-
-# Then, add the rest of the project source code and install it
-# Installing separately from its dependencies allows optimal layer caching
-COPY . /app
-RUN --mount=type=cache,target=/root/.cache/uv \
-    uv sync --frozen --all-groups
-
-FROM python:3.10-slim-trixie
-COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
-COPY --from=builder /app /app
-WORKDIR /app
-ENV PATH="/app/.venv/bin:$PATH"
-EXPOSE 8000
-
-CMD ["uv", "run", "gunicorn", "--bind", "0.0.0.0:8000", "--workers", "3", "PyRIGS.wsgi"]

Pipfile

@@ -0,0 +1,104 @@
+[[source]]
+url = "https://pypi.python.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[packages]
+ansicolors = "~=1.1.8"
+asgiref = "~=3.3.1"
+"backports.tempfile" = "~=1.0"
+"backports.weakref" = "~=1.0.post1"
+beautifulsoup4 = "~=4.9.3"
+Brotli = "~=1.0.9"
+cachetools = "~=4.2.1"
+chardet = "~=4.0.0"
+configparser = "~=5.0.1"
+contextlib2 = "~=0.6.0.post1"
+cssselect = "~=1.1.0"
+cssutils = "~=1.0.2"
+dj-database-url = "~=0.5.0"
+dj-static = "~=0.0.6"
+Django = "~=3.2"
+django-debug-toolbar = "~=4.0.0"
+django-filter = "~=2.4.0"
+django-ical = "~=1.7.1"
+django-recurrence = "~=1.10.3"
+django-registration-redux = "~=2.9"
+django-reversion = "~=3.0.9"
+django-widget-tweaks = "~=1.4.8"
+django-htmlmin = "~=0.11.0"
+envparse = "*"
+gunicorn = "~=22.0.0"
+icalendar = "~=4.0.7"
+idna = "~=3.7"
+Markdown = "~=3.3.3"
+msgpack = "~=1.0.2"
+pep517 = "~=0.9.1"
+Pillow = "~=10.0.1"
+premailer = "~=3.7.0"
+progress = "~=1.5"
+psutil = "~=5.8.0"
+psycopg2 = "~=2.8.6"
+Pygments = "~=2.15.0"
+pyparsing = "~=2.4.7"
+PyPDF2 = "~=1.27.5"
+PyPOM = "~=2.2.4"
+python-dateutil = "~=2.8.1"
+pytoml = "~=0.1.21"
+pytz = "~=2020.5"
+reportlab = "*"
+requests = "~=2.32.3"
+retrying = "~=1.3.3"
+simplejson = "~=3.17.2"
+six = "~=1.15.0"
+soupsieve = "~=2.1"
+sqlparse = "~=0.5.0"
+static3 = "~=0.7.0"
+svg2rlg = "~=0.3"
+tini = "~=3.0.1"
+tornado = "~=6.3"
+urllib3 = "~=1.26.19"
+whitenoise = "~=5.2.0"
+yolk = "~=0.4.3"
+zipp = "~=3.4.0"
+"zope.component" = "~=4.6.2"
+"zope.deferredimport" = "~=4.3.1"
+"zope.deprecation" = "~=4.4.0"
+"zope.event" = "~=4.5.0"
+"zope.hookable" = "~=5.0.1"
+"zope.interface" = "~=5.2.0"
+"zope.proxy" = "~=4.3.5"
+"zope.schema" = "~=6.0.1"
+sentry-sdk = "*"
+diff-match-patch = "*"
+python-barcode = "*"
+django-hCaptcha = "*"
+importlib-metadata = "*"
+django-hcaptcha = "*"
+"z3c.rml" = "*"
+pikepdf = "*"
+django-queryable-properties = "*"
+django-mass-edit = "*"
+selenium = "~=4.9.1"
+
+[dev-packages]
+pycodestyle = "~=2.9.1"
+coveralls = "*"
+django-coverage-plugin = "*"
+pytest-cov = "*"
+pytest-django = "*"
+pluggy = "*"
+pytest-splinter = "*"
+pytest = "*"
+pytest-reverse = "*"
+
+[requires]
+python_version = "3.10"
+
+[dev-packages.pytest-xdist]
+extras = [ "psutil",]
+version = "*"
+
+[dev-packages.PyPOM]
+extras = [ "splinter",]
+version = "*"

Procfile

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

PyRIGS/decorators.py

@@ -79,9 +79,7 @@ def api_key_required(function):
     """
     Decorator for views that checks api_pk and api_key.
     Failed users will be given a 403 error.
-    Should only be used for urls which include <api_pk> and <api_key> kwargs.
+    Should only be used for urls which include <api_pk> and <api_key> kwargs
-
-    Will update the kwargs to include the user object if successful (under the key 'user').
     """
 
     def wrap(request, *args, **kwargs):
@@ -99,7 +97,6 @@ def api_key_required(function):
 
         try:
             user_object = models.Profile.objects.get(pk=userid)
-            kwargs = {**kwargs, 'user': user_object}
         except models.Profile.DoesNotExist:
             return error_resp
 

PyRIGS/settings.py

@@ -26,23 +26,21 @@ DEBUG = env('DEBUG', cast=bool, default=True)
 STAGING = env('STAGING', cast=bool, default=False)
 CI = env('CI', cast=bool, default=False)
 
-ALLOWED_HOSTS = env("DJANGO_ALLOWED_HOSTS", default="rigs.nottinghamtec.co.uk").split(",")
+ALLOWED_HOSTS = ['pyrigs.nottinghamtec.co.uk', 'rigs.nottinghamtec.co.uk', 'pyrigs.herokuapp.com']
+
+if STAGING:
+    ALLOWED_HOSTS.append('.herokuapp.com')
 
 if DEBUG:
-    CRSF_TRUSTED_ORIGINS = ALLOWED_HOSTS.copy()
+    ALLOWED_HOSTS.append('localhost')
-    CRSF_TRUSTED_ORIGINS.append("http://localhost:8000")
+    ALLOWED_HOSTS.append('example.com')
-    CRSF_TRUSTED_ORIGINS.append("http://localhost:8001")
+    ALLOWED_HOSTS.append('127.0.0.1')
-    ALLOWED_HOSTS = ['*']
+    ALLOWED_HOSTS.append('.app.github.dev')
+    CSRF_TRUSTED_ORIGINS = ALLOWED_HOSTS
 
 SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
 if not DEBUG:
     SECURE_SSL_REDIRECT = True  # Redirect all http requests to https
-    SECURE_HSTS_SECONDS = 3600
-    SECURE_HSTS_INCLUDE_SUBDOMAINS = True
-    SECURE_CONTENT_TYPE_NOSNIFF = True
-    SESSION_COOKIE_SECURE = env('SESSION_COOKIE_SECURE_ENABLED', True)
-    CSRF_COOKIE_SECURE = env('CSRF_COOKIE_SECURE_ENABLED', True)
-    SECURE_HSTS_PRELOAD = True
 
 INTERNAL_IPS = ['127.0.0.1']
 
@@ -97,18 +95,17 @@ WSGI_APPLICATION = 'PyRIGS.wsgi.application'
 
 # Database
 DATABASES = {
-     'default': {
+    'default': {
-         'ENGINE': 'django.db.backends.{}'.format(
+        'ENGINE': 'django.db.backends.sqlite3',
-             env('DATABASE_ENGINE', default='sqlite3')
+        'NAME': str(BASE_DIR / 'db.sqlite3'),
-         ),
+    }
-         'NAME': env('DATABASE_NAME', default='rigs'),
-         'USER': env('DATABASE_USERNAME', default='rigs'),
-         'PASSWORD': env('DATABASE_PASSWORD', default='rigs'),
-         'HOST': env('DATABASE_HOST', default='127.0.0.1'),
-         'PORT': env('DATABASE_PORT', 5432),
-     }
 }
 
+if not DEBUG:
+    import dj_database_url
+
+    DATABASES['default'] = dj_database_url.config()
+
 # Logging
 LOGGING = {
     'version': 1,
@@ -257,7 +254,6 @@ TEMPLATES = [
                 "django.template.context_processors.tz",
                 "django.template.context_processors.request",
                 "django.contrib.messages.context_processors.messages",
-                "RIGS.views.is_ajax",
             ],
             'debug': DEBUG
         },
@@ -270,3 +266,10 @@ TERMS_OF_HIRE_URL = "http://www.nottinghamtec.co.uk/terms.pdf"
 AUTHORISATION_NOTIFICATION_ADDRESS = 'productions@nottinghamtec.co.uk'
 
 DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
+
+SECURE_HSTS_SECONDS = 3600
+SECURE_HSTS_INCLUDE_SUBDOMAINS = True
+SECURE_CONTENT_TYPE_NOSNIFF = True
+SESSION_COOKIE_SECURE = env('SESSION_COOKIE_SECURE_ENABLED', True)
+CSRF_COOKIE_SECURE = env('CSRF_COOKIE_SECURE_ENABLED', True)
+SECURE_HSTS_PRELOAD = True

PyRIGS/urls.py

@@ -36,8 +36,8 @@ urlpatterns = [
 if settings.DEBUG:
     urlpatterns += staticfiles_urlpatterns()
 
-    # import debug_toolbar
+    import debug_toolbar
     urlpatterns += [
-        # path('__debug__/', include(debug_toolbar.urls)),
+        path('__debug__/', include(debug_toolbar.urls)),
         path('bootstrap/', TemplateView.as_view(template_name="bootstrap.html")),
     ]

PyRIGS/views.py

@@ -9,7 +9,7 @@ from functools import reduce
 from itertools import chain
 from io import BytesIO
 
-from PyPDF2 import PdfMerger, PdfReader
+from PyPDF2 import PdfFileMerger, PdfFileReader
 from z3c.rml import rml2pdf
 
 from django.conf import settings
@@ -30,11 +30,9 @@ from RIGS import models
 from assets import models as asset_models
 from training import models as training_models
 
-# Template context processor
-
 
 def is_ajax(request):
-    return {"is_ajax": request.headers.get('x-requested-with') == 'XMLHttpRequest'}
+    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.
@@ -185,7 +183,7 @@ class SecureAPIRequest(generic.View):
 
 class ModalURLMixin:
     def get_close_url(self, update, detail):
-        if is_ajax(self.request).get('is_ajax'):
+        if is_ajax(self.request):
             url = reverse_lazy('closemodal')
             update_url = str(reverse_lazy(update, kwargs={'pk': self.object.pk}))
             messages.info(self.request, "modalobject=" + serializers.serialize("json", [self.object]))
@@ -204,7 +202,7 @@ class GenericListView(generic.ListView):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context['page_title'] = self.model.__name__ + "s"
-        if is_ajax(self.request).get('is_ajax'):
+        if is_ajax(self.request):
             context['override'] = "base_ajax.html"
         return context
 
@@ -223,7 +221,7 @@ class GenericDetailView(generic.DetailView):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context['page_title'] = f"{self.model.__name__} | {self.object.name}"
-        if is_ajax(self.request).get('is_ajax'):
+        if is_ajax(self.request):
             context['override'] = "base_ajax.html"
         return context
 
@@ -234,7 +232,7 @@ class GenericUpdateView(generic.UpdateView):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context['page_title'] = f"Edit {self.model.__name__}"
-        if is_ajax(self.request).get('is_ajax'):
+        if is_ajax(self.request):
             context['override'] = "base_ajax.html"
         return context
 
@@ -245,7 +243,7 @@ class GenericCreateView(generic.CreateView):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context['page_title'] = f"Create {self.model.__name__}"
-        if is_ajax(self.request).get('is_ajax'):
+        if is_ajax(self.request):
             context['override'] = "base_ajax.html"
         return context
 
@@ -335,10 +333,10 @@ def get_info_string(user):
 
 
 def render_pdf_response(template, context, append_terms):
-    merger = PdfMerger()
+    merger = PdfFileMerger()
     rml = template.render(context)
     buffer = rml2pdf.parseString(rml)
-    merger.append(PdfReader(buffer))
+    merger.append(PdfFileReader(buffer))
     buffer.close()
 
     if append_terms:

RIGS/forms.py

@@ -39,8 +39,6 @@ class EventForm(forms.ModelForm):
     @property
     def _get_items_json(self):
         items = {}
-        if self.instance.pk is None:
-            return items
         for item in self.instance.items.all():
             data = serializers.serialize('json', [item])
             struct = simplejson.loads(data)

RIGS/management/commands/send_reminders.py

@@ -13,7 +13,6 @@ from RIGS import models
 
 
 class Command(BaseCommand):
-    # FIXME This needs a different implementation when moved off heroku
     help = 'Sends email reminders as required. Triggered daily through heroku-scheduler in production.'
 
     def handle(self, *args, **options):
@@ -34,6 +33,6 @@ class Command(BaseCommand):
                     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, allow_loading_external_files=True).transform()
+                html = premailer.Premailer(get_template("email/ra_reminder.html").render(context), external_styles=css).transform()
                 msg.attach_alternative(html, 'text/html')
                 msg.send()

RIGS/models.py

@@ -379,10 +379,6 @@ class Event(models.Model, RevisionMixin):
             return self.pk
         return "????"
 
-    @property
-    def needs_mic(self):
-        return self.is_rig and not self.dry_hire
-
     # Calculated values
     """
     EX Vat
@@ -512,7 +508,7 @@ class Event(models.Model, RevisionMixin):
     def can_check_in(self):
         earliest = self.earliest_time
         if isinstance(self.earliest_time, datetime.date):
-            earliest = datetime.datetime.combine(self.earliest_time, datetime.time(00, 00))
+            earliest = datetime.datetime.combine(self.start_date, datetime.time(00, 00))
             tz = pytz.timezone(settings.TIME_ZONE)
             earliest = tz.localize(earliest)
         return not self.dry_hire and not self.status == Event.CANCELLED and earliest <= timezone.now()

RIGS/signals.py

@@ -5,7 +5,7 @@ import urllib.request
 from io import BytesIO
 import datetime
 
-from PyPDF2 import PdfReader, PdfMerger
+from PyPDF2 import PdfFileReader, PdfFileMerger
 from django.conf import settings
 from django.contrib.staticfiles import finders
 from django.core.cache import cache
@@ -31,12 +31,12 @@ def send_eventauthorisation_success_email(instance):
     }
 
     template = get_template('event_print.xml')
-    merger = PdfMerger()
+    merger = PdfFileMerger()
 
     rml = template.render(context)
 
     buffer = rml2pdf.parseString(rml)
-    merger.append(PdfReader(buffer))
+    merger.append(PdfFileReader(buffer))
     buffer.close()
 
     terms = urllib.request.urlopen(settings.TERMS_OF_HIRE_URL)
@@ -66,7 +66,7 @@ def send_eventauthorisation_success_email(instance):
 
     css = finders.find('css/email.css')
     html = Premailer(get_template("email/eventauthorisation_client_success.html").render(context),
-                     external_styles=css, allow_loading_external_files=True).transform()
+                     external_styles=css).transform()
     client_email.attach_alternative(html, 'text/html')
 
     escapedEventName = re.sub(r'[^a-zA-Z0-9 \n\.]', '', instance.event.name)
@@ -124,7 +124,7 @@ def send_admin_awaiting_approval_email(user, request, **kwargs):
             )
             css = finders.find('css/email.css')
             html = Premailer(get_template("email/admin_awaiting_approval.html").render(context),
-                             external_styles=css, allow_loading_external_files=True).transform()
+                             external_styles=css).transform()
             email.attach_alternative(html, 'text/html')
             email.send()
 

RIGS/templates/base_print.xml

@@ -87,8 +87,6 @@
 
         <listStyle name="ul"
                    start="bulletchar"
-                   leftIndent="0"
-                   bulletDedent="10"
                    bulletFontSize="10"/>
     </stylesheet>
 

RIGS/templates/base_rigs.html

@@ -6,36 +6,7 @@
 {% load total_invoices_todo from filters %}
 
 {% block titleheader %}
-<style>
+<a class="navbar-brand" style="margin-left: auto; margin-right: auto;" href="/">RIGS</a>
-.franken {
-  font-family: Fontdiner Swanky;
-  color: #00ff00;
-  animation: glow 1.5s infinite alternate;
-}
-
-@keyframes glow {
-  0% {
-    text-shadow: 0 0 5px #00ff00,
-                 0 0 10px #00ff00,
-                 0 0 20px #00ff00,
-                 0 0 40px #00ff00;
-  }
-  50% {
-    text-shadow: 0 0 10px #00ff00,
-                 0 0 20px #00ff00,
-                 0 0 30px #00ff00,
-                 0 0 60px #00ff00;
-  }
-  100% {
-    text-shadow: 0 0 5px #00ff00,
-                 0 0 10px #00ff00,
-                 0 0 20px #00ff00,
-                 0 0 40px #00ff00;
-  }
-}
-</style>
-
-<a class="navbar-brand" style="margin-left: auto; margin-right: auto;" href="/"><span class="franken">Franken</span>RIGS</a>
 {% endblock %}
 
 {% block titleelements %}

RIGS/templates/email/eventauthorisation_mic_success.txt

@@ -1,5 +1,5 @@
 Hi {{object.event.mic.get_full_name|default_if_none:"somebody"}},
 
-Just to let you know your event N{{object.event.pk|stringformat:"05d"}} has been successfully authorised for £{{object.amount}} by {{object.name}} as of {{object.event.last_edited_at}}.
+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/event_detail.html

@@ -1,24 +1,11 @@
-{% extends is_ajax|yesno:"base_ajax.html,base_rigs.html" %}
+{% extends request.is_ajax|yesno:"base_ajax.html,base_rigs.html" %}
 
 {% load markdown_tags %}
 {% load static %}
 
-{% block js %}
-    {{ block.super }}
-
-    <script>
-    $(document).keydown(function(e) {
-        if ((e.ctrlKey || e.metaKey) && e.keyCode == 80) {
-            window.open("{% url 'event_print' object.pk %}", '_blank');
-            return false;
-        }
-    });
-    </script>
-{% endblock %}
-
 {% block content %}
 <div class="row my-3 py-3">
-    {% if not is_ajax %}
+    {% if not request.is_ajax %}
         {% if perms.RIGS.view_event %}
         <div class="col-sm-12 text-right">
             {% include 'partials/event_detail_buttons.html' %}
@@ -49,7 +36,7 @@
         </div>
     {% endif %}
     {% endif %}
-    {% if not is_ajax and perms.RIGS.view_event %}
+    {% if not request.is_ajax and perms.RIGS.view_event %}
     <div class="col-sm-12 text-right">
         {% include 'partials/event_detail_buttons.html' %}
     </div>
@@ -72,13 +59,13 @@
         
         {% include 'partials/crew_list.html' %}
 
-        {% if not is_ajax and perms.RIGS.view_event %}
+        {% if not request.is_ajax and perms.RIGS.view_event %}
         <div class="col-sm-12 text-right">
             {% include 'partials/event_detail_buttons.html' %}
         </div>
         {% endif %}
     {% endif %}
-    {% if not is_ajax and perms.RIGS.view_event %}
+    {% if not request.is_ajax and perms.RIGS.view_event %}
         <div class="col-sm-12 text-right">
             {% include 'partials/last_edited.html' with target="event_history" %}
         </div>
@@ -86,7 +73,7 @@
 </div>
 {% endblock %}
 
-{% if is_ajax %}
+{% if request.is_ajax %}
     {% block footer %}
             {% if perms.RIGS.view_event %}
                 {% include 'partials/last_edited.html' with target="event_history" %}

RIGS/templates/eventauthorisation_request.html

@@ -1,4 +1,4 @@
-{% extends is_ajax|yesno:'base_ajax.html,base_rigs.html' %}
+{% extends request.is_ajax|yesno:'base_ajax.html,base_rigs.html' %}
 {% load widget_tweaks %}
 {% load static %}
 {% load button from filters %}

RIGS/templates/eventauthorisation_request_error.html

@@ -1,4 +1,4 @@
-{% extends is_ajax|yesno:'base_ajax.html,base_rigs.html' %}
+{% extends request.is_ajax|yesno:'base_ajax.html,base_rigs.html' %}
 {% load widget_tweaks %}
 
 {% block title %}TEC Email Address Required{% endblock %}

RIGS/templates/hs/event_checklist_detail.html

@@ -1,4 +1,4 @@
-{% extends is_ajax|yesno:"base_ajax.html,base_rigs.html" %}
+{% extends request.is_ajax|yesno:"base_ajax.html,base_rigs.html" %}
 {% load help_text from filters %}
 {% load profile_by_index from filters %}
 {% load yesnoi from filters %}

RIGS/templates/hs/event_checklist_form.html

@@ -1,4 +1,4 @@
-{% extends is_ajax|yesno:'base_ajax.html,base_rigs.html' %}
+{% extends request.is_ajax|yesno:'base_ajax.html,base_rigs.html' %}
 {% load widget_tweaks %}
 {% load static %}
 {% load help_text from filters %}

RIGS/templates/hs/eventcheckin_form.html

@@ -1,4 +1,4 @@
-{% extends is_ajax|yesno:'base_ajax.html,base_rigs.html' %}
+{% extends request.is_ajax|yesno:'base_ajax.html,base_rigs.html' %}
 {% load widget_tweaks %}
 {% load static %}
 {% load button from filters %}
@@ -28,7 +28,7 @@
         <form id="checkin" role="form" method="POST" action="{{ form.action|default:request.path }}">
             <input type="hidden" name="{{ form.event.name }}" id="{{ form.event.id_for_label }}"
                value="{{event.pk}}"/>
-            {% if not is_ajax and self.request.user.pk is form.event.mic.pk %}
+            {% if not request.is_ajax and self.request.user.pk is form.event.mic.pk %}
             <div class="form-group">
                 <label for="{{ form.person.id_for_label }}"
                        class="col-sm-4 col-form-label">{{ form.person.label }}</label>
@@ -86,7 +86,7 @@
                 </div>
             </div>
             {% endif %}
-            {% if not is_ajax %}
+            {% if not request.is_ajax %}
             <div class="row mt-3">
                 <div class="col-sm-12 text-right">
                     {% button 'submit' %}

RIGS/templates/hs/hs_object_list.html

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

RIGS/templates/hs/power_detail.html

@@ -1,4 +1,4 @@
-{% extends is_ajax|yesno:"base_ajax.html,base_rigs.html" %}
+{% extends request.is_ajax|yesno:"base_ajax.html,base_rigs.html" %}
 {% load help_text from filters %}
 {% load profile_by_index from filters %}
 {% load yesnoi from filters %}

RIGS/templates/hs/power_form.html

@@ -1,4 +1,4 @@
-{% extends is_ajax|yesno:'base_ajax.html,base_rigs.html' %}
+{% extends request.is_ajax|yesno:'base_ajax.html,base_rigs.html' %}
 {% load widget_tweaks %}
 {% load static %}
 {% load help_text from filters %}

RIGS/templates/hs/power_print.xml

@@ -70,16 +70,6 @@
 </blockTable>
 
 <spacer length="15"/>
-
-{% if object.notes %}
-<hr/>
-<spacer length="15"/>
-<para><strong>Additional Notes:</strong></para>
-<spacer length="15"/>
-<para>{{ object.notes }}</para>
-<spacer length="15"/>
-{% endif %}
-
 <hr/>
 <spacer length="15"/>
 

RIGS/templates/hs/risk_assessment_detail.html

@@ -1,4 +1,4 @@
-{% extends is_ajax|yesno:"base_ajax.html,base_rigs.html" %}
+{% extends request.is_ajax|yesno:"base_ajax.html,base_rigs.html" %}
 {% load filters %}
 
 {% block content %}

RIGS/templates/hs/risk_assessment_form.html

@@ -1,4 +1,4 @@
-{% extends is_ajax|yesno:'base_ajax.html,base_rigs.html' %}
+{% extends request.is_ajax|yesno:'base_ajax.html,base_rigs.html' %}
 {% load widget_tweaks %}
 {% load static %}
 {% load help_text from filters %}

RIGS/templates/partials/crew_list.html

@@ -31,11 +31,9 @@
                             <span class="text-success fas fa-clock" data-toggle="tooltip"
                                 title="This person is currently checked into this event"></span>{% endif %}
                         </td>
-                        <td>{% if crew.end_time %}
+                        <td>{% if crew.end_time %}{% if crew.person.pk == request.user.pk or event.mic.pk ==
-                                {% if crew.person.pk == request.user.pk or event.mic.pk == request.user.pk %}
+                            request.user.pk %}{% button 'edit' 'edit_checkin' crew.pk clazz='btn-sm modal-href' %}{%
-                                    {% button 'edit' 'edit_checkin' crew.pk clazz='btn-sm modal-href' %}
+                            endif %}{% endif %}</td>
-                                {% endif %}
-                            {% endif %}</td>
                     </tr>
                     {% empty %}
                     <tr>

RIGS/templates/partials/event_row.html

@@ -1,147 +0,0 @@
-{% load namewithnotes from filters %}
-{% load markdown_tags %}
-
-<div class="card h-100 border-3 {{ border_class }} event-row">
-    <div class="card-header {{ header_bg }} {{ header_text }} py-3">
-        <div class="d-flex justify-content-between align-items-center">
-            <span class="d-flex align-items-center">
-                <h5 class="mb-0 mr-3">
-                    <a href="{% url 'event_detail' event.pk %}"
-                        class="{{ header_text }} text-decoration-underline fw-bold">
-                        <strong>{{ event.display_id }}</strong> - {{ event.name }}
-                    </a>
-                </h5>
-                {% if event.dry_hire %}
-                <span class="badge px-3 py-2 rounded-pill fs-6 text-dark bg-light">Dry Hire</span>
-                {% endif %}
-            </span>
-            <span class="badge fs-6 px-3 py-2 bg-light text-dark rounded-pill">{{ event.get_status_display }}</span>
-        </div>
-    </div>
-    <div class="card-body">
-        <div class="row align-items-start">
-
-            <div class="col-md-2 border-end event-dates">
-                <div class="mb-2">
-                    <small class="text-muted">Meet at:</small>
-                    {% if event.meet_at %}
-                    <p class="mb-1">{{ event.meet_at|date:"D j M Y, H:i" }}</p>
-                    {% else %}
-                    <p class="mb-1">Not specified</p>
-                    {% endif %}
-                </div>
-                <div class="mb-2">
-                    <small class="text-muted">Access from:</small>
-                    {% if event.access_at %}
-                    <p class="mb-1">{{ event.access_at|date:"D j M Y, H:i" }}</p>
-                    {% else %}
-                    <p class="mb-1">Not specified</p>
-                    {% endif %}
-                </div>
-                <div class="mb-2">
-                    <small class="text-muted">Start:</small>
-                    <p class="mb-1">
-                        {% if event.start_date and event.start_time %}
-                        {{ event.start_date|date:"D j M Y" }}, {{ event.start_time|date:"H:i" }}
-                        {% elif event.start_date %}
-                        {{ event.start_date|date:"D j M Y" }}
-                        {% elif event.start_time %}
-                        {{ event.start_time|date:"H:i" }}
-                        {% else %}
-                        Not specified
-                        {% endif %}
-                    </p>
-                </div>
-                <div class="mb-2">
-                    <small class="text-muted">End:</small>
-                    <p class="mb-1">
-                        {% if event.end_date and event.end_time %}
-                        {{ event.end_date|date:"D j M Y" }}, {{ event.end_time|date:"H:i" }}
-                        {% elif event.end_date %}
-                        {{ event.end_date|date:"D j M Y" }}
-                        {% elif event.end_time %}
-                        {{ event.end_time|date:"H:i" }}
-                        {% else %}
-                        Not specified
-                        {% endif %}
-                    </p>
-                </div>
-            </div>
-
-
-            <div class="col-md-10">
-                <div class="row">
-
-                    <div class="col-md-6">
-
-                        {% if event.venue %}
-                        <div class="mb-3">
-                            <small class="text-muted">Venue:</small>
-                            <p class="mb-1">{{ event.venue|namewithnotes:'venue_detail' }}</p>
-                        </div>
-                        {% endif %}
-
-
-                        {% if event.is_rig %}
-                        <div class="mb-3">
-                            <small class="text-muted">Client:</small>
-                            <p class="mb-1">
-                                {% if event.person %}
-                                <a href="{{ event.person.get_absolute_url }}">{{ event.person.name }}</a>
-                                {% if event.organisation %}
-                                for <a href="{{ event.organisation.get_absolute_url }}">{{ event.organisation }}</a>
-                                {% endif %}
-                                {% elif event.organisation %}
-                                <a href="{{ event.organisation.get_absolute_url }}">{{ event.organisation }}</a>
-                                {% else %}
-                                No client specified
-                                {% endif %}
-                            </p>
-                        </div>
-                        {% endif %}
-
-                        {% if event.mic or event.needs_mic %}
-                        <div class="mb-3">
-                            <small class="text-muted">Member in Charge (MIC):</small>
-                            <div class="d-flex align-items-center mt-1">
-                                {% if event.mic %}
-                                <img src="{{ event.mic.profile_picture }}" alt="{{ event.mic.name }}"
-                                    class="rounded-circle mr-1" width="32" height="32">
-                                <span>
-                                    {% if perms.RIGS.view_profile %}
-                                    <a href="{% url 'profile_detail' event.mic.pk %}" class="modal-href">
-                                        {% endif %}
-                                        {{ event.mic.name }}
-                                        {% if perms.RIGS.view_profile %}
-                                    </a>
-                                    {% endif %}
-                                </span>
-                                {% else %}
-                                <span class="text-danger">No MIC assigned</span>
-                                {% endif %}
-                            </div>
-                        </div>
-                        {% endif %}
-                    </div>
-
-
-                    <div class="col-md-6">
-
-                        <div class="mb-3">
-                            <small class="text-muted">Description:</small>
-                            <p class="mb-1">{{ event.description|markdown }}</p>
-                        </div>
-
-
-                        <div class="mb-3">
-                            <small class="text-muted">Status:</small>
-                            <div class="mt-1">
-                                {% include "partials/event_status.html" with status=event.status %}
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>

RIGS/templates/partials/event_status.html

@@ -3,7 +3,7 @@
 {% if event.is_rig %}
     {% if event.sum_total > 0 %}
         {% if event.purchase_order %}
-            <span class="badge badge-success">PO: Received</span>
+            <span class="badge badge-success">PO: {{ event.purchase_order }}</span>
         {% elif event.authorised %}
             <span class="badge badge-success">Authorisation: Complete <span class="fas fa-check"></span></span>
         {% elif event.authorisation and event.authorisation.amount != event.total and event.authorisation.last_edited_at > event.auth_request_at %}

RIGS/templates/partials/event_table.html

@@ -1,70 +1,195 @@
 {% load namewithnotes from filters %}
 {% load markdown_tags %}
-
 <style>
-  .light-link {
+#event_table {
-    color: #ebf5ff !important;
+    display: grid;
+    grid-template-columns: max-content min-content minmax(max-content, 1fr) max-content;
+    column-gap: 1em;
+}
+.eventgrid {
+    display: inherit;
+    grid-column: 1/5;
+    grid-template-columns: subgrid;
+    padding: 1em;
+    dt, dd { display: block; float: left; }
+    dt { clear: both; }
+    dd { float: right; }
+}
+.grid-header {
+    border-bottom: 1px solid grey;
+    border-top: 1px solid grey;
+}
+#event_status {
+    grid-column-start: 3;
+}
+#event_mic {
+    grid-row-start: 1;
+    grid-column-start: 4;
+}
+.c-none {
+    display: none;
+}
+.c-inline {
+    display: inline;
+}
+@container (width <= 500px) {
+  #event_table {
+    grid-template-columns: 1fr !important;
   }
-
+  .eventgrid {
-  .dark-link {
+    grid-column: 1/1 !important;
-    color: #4495ff !important;
+    padding: 0.5em;
   }
-
+  .grid-header {
-  .link-on-green {
+    display: none;
-    color: #ffffff !important;
   }
+  #event_dates {
+    order: 2;
+  }
+  #event_status {
+    order: 3;
+  }
+  #event_mic {
+    grid-row-start: auto;
+    grid-column-start: 4;
+  }
+}
+@container (width <= 700px) {
+  #event_table {
+    grid-template-columns: max-content;
+    column-gap: 0.5em;
+  }
+  .eventgrid {
+    grid-column: 1/3;
+    border: 1px solid grey;
+  }
+  #event_dates {
+    grid-row: 2;
+    grid-column: 1;
+  }
+  #event_number {
+    grid-row: 1;
+    grid-column: 1;
+  }
+  #event_mic {
+    grid-column: 2;
+  }
+  #event_status {
+    grid-column: span 2;
+  }
+  .grid-header, .c-md-none {
+    display: none;
+  }
+}
+@container (width > 700px) {
+    .c-lg-block {
+        display: block;
+    }
+    .c-lg-inline {
+        display: inline;
+    }
+    .c-lg-none, .c-md-none {
+        display: none;
+    }
+}
 </style>
-
+<div id="event_table">
-<div class="row">
+    <div class="eventgrid grid-header font-weight-bold">
-  {% for event in events %}
+        <div id="event_number">#</div>
-  <div class="col-12 mb-4">
+        <div id="event_dates">Dates & Times</div>
-    {% comment %} Determine card style based on event status {% endcomment %}
+        <div>Event Details</div>
-    {% if event.cancelled %}
+        <div id="event_mic">MIC</div>
-
-    {% with border_class="border-secondary" header_bg="bg-secondary" header_text="light-link" %}
-    {% include "partials/event_row.html" %}
-    {% endwith %}
-
-    {% elif not event.is_rig %}
-
-    {% with border_class="border-primary" header_bg="bg-primary" header_text="light-link" %}
-    {% include "partials/event_row.html" %}
-    {% endwith %}
-
-    {% elif not event.mic %}
-
-    {% with border_class="border-danger" header_bg="bg-danger" header_text="light-link" %}
-    {% include "partials/event_row.html" %}
-    {% endwith %}
-
-    {% elif event.confirmed and event.authorised %}
-
-    {% if event.dry_hire or event.riskassessment %}
-
-    {% with border_class="border-success" header_bg="bg-success" header_text="link-on-green" %}
-    {% include "partials/event_row.html" %}
-    {% endwith %}
-
-    {% else %}
-
-    {% with border_class="border-warning" header_bg="bg-warning" header_text="dark-link" %}
-    {% include "partials/event_row.html" %}
-    {% endwith %}
-
-    {% endif %}
-
-    {% else %}
-
-    {% with border_class="border-warning" header_bg="bg-warning" header_text="dark-link" %}
-    {% include "partials/event_row.html" %}
-    {% endwith %}
-
-    {% endif %}
-  </div>
-  {% empty %}
-  <div class="col-12">
-    <div class="alert alert-info">
-      No events currently scheduled.
     </div>
-  </div>
+    {% for event in events %}
-  {% endfor %}
+    <div class="eventgrid {% if event.cancelled %}
+    table-secondary
+    {% elif not event.is_rig %}
+    table-info
+    {% elif not event.mic %}
+    table-danger
+    {% elif event.confirmed and event.authorised %}
+    {% if event.dry_hire or event.riskassessment %}
+    table-success
+    {% else %}
+    table-warning
+    {% endif %}
+    {% else %}
+    table-warning
+    {% endif %}" {% if event.cancelled %}style="opacity: 50% !important;"{% endif %} id="event_row">
+    <!---Number-->
+    <div class="font-weight-bold c-none c-lg-block" id="event_number">{{ event.display_id }}</div>
+    <!--Dates & Times-->
+    <div id="event_dates" style="min-width: 180px;">
+        <dl>
+          {% if not event.cancelled %}
+            {% if event.meet_at %}
+            <dt class="font-weight-normal">Meet:</dt>
+            <dd class="text-nowrap font-weight-bold text-lg-right">{{ event.meet_at|date:"D d/m/Y H:i" }}</dd>
+            {% endif %}
+            {% if event.access_at %}
+            <dt class="font-weight-normal">Access:</dt>
+            <dd class="text-nowrap font-weight-bold text-lg-right">{{ event.access_at|date:"D d/m/Y H:i" }}</dd>
+            {% endif %}
+          {% endif %}
+          <dt class="font-weight-normal">Start:</dt>
+          <dd class="text-nowrap font-weight-bold text-lg-right">{{ event.start_date|date:"D d/m/Y" }}
+            {% if event.has_start_time %}
+              {{ event.start_time|date:"H:i" }}
+            {% endif %}
+          </dd>
+          {% if event.end_date %}
+          <dt class="font-weight-normal">End:</dt>
+          <dd class="text-nowrap font-weight-bold text-lg-right">{{ event.end_date|date:"D d/m/Y" }}
+            {% if event.has_end_time %}
+            {{ event.end_time|date:"H:i" }}
+            {% endif %}
+          </dd>
+          {% endif %}
+        </dl>
+    </div>
+    <!---Details-->
+    <div id="event_details" class="w-100">
+        <h4>
+            <a href="{% url 'event_detail' event.pk %}">
+                <span class="c-inline c-lg-none">{{ event }}</span><span class="c-none c-lg-inline">{{ event.name }}</span>
+            </a>
+            {% if event.dry_hire %}
+            <span class="badge badge-secondary">Dry Hire</span>
+            {% endif %}
+            <br class="c-none c-lg-inline">
+            {% if event.venue %}
+            <small>at {{ event.venue|namewithnotes:'venue_detail' }}</small>
+            {% endif %}
+        </h4>
+        {% if event.is_rig and not event.cancelled %}
+        <h5>
+            <a href="{{ event.person.get_absolute_url }}">{{ event.person.name }}</a>
+            {% if event.organisation %}
+            for <a href="{{ event.organisation.get_absolute_url }}">{{ event.organisation.name }}</a>
+            {% endif %}
+        </h5>
+        {% endif %}
+        {% if not event.cancelled and event.description %}
+        <p>{{ event.description|markdown }}</p>
+        {% endif %}
+    </div>
+    {% include 'partials/event_status.html' %}
+    <!---MIC-->
+    <div id="event_mic" class="text-nowrap">
+        <span class="c-md-none align-middle">MIC:</span>
+        {% if event.mic %}
+        {% if perms.RIGS.view_profile %}
+        <a href="{% url 'profile_detail' event.mic.pk %}" class="modal-href">
+            {% endif %}
+            <img src="{{ event.mic.profile_picture }}" class="event-mic-photo"/>
+            {{ event.mic }}
+            {% if perms.RIGS.view_profile %}
+        </a>
+        {% endif %}
+        {% elif event.is_rig %}
+        <span class="fas fa-exclamation"></span>
+        {% endif %}
+    </div>
+</div>
+{% endfor %}
+</div>

RIGS/templates/partials/legacy_event_table.html

@@ -1,195 +0,0 @@
-{% load namewithnotes from filters %}
-{% load markdown_tags %}
-<style>
-#event_table {
-    display: grid;
-    grid-template-columns: max-content min-content minmax(max-content, 1fr) max-content;
-    column-gap: 1em;
-}
-.eventgrid {
-    display: inherit;
-    grid-column: 1/5;
-    grid-template-columns: subgrid;
-    padding: 1em;
-    dt, dd { display: block; float: left; }
-    dt { clear: both; }
-    dd { float: right; }
-}
-.grid-header {
-    border-bottom: 1px solid grey;
-    border-top: 1px solid grey;
-}
-#event_status {
-    grid-column-start: 3;
-}
-#event_mic {
-    grid-row-start: 1;
-    grid-column-start: 4;
-}
-.c-none {
-    display: none;
-}
-.c-inline {
-    display: inline;
-}
-@container (width <= 500px) {
-  #event_table {
-    grid-template-columns: 1fr !important;
-  }
-  .eventgrid {
-    grid-column: 1/1 !important;
-    padding: 0.5em;
-  }
-  .grid-header {
-    display: none;
-  }
-  #event_dates {
-    order: 2;
-  }
-  #event_status {
-    order: 3;
-  }
-  #event_mic {
-    grid-row-start: auto;
-    grid-column-start: 4;
-  }
-}
-@container (width <= 700px) {
-  #event_table {
-    grid-template-columns: max-content;
-    column-gap: 0.5em;
-  }
-  .eventgrid {
-    grid-column: 1/3;
-    border: 1px solid grey;
-  }
-  #event_dates {
-    grid-row: 2;
-    grid-column: 1;
-  }
-  #event_number {
-    grid-row: 1;
-    grid-column: 1;
-  }
-  #event_mic {
-    grid-column: 2;
-  }
-  #event_status {
-    grid-column: span 2;
-  }
-  .grid-header, .c-md-none {
-    display: none;
-  }
-}
-@container (width > 700px) {
-    .c-lg-block {
-        display: block;
-    }
-    .c-lg-inline {
-        display: inline;
-    }
-    .c-lg-none, .c-md-none {
-        display: none;
-    }
-}
-</style>
-<div id="event_table">
-    <div class="eventgrid grid-header font-weight-bold">
-        <div id="event_number">#</div>
-        <div id="event_dates">Dates & Times</div>
-        <div>Event Details</div>
-        <div id="event_mic">MIC</div>
-    </div>
-    {% for event in events %}
-    <div class="eventgrid {% if event.cancelled %}
-    table-secondary
-    {% elif not event.is_rig %}
-    table-info
-    {% elif not event.mic %}
-    table-danger
-    {% elif event.confirmed and event.authorised %}
-    {% if event.dry_hire or event.riskassessment %}
-    table-success
-    {% else %}
-    table-warning
-    {% endif %}
-    {% else %}
-    table-warning
-    {% endif %}" {% if event.cancelled %}style="opacity: 50% !important;"{% endif %} id="event_row">
-    <!---Number-->
-    <div class="font-weight-bold c-none c-lg-block" id="event_number">{{ event.display_id }}</div>
-    <!--Dates & Times-->
-    <div id="event_dates" style="min-width: 180px;">
-        <dl>
-          {% if not event.cancelled %}
-            {% if event.meet_at %}
-            <dt class="font-weight-normal">Meet:</dt>
-            <dd class="text-nowrap font-weight-bold text-lg-right">{{ event.meet_at|date:"D d/m/Y H:i" }}</dd>
-            {% endif %}
-            {% if event.access_at %}
-            <dt class="font-weight-normal">Access:</dt>
-            <dd class="text-nowrap font-weight-bold text-lg-right">{{ event.access_at|date:"D d/m/Y H:i" }}</dd>
-            {% endif %}
-          {% endif %}
-          <dt class="font-weight-normal">Start:</dt>
-          <dd class="text-nowrap font-weight-bold text-lg-right">{{ event.start_date|date:"D d/m/Y" }}
-            {% if event.has_start_time %}
-              {{ event.start_time|date:"H:i" }}
-            {% endif %}
-          </dd>
-          {% if event.end_date %}
-          <dt class="font-weight-normal">End:</dt>
-          <dd class="text-nowrap font-weight-bold text-lg-right">{{ event.end_date|date:"D d/m/Y" }}
-            {% if event.has_end_time %}
-            {{ event.end_time|date:"H:i" }}
-            {% endif %}
-          </dd>
-          {% endif %}
-        </dl>
-    </div>
-    <!---Details-->
-    <div id="event_details" class="w-100">
-        <h4>
-            <a href="{% url 'event_detail' event.pk %}">
-                <span class="c-inline c-lg-none">{{ event }}</span><span class="c-none c-lg-inline">{{ event.name }}</span>
-            </a>
-            {% if event.dry_hire %}
-            <span class="badge badge-secondary">Dry Hire</span>
-            {% endif %}
-            <br class="c-none c-lg-inline">
-            {% if event.venue %}
-            <small>at {{ event.venue|namewithnotes:'venue_detail' }}</small>
-            {% endif %}
-        </h4>
-        {% if event.is_rig and not event.cancelled %}
-        <h5>
-            <a href="{{ event.person.get_absolute_url }}">{{ event.person.name }}</a>
-            {% if event.organisation %}
-            for <a href="{{ event.organisation.get_absolute_url }}">{{ event.organisation.name }}</a>
-            {% endif %}
-        </h5>
-        {% endif %}
-        {% if not event.cancelled and event.description %}
-        <p>{{ event.description|markdown }}</p>
-        {% endif %}
-    </div>
-    {% include 'partials/event_status.html' %}
-    <!---MIC-->
-    <div id="event_mic" class="text-nowrap">
-        <span class="c-md-none align-middle">MIC:</span>
-        {% if event.mic %}
-        {% if perms.RIGS.view_profile %}
-        <a href="{% url 'profile_detail' event.mic.pk %}" class="modal-href">
-            {% endif %}
-            <img src="{{ event.mic.profile_picture }}" class="event-mic-photo"/>
-            {{ event.mic }}
-            {% if perms.RIGS.view_profile %}
-        </a>
-        {% endif %}
-        {% elif event.is_rig %}
-        <span class="fas fa-exclamation"></span>
-        {% endif %}
-    </div>
-</div>
-{% endfor %}
-</div>

RIGS/templates/partials/yes_no_radio.html

@@ -1,7 +1,7 @@
 <div class="row">
-    <label for="{{ formitem.0.id_for_label }}"
+    <label for="{{ formitem.id_for_label }}"
                                     class="col-8 control-label">{{ formitem.help_text|safe }}</label>
-    <div class="col-4 pb-3" id="{{ formitem.0.id_for_label|slice:'-2'  }}">
+    <div class="col-4 pb-3" id="{{ formitem.id_for_label|slice:'-2' }}">
         {% for radio in formitem %}
             <div class="custom-control custom-radio">
                 {{ radio.tag }}

RIGS/templates/rigboard.html

@@ -4,44 +4,15 @@
 {% block content %}
 <div class="row align-items-center justify-content-between py-2 align-middle">
     <div class="col-sm-12 col-md align-middle d-flex flex-wrap">
-        Key: <span class="table-success mr-1 px-2 rounded">Ready</span><span
+        Key: <span class="table-success mr-1 px-2 rounded">Ready</span><span class="table-warning mr-1 px-2 rounded text-nowrap">Action Required</span><span class="table-danger mr-1 px-2 rounded text-nowrap">Needs MIC</span><span class="table-secondary mr-1 px-2 rounded">Cancelled</span><span class="table-info px-2 rounded text-nowrap">Non-Rig</span>
-            class="table-warning mr-1 px-2 rounded text-nowrap">Action Required</span><span
-            class="table-danger mr-1 px-2 rounded text-nowrap">Needs MIC</span><span
-            class="table-secondary mr-1 px-2 rounded">Cancelled</span><span
-            class="table-info px-2 rounded text-nowrap">Non-Rig</span>
     </div>
     {% if perms.RIGS.add_event %}
     <div class="col text-right">
         {% button 'new' 'event_create' %}
     </div>
     {% endif %}
-    {% if not request.GET.legacy %}
-
-    {% if not request.GET.hide_cancelled %}
-    <a href="?hide_cancelled=true" class="btn btn-primary mr-3">Hide cancelled</a>
-    {% else %}
-    <a href="." class="btn btn-primary mr-3">Show cancelled</a>
-    {% endif %}
-
-    <a href="?legacy=true" class="btn btn-secondary">Legacy rigboard</a>
-    {% else %}
-    <a href="." class="btn btn-secondary">New rigboard</a>
-    {% endif %}
 </div>
-
-{% if request.GET.legacy %}
-<div class="alert alert-warning">
-    <strong>Warning:</strong> The legacy rigboard is being deprecated and will be removed in the future. Please use the
-    new rigboard.
-</div>
-{% endif %}
-
-
 <div style="container-type: inline-size;">
-    {% if request.GET.legacy %}
+{% include 'partials/event_table.html' %}
-    {% include 'partials/legacy_event_table.html' %}
-    {% else %}
-    {% include 'partials/event_table.html' %}
-    {% endif %}
 </div>
 {% endblock %}

RIGS/tests/pages.py

@@ -16,14 +16,14 @@ class Rigboard(BasePage):
     URL_TEMPLATE = reverse('rigboard')
 
     _add_item_selector = (By.XPATH, "//a[contains(@class,'btn-primary') and contains(., 'New')]")
-    _event_row_locator = (By.CLASS_NAME, "event-row")
+    _event_row_locator = (By.ID, 'event_row')
 
     def add(self):
         self.find_element(*self._add_item_selector).click()
 
     class EventListRow(Region):
         _event_number_locator = (By.ID, "event_number")
-        _event_dates_locator = (By.CLASS_NAME, "event-dates")
+        _event_dates_locator = (By.ID, "event_dates")
         _event_details_locator = (By.ID, "event_details")
         _event_mic_locator = (By.ID, "event_mic")
 

RIGS/tests/test_interaction.py

@@ -91,8 +91,8 @@ class TestRigboard(BaseRigboardTest):
         #    self.live_server_url + '/event/create/', self.driver.current_url)
 
     def test_event_order(self):
-        self.assertIn(self.testEvent.start_date.strftime('%-d %b %Y'), self.page.events[0].dates)
+        self.assertIn(self.testEvent.start_date.strftime('%a %d/%m/%Y'), self.page.events[0].dates)
-        self.assertIn(self.testEvent2.start_date.strftime('%-d %b %Y'), self.page.events[1].dates)
+        self.assertIn(self.testEvent2.start_date.strftime('%a %d/%m/%Y'), self.page.events[1].dates)
 
     def test_add_button(self):
         self.page.add()
@@ -530,11 +530,10 @@ class TestCalendar(BaseRigboardTest):
         self.page.toggle_filter('cancelled')
         self.page.toggle_filter('provisional')
         self.page.toggle_filter('confirmed')
-        self.page.toggle_filter('only_mic')
 
         # and then check the url is correct
         self.assertIn(
-            "rigs.ics?rig=false&non-rig=false&dry-hire=false&cancelled=true&provisional=false&confirmed=false&only_mic=true",
+            "rigs.ics?rig=false&non-rig=false&dry-hire=false&cancelled=true&provisional=false&confirmed=false",
             self.page.cal_url)
 
         # Awesome - all seems to work

RIGS/views/ical.py

@@ -24,7 +24,6 @@ class CalendarICS(ICalFeed):
     # Rig = 'rig' = True
     # Provisional = 'provisional' = True
     # Confirmed/Booked = 'confirmed' = True
-    # Only MIC = 'mic' = False
 
     def get_object(self, request, *args, **kwargs):
         params = {}
@@ -36,9 +35,6 @@ class CalendarICS(ICalFeed):
         params['cancelled'] = request.GET.get('cancelled', 'false') == 'true'
         params['provisional'] = request.GET.get('provisional', 'true') == 'true'
         params['confirmed'] = request.GET.get('confirmed', 'true') == 'true'
-        params['only_mic'] = request.GET.get('only_mic', 'false') == 'true'
-
-        params['user'] = kwargs['user']
 
         return params
 
@@ -77,9 +73,6 @@ class CalendarICS(ICalFeed):
 
         filter = filter & typeFilters & statusFilters
 
-        if params['only_mic']:
-            filter = filter & Q(mic=params['user'])
-
         return models.Event.objects.filter(filter).order_by('-start_date').select_related('person', 'organisation',
                                                                                           'venue', 'mic')
 

RIGS/views/rigboard.py

@@ -41,13 +41,8 @@ class RigboardIndex(generic.TemplateView):
         # get super context
         context = super().get_context_data(**kwargs)
 
-        objects = models.Event.objects.current_events()
-
-        if self.request.GET.get('hide_cancelled', False):
-            objects = objects.exclude(status=models.Event.CANCELLED)
-
         # call out method to get current events
-        context['events'] = objects.select_related('riskassessment', 'invoice').prefetch_related('checklists')
+        context['events'] = models.Event.objects.current_events().select_related('riskassessment', 'invoice').prefetch_related('checklists')
         context['page_title'] = "Rigboard"
         return context
 
@@ -360,7 +355,7 @@ class EventAuthorisationRequest(generic.FormView, generic.detail.SingleObjectMix
         )
         css = finders.find('css/email.css')
         html = premailer.Premailer(get_template("email/eventauthorisation_client_request.html").render(context),
-                                   external_styles=css, allow_loading_external_files=True).transform()
+                                   external_styles=css).transform()
         msg.attach_alternative(html, 'text/html')
 
         msg.send()
@@ -376,7 +371,7 @@ class EventAuthoriseRequestEmailPreview(generic.DetailView):
         css = finders.find('css/email.css')
         response = super().render_to_response(context, **response_kwargs)
         assert isinstance(response, HttpResponse)
-        response.content = premailer.Premailer(response.rendered_content, external_styles=css, allow_loading_external_files=True).transform()
+        response.content = premailer.Premailer(response.rendered_content, external_styles=css).transform()
         return response
 
     def get_context_data(self, **kwargs):

assets/templates/asset_audit.html

@@ -1,4 +1,4 @@
-{% extends is_ajax|yesno:'base_ajax.html,base_assets.html' %}
+{% extends request.is_ajax|yesno:'base_ajax.html,base_assets.html' %}
 {% load widget_tweaks %}
 
 {% block content %}
@@ -79,7 +79,7 @@
       </div>
     </div>
   </div>
-  {% if not is_ajax %}
+  {% if not request.is_ajax %}
     <div class="form-group form-row pull-right">
         <button class="btn btn-success" type="submit" form="asset_audit_form" id="id_mark_audited">Mark Audited</button>
     </div>

assets/templates/asset_form.html

@@ -1,4 +1,4 @@
-{% extends is_ajax|yesno:"base_ajax.html,base_assets.html" %}
+{% extends 'base_assets.html' %}
 {% load widget_tweaks %}
 {% load static %}
 

assets/tests/conftest.py

@@ -52,10 +52,3 @@ def test_asset_2(db, category, test_status_2):
     asset, created = models.Asset.objects.get_or_create(asset_id="10", description="Working Mic", status=test_status_2, category=category, date_acquired=datetime.date(2001, 10, 20), replacement_cost=1000)
     yield asset
     asset.delete()
-
-
-@pytest.fixture
-def test_supplier(db):
-    supplier, created = models.Supplier.objects.get_or_create(name="Fullmetal Heavy Industry")
-    yield supplier
-    supplier.delete()

assets/tests/test_interaction.py

@@ -7,12 +7,13 @@ from selenium.webdriver.common.by import By
 from selenium.webdriver.support import expected_conditions as ec
 from selenium.webdriver.support.ui import WebDriverWait
 
-from PyRIGS.tests.base import AutoLoginTest, assert_times_almost_equal
+from PyRIGS.tests.base import AutoLoginTest, screenshot_failure_cls, assert_times_almost_equal
 from PyRIGS.tests.pages import animation_is_finished
 from assets import models
 from . import pages
 
 
+@screenshot_failure_cls
 class TestAssetList(AutoLoginTest):
     def setUp(self):
         super().setUp()
@@ -143,6 +144,7 @@ def test_asset_duplicate(logged_in_browser, admin_user, live_server, test_asset)
     assert models.Asset.objects.last().description == test_asset.description
 
 
+@screenshot_failure_cls
 class TestAssetForm(AutoLoginTest):
     def setUp(self):
         super().setUp()
@@ -209,6 +211,7 @@ class TestAssetForm(AutoLoginTest):
         self.assertEqual(asset.date_acquired, acquired)
 
 
+@screenshot_failure_cls
 class TestSupplierList(AutoLoginTest):
     def setUp(self):
         super().setUp()
@@ -241,35 +244,39 @@ class TestSupplierList(AutoLoginTest):
 
         self.page.set_query("")
         self.page.search()
-        time.sleep(1)
         self.assertTrue(len(self.page.suppliers) == 7)
 
-        self.page.set_query("NOTFOUND")
+        self.page.set_query("This is not a supplier")
         self.page.search()
         self.assertTrue(len(self.page.suppliers) == 0)
 
 
-def test_supplier_create(logged_in_browser, live_server):
+@screenshot_failure_cls
-    page = pages.SupplierCreate(logged_in_browser.driver, live_server.url).open()
+class TestSupplierCreateAndEdit(AutoLoginTest):
+    def setUp(self):
+        super().setUp()
+        self.supplier = models.Supplier.objects.create(name="Fullmetal Heavy Industry")
 
-    page.remove_all_required()
+    def test_supplier_create(self):
-    page.submit()
+        self.page = pages.SupplierCreate(self.driver, self.live_server_url).open()
-    assert !self.page.success
-    assert "This field is required." in self.page.errors["Name"]
 
-    page.name = "Optican Health Supplies"
+        self.page.remove_all_required()
-    page.submit()
+        self.page.submit()
-    assert page.success
+        self.assertFalse(self.page.success)
+        self.assertIn("This field is required.", self.page.errors["Name"])
 
+        self.page.name = "Optican Health Supplies"
+        self.page.submit()
+        self.assertTrue(self.page.success)
 
-def test_supplier_edit(logged_in_browser, live_server, test_supplier):
+    def test_supplier_edit(self):
-    page = pages.SupplierEdit(logged_in_browser.driver, live_server.url, supplier_id=test_supplier.pk).open()
+        self.page = pages.SupplierEdit(self.driver, self.live_server_url, supplier_id=self.supplier.pk).open()
 
-    assert test_supplier.name == page.name
+        self.assertEqual("Fullmetal Heavy Industry", self.page.name)
-    new_name = "Cyberdyne Systems"
+        new_name = "Cyberdyne Systems"
-    page.name = new_name
+        self.page.name = new_name
-    page.submit()
+        self.page.submit()
-    assert page.success
+        self.assertTrue(self.page.success)
 
 
 def test_audit_search(logged_in_browser, live_server, test_asset):
@@ -304,30 +311,47 @@ def test_audit_success(logged_in_browser, admin_user, live_server, test_asset):
     assert test_asset.asset_id not in page.assets
 
 
-def test_audit_fail(logged_in_browser, admin_user, live_server, test_asset):
+@screenshot_failure_cls
-    page = pages.AssetAuditList(logged_in_browser.driver, live_server.url).open()
+class TestAssetAudit(AutoLoginTest):
-    wait = WebDriverWait(logged_in_browser.driver, 20)
+    def setUp(self):
-    page.set_query(test_asset.asset_id)
+        super().setUp()
-    page.search()
+        self.category = models.AssetCategory.objects.create(name="Haulage")
-    wait.until(ec.visibility_of_element_located((By.ID, 'modal')))
+        self.status = models.AssetStatus.objects.create(name="Probably Fine", should_show=True)
-    # Do it wrong on purpose to check error display
+        self.supplier = models.Supplier.objects.create(name="The Bazaar")
-    page.modal.remove_all_required()
+        self.connector = models.Connector.objects.create(description="Trailer Socket", current_rating=1,
-    page.modal.description = ""
+                                                         voltage_rating=40, num_pins=13)
-    page.modal.submit()
+        models.Asset.objects.create(asset_id="1", description="Trailer Cable", status=self.status,
-    wait.until(animation_is_finished())
+                                    category=self.category, date_acquired=datetime.date(2020, 2, 1), replacement_cost=10)
-    assert "This field is required." in self.page.modal.errors["Description"]
+        models.Asset.objects.create(asset_id="11", description="Trailerboard", status=self.status,
+                                    category=self.category, date_acquired=datetime.date(2020, 2, 1), replacement_cost=10)
+        models.Asset.objects.create(asset_id="111", description="Erms", status=self.status, category=self.category,
+                                    date_acquired=datetime.date(2020, 2, 1), replacement_cost=10)
+        self.asset = models.Asset.objects.create(asset_id="1111", description="A hammer", status=self.status,
+                                                 category=self.category,
+                                                 date_acquired=datetime.date(2020, 2, 1), replacement_cost=10)
+        self.page = pages.AssetAuditList(self.driver, self.live_server_url).open()
+        self.wait = WebDriverWait(self.driver, 20)
 
+    def test_audit_fail(self):
+        self.page.set_query(self.asset.asset_id)
+        self.page.search()
+        self.wait.until(ec.visibility_of_element_located((By.ID, 'modal')))
+        # Do it wrong on purpose to check error display
+        self.page.modal.remove_all_required()
+        self.page.modal.description = ""
+        self.page.modal.submit()
+        self.wait.until(animation_is_finished())
+        self.driver.implicitly_wait(4)
+        self.assertIn("This field is required.", self.page.modal.errors["Description"])
 
-def test_audit_list(logged_in_browser, admin_user, live_server, test_asset):
+    def test_audit_list(self):
-    page = pages.AssetAuditList(logged_in_browser.driver, live_server.url).open()
+        self.assertEqual(models.Asset.objects.filter(last_audited_at=None).count(), len(self.page.assets))
-    wait = WebDriverWait(logged_in_browser.driver, 20)
+        asset_row = self.page.assets[0]
-    assert models.Asset.objects.filter(last_audited_at=None).count() == len(self.page.assets)
+        self.driver.find_element(By.XPATH, "//a[contains(@class,'btn') and contains(., 'Audit')]").click()
-    asset_row = page.assets[0]
+        self.wait.until(ec.visibility_of_element_located((By.ID, 'modal')))
-    logged_in_browser.driver.find_element(By.XPATH, "//a[contains(@class,'btn') and contains(., 'Audit')]").click()
+        self.assertEqual(self.page.modal.asset_id, asset_row.id)
-    wait.until(ec.visibility_of_element_located((By.ID, 'modal')))
+        self.page.modal.close()
-    assert self.page.modal.asset_id == asset_row.id
+        self.assertFalse(self.driver.find_element(By.ID, 'modal').is_displayed())
-    page.modal.close()
+        # Make sure audit log was NOT filled out
-    assert !logged_in_browser.driver.find_element(By.ID, 'modal').is_displayed()
+        audited = models.Asset.objects.get(asset_id=asset_row.id)
-    # Make sure audit log was NOT filled out
+        assert audited.last_audited_by is None
-    audited = models.Asset.objects.get(asset_id=asset_row.id)
-    assert audited.last_audited_by is None

assets/views.py

@@ -16,7 +16,7 @@ from django.views.decorators.csrf import csrf_exempt
 from django.shortcuts import get_object_or_404
 from django.template.loader import get_template
 
-from PyPDF2 import PdfMerger, PdfReader
+from PyPDF2 import PdfFileMerger, PdfFileReader
 from PIL import Image, ImageDraw, ImageFont, ImageOps
 from barcode import Code39
 from barcode.writer import ImageWriter
@@ -127,7 +127,7 @@ class AssetEdit(LoginRequiredMixin, AssetIDUrlMixin, generic.UpdateView):
         return context
 
     def get_success_url(self):
-        if is_ajax(self.request).get('is_ajax'):
+        if is_ajax(self.request):
             url = reverse_lazy('closemodal')
             update_url = str(reverse_lazy('asset_update', kwargs={'pk': self.object.pk}))
             messages.info(self.request, "modalobject=" + serializers.serialize("json", [self.object]))
@@ -233,7 +233,7 @@ class SupplierList(GenericListView):
         context['edit'] = 'supplier_update'
         context['can_edit'] = self.request.user.has_perm('assets.change_supplier')
         context['detail'] = 'supplier_detail'
-        if is_ajax(self.request).get('is_ajax'):
+        if is_ajax(self.request):
             context['override'] = "base_ajax.html"
         else:
             context['override'] = 'base_assets.html'
@@ -250,7 +250,7 @@ class SupplierDetail(GenericDetailView):
         context['detail_link'] = 'supplier_detail'
         context['associated'] = 'partials/associated_assets.html'
         context['associated2'] = ''
-        if is_ajax(self.request).get('is_ajax'):
+        if is_ajax(self.request):
             context['override'] = "base_ajax.html"
         else:
             context['override'] = 'base_assets.html'
@@ -264,7 +264,7 @@ class SupplierCreate(GenericCreateView, ModalURLMixin):
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        if is_ajax(self.request).get('is_ajax'):
+        if is_ajax(self.request):
             context['override'] = "base_ajax.html"
         else:
             context['override'] = 'base_assets.html'
@@ -280,7 +280,7 @@ class SupplierUpdate(GenericUpdateView, ModalURLMixin):
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        if is_ajax(self.request).get('is_ajax'):
+        if is_ajax(self.request):
             context['override'] = "base_ajax.html"
         else:
             context['override'] = 'base_assets.html'
@@ -417,11 +417,11 @@ class GenerateLabels(generic.View):
             # 'images3': images[3::4],
             'filename': name
         }
-        merger = PdfMerger()
+        merger = PdfFileMerger()
 
         rml = template.render(context)
         buffer = rml2pdf.parseString(rml)
-        merger.append(PdfReader(buffer))
+        merger.append(PdfFileReader(buffer))
         buffer.close()
 
         merged = BytesIO()

compose.yml

@@ -1,52 +0,0 @@
-services:
- db:
-   image: postgres:17
-   environment:
-     POSTGRES_DB: ${DATABASE_NAME}
-     POSTGRES_USER: ${DATABASE_USERNAME}
-     POSTGRES_PASSWORD: ${DATABASE_PASSWORD}
-   ports:
-     - "5432:5432"
-   volumes:
-     - postgres_data:/var/lib/postgresql/data
-   env_file:
-     - .env
-
- pyrigs:
-   build: .
-   container_name: pyrigs
-   ports:
-     - "8000:8000"
-   depends_on:
-     - db
-   environment:
-     DJANGO_SECRET_KEY: ${DJANGO_SECRET_KEY}
-     DEBUG: ${DEBUG}
-     DJANGO_LOGLEVEL: ${DJANGO_LOGLEVEL}
-     DJANGO_ALLOWED_HOSTS: ${DJANGO_ALLOWED_HOSTS}
-     DATABASE_ENGINE: ${DATABASE_ENGINE}
-     DATABASE_NAME: ${DATABASE_NAME}
-     DATABASE_USERNAME: ${DATABASE_USERNAME}
-
-     DATABASE_PASSWORD: ${DATABASE_PASSWORD}
-     DATABASE_HOST: ${DATABASE_HOST}
-     DATABASE_PORT: ${DATABASE_PORT}
-   env_file:
-     - .env
-   develop:
-      # Create a `watch` configuration to update the app
-      #
-      watch:
-        # Sync the working directory with the `/app` directory in the container
-        - action: sync
-          path: .
-          target: /app
-          # Exclude the project virtual environment
-          ignore:
-            - .venv/
-
-        # Rebuild the image on changes to the `pyproject.toml`
-        - action: rebuild
-          path: ./pyproject.toml
-volumes:
-   postgres_data:

pyproject.toml

@@ -1,92 +0,0 @@
-[project]
-name = "pyrigs"
-version = "0.1.0"
-description = "A Django-based event booking system designed for use by TEC PA and Lighting"
-readme = "README.md"
-requires-python = "~=3.10.0"
-dependencies = [
-    "ansicolors",
-    "asgiref",
-    "beautifulsoup4",
-    "Brotli",
-    "cachetools",
-    "chardet",
-    "configparser",
-    "contextlib2",
-    "cssselect",
-    "cssutils",
-    "dj-database-url",
-    "dj-static",
-    "Django~=5.2",
-    "django-filter",
-    "django-ical",
-    "django-recurrence",
-    "django-registration-redux",
-    "django-reversion",
-    "django-widget-tweaks",
-    "django-htmlmin",
-    "envparse",
-    "gunicorn",
-    "icalendar",
-    "idna",
-    "Markdown",
-    "msgpack",
-    "pep517",
-    "Pillow",
-    "premailer",
-    "progress",
-    "psutil",
-    "psycopg2-binary",
-    "Pygments",
-    "pyparsing",
-    "PyPDF2",
-    "pytoml",
-    "pytz",
-    "reportlab",
-    "retrying",
-    "simplejson",
-    "soupsieve",
-    "sqlparse",
-    "static3",
-    "svg2rlg",
-    "tornado",
-    "urllib3",
-    "whitenoise",
-    "yolk",
-    "zipp",
-    "zope.component",
-    "zope.deferredimport",
-    "zope.deprecation",
-    "zope.event",
-    "zope.hookable",
-    "zope.proxy",
-    "zope.schema",
-    "sentry-sdk",
-    "diff-match-patch",
-    "python-barcode",
-    "django-hCaptcha",
-    "django-hcaptcha",
-    "z3c.rml",
-    "pikepdf",
-    "django-queryable-properties",
-    "django-mass-edit",
-    "selenium",
-    "zope.interface",
-]
-
-[dependency-groups]
-dev = [
-    "PyPOM",
-    "pycodestyle",
-    "coveralls",
-    "django-coverage-plugin",
-    "pytest-cov",
-    "pytest-django",
-    "pluggy~=1.2.0",
-    "pytest-splinter",
-    "pytest",
-    "pytest-reverse",
-    "pytest-xdist[psutil]",
-    "PyPOM[splinter]",
-    "autopep8>=2.3.2",
-]

setup.cfg

@@ -1,3 +1,2 @@
 [pycodestyle]
 max-line-length = 320
-exclude = .venv

templates/base.html

@@ -13,10 +13,6 @@
     <meta name="theme-color" content="#3853a4">
     <meta name="color-scheme" content="light dark">
 
-    <link rel="preconnect" href="https://fonts.googleapis.com">
-    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-    <link href="https://fonts.googleapis.com/css2?family=Fontdiner+Swanky&display=swap" rel="stylesheet">
-
     <link rel="icon" type="image/png" href="{% static 'imgs/pyrigs-avatar.png' %}">
     <link rel="apple-touch-icon" href="{% static 'imgs/pyrigs-avatar.png' %}">
 
@@ -40,7 +36,7 @@
 <nav class="navbar navbar-expand-lg navbar-dark bg-dark" role="navigation">
   <div class="container">
       <a class="navbar-brand" href="{% if request.user.is_authenticated %}https://rigs.nottinghamtec.co.uk{%else%}https://nottinghamtec.co.uk{%endif%}">
-        <img src="{% static 'imgs/logo.webp' %}" class="mr-auto" style="max-height: 40px;" alt="TEC's Logo: Serif 'TEC' vertically next to a blue box with the words 'PA and Lighting', surrounded by graduated rings" id="logo">
+        <img src="{% static 'imgs/logo.webp' %}" class="mr-auto" style="max-height: 40px; position: absolute; left: 0.5em; top: 0;" alt="TEC's Logo: Serif 'TEC' vertically next to a blue box with the words 'PA and Lighting', surrounded by graduated rings" id="logo">
       </a>
       {% block titleheader %}
       {% endblock %}
@@ -76,7 +72,7 @@
             {% endfor %}
         {% endif %}
     {% endblock %}
-    {% if page_title and not is_ajax %}
+    {% if page_title and not request.is_ajax %}
     <h2>{{page_title|safe}}</h2>
     {% endif %}
     {% block content %}{% endblock %}

templates/generic_detail.html

@@ -46,7 +46,7 @@
         {% include associated2|safe %}
     {% endif %}
 
-    {% if not is_ajax %}
+    {% if not request.is_ajax %}
         <div class="row py-2">
             <div class="col-sm-12 text-right">
                 {% if can_edit %}
@@ -59,7 +59,7 @@
         </div>
     {% endif %}
 {% endblock %}
-{% if is_ajax %}
+{% if request.is_ajax %}
     {% block footer %}
         <div class="row py-2">
             <div class="col-sm-12 text-right">

templates/pagination.html

@@ -17,11 +17,11 @@
             {% endif %}
 
             {% for page in page_numbers %}
-                {% if page == page_obj.number %}
+                {% ifequal page page_obj.number %}
                     <li class="page-item active"><a class="page-link" href="#">{{ page }}</a></li>
                 {% else %}
                     <li class="page-item"><a class="page-link" href="?{% url_replace request 'page' page %}" class="page">{{ page }}</a></li>
-                {% endif %}
+                {% endifequal %}
             {% endfor %}
 
             {% if show_last %}

templates/search_help.html

@@ -1,10 +1,10 @@
-{% extends is_ajax|yesno:"base_ajax.html,base.html" %}
+{% extends request.is_ajax|yesno:"base_ajax.html,base.html" %}
 
 {% block title %}Search Help{% endblock %}
 
 {% block content %}
     <div class="row">
-        {% if not is_ajax %}
+        {% if not request.is_ajax %}
             <div class="col-sm-12">
                 <h1>Search Help</h1>
             </div>

training/templates/add_level_requirement.html

@@ -1,4 +1,4 @@
-{% extends is_ajax|yesno:'base_ajax.html,base_training.html' %}
+{% extends request.is_ajax|yesno:'base_ajax.html,base_training.html' %}
 
 {% load static %}
 {% load widget_tweaks %}
@@ -37,7 +37,7 @@
       <label for="depth" class="col-sm-2 col-form-label">Depth</label>
       {% render_field form.depth|add_class:'form-control col-sm'|attr:'required' %}
     </div>
-   {% if not is_ajax %}
+   {% if not request.is_ajax %}
    <button type="submit" class="btn btn-primary">Save</button>
    {% endif %}
 </form>

training/templates/edit_training_record.html

@@ -1,4 +1,4 @@
-{% extends is_ajax|yesno:'base_ajax.html,base_training.html' %}
+{% extends request.is_ajax|yesno:'base_ajax.html,base_training.html' %}
 
 {% load static %}
 {% load widget_tweaks %}
@@ -51,7 +51,7 @@
         {% render_field form.notes|add_class:'form-control' rows=3 %}
         </div>
     </div>
-  {% if not is_ajax %}
+  {% if not request.is_ajax %}
    <div class="col-sm-12 text-right pr-0">
         {% button 'submit' %}
     </div>

training/templates/partials/supervisor_field.html

@@ -1,9 +1,6 @@
 <label for="supervisor" class="col-sm-2 col-form-label">Supervisor</label>
-<select name="supervisor" id="supervisor_id" class="selectpicker col-sm-10" data-live-search="true"
+<select name="supervisor" id="supervisor_id" class="selectpicker col-sm-10" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials" required data-noclear="true">
-    data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials" required
+{% if supervisor %}
-    data-noclear="true">
-    {% if supervisor %}
     <option value="{{form.supervisor.value}}" selected>{{ supervisor }}</option>
-    {% endif %}
+{% endif %}
-    <option value="{{request.user.pk}}" selected>{{ request.user }}</option>
 </select>

training/tests/test_interaction.py

@@ -17,8 +17,8 @@ def select_super(page, supervisor):
     assert page.supervisor_selector.is_open
     page.supervisor_selector.search(supervisor.name[:-6])
     time.sleep(2)  # Slow down for javascript
-    page.supervisor_selector.set_option(supervisor.name, True)
     assert page.supervisor_selector.options[0].selected
+    page.supervisor_selector.toggle()
 
 
 def test_add_qualification(logged_in_browser, live_server, trainee, supervisor, training_item):
@@ -40,7 +40,6 @@ def test_add_qualification(logged_in_browser, live_server, trainee, supervisor,
     page.item_selector.toggle()
 
     select_super(page, supervisor)
-    page.supervisor_selector.toggle()
 
     page.submit()
     assert page.success

training/views.py

@@ -126,7 +126,7 @@ class AddQualification(generic.CreateView, ModalURLMixin):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context["depths"] = models.TrainingItemQualification.CHOICES
-        if is_ajax(self.request).get('is_ajax'):
+        if is_ajax(self.request):
             context['override'] = "base_ajax.html"
         else:
             context['override'] = 'base_training.html'

users/templates/profile_detail.html

@@ -1,4 +1,4 @@
-{% extends is_ajax|yesno:"base_ajax.html,base_rigs.html" %}
+{% extends request.is_ajax|yesno:"base_ajax.html,base_rigs.html" %}
 
 {% load static %}
 {% load linkornone from filters %}
@@ -41,7 +41,7 @@
 {% endblock %}
 
 {% block content %}
-    {% if not is_ajax and object.pk == user.pk %}
+    {% if not request.is_ajax and object.pk == user.pk %}
         <div class="row py-3">
             <div class="col text-right">
                 <div class="btn-group">
@@ -85,7 +85,7 @@
                 </div>
              </div>
         </div>
-        {% if not is_ajax and object.pk == user.pk %}
+        {% if not request.is_ajax and object.pk == user.pk %}
             <div class="col-lg-8 col-12">
                 <div class="card">
                     <div class="card-header">Personal iCal Details</div>
@@ -126,9 +126,6 @@
                                         <label class="checkbox-inline ml-lg-2">
                                             <input type="checkbox" value="confirmed" data-default="true" checked> Confirmed/Booked
                                         </label>
-                                        <label class="checkbox-inline ml-lg-2">
-                                            <input type="checkbox" value="only_mic" data-default="false" > Only MIC
-                                        </label>
                                     </div>
                                 </form>
                             </dd>

users/views.py

@@ -1,10 +1,10 @@
 from django.contrib import messages
 from django.contrib.auth.views import LoginView
-from django.contrib.auth import get_user_model
 from django.urls import reverse_lazy
 from django.views import generic
 from django.views.decorators.csrf import csrf_exempt
-from django.conf import settings
+
+from RIGS import models
 
 
 # This view should be exempt from requiring CSRF token.
@@ -28,7 +28,7 @@ class LoginEmbed(LoginView):
 
 class ProfileDetail(generic.DetailView):
     template_name = "profile_detail.html"
-    model = get_user_model()
+    model = models.Profile
 
     def get_queryset(self):
         try:
@@ -48,7 +48,7 @@ class ProfileDetail(generic.DetailView):
 
 class ProfileUpdateSelf(generic.UpdateView):
     template_name = "profile_form.html"
-    model = get_user_model()
+    model = models.Profile
     fields = ['first_name', 'last_name', 'email', 'initials', 'phone', 'dark_theme']
 
     def get_queryset(self):

versioning/templates/activity_feed_data.html

@@ -1,4 +1,4 @@
-{% extends is_ajax|yesno:"base_ajax_nomodal.html,base_rigs.html" %}
+{% extends request.is_ajax|yesno:"base_ajax_nomodal.html,base_rigs.html" %}
 
 {% load static %}
 {% load humanize %}