Whoops

This reverts commit f5d875d153.

.github/workflows/django.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
-            python-version: 3.9.1
+            python-version: 3.9
       - uses: actions/cache@v2
         id: pcache
         with:
@@ -27,7 +27,8 @@ jobs:
               ${{ runner.os }}-pipenv-
       - name: Install Dependencies
         run: |
-              python -m pip install --upgrade pip pipenv
+              python -m pip install --upgrade pip
+              pip install pipenv
               pipenv install -d
         # if: steps.pcache.outputs.cache-hit != 'true'
       - name: Cache Static Files

Pipfile

@@ -19,10 +19,11 @@ cssselect = "~=1.1.0"
 cssutils = "~=1.0.2"
 dj-database-url = "~=0.5.0"
 dj-static = "~=0.0.6"
-Django = "~=3.1.12"
+Django = "~=3.1.5"
 django-debug-toolbar = "~=3.2"
 django-filter = "~=2.4.0"
 django-ical = "~=1.7.1"
+django-recaptcha = "~=2.0.6"
 django-recurrence = "~=1.10.3"
 django-registration-redux = "~=2.9"
 django-reversion = "~=3.0.9"
@@ -34,11 +35,11 @@ gunicorn = "~=20.0.4"
 icalendar = "~=4.0.7"
 idna = "~=2.10"
 importlib-metadata = "~=3.4.0"
-lxml = "~=4.6.3"
+lxml = "~=4.6.2"
 Markdown = "~=3.3.3"
 msgpack = "~=1.0.2"
 pep517 = "~=0.9.1"
-Pillow = "~=8.3.2"
+Pillow = "~=8.1.0"
 premailer = "~=3.7.0"
 progress = "~=1.5"
 psutil = "~=5.8.0"
@@ -56,12 +57,12 @@ retrying = "~=1.3.3"
 simplejson = "~=3.17.2"
 six = "~=1.15.0"
 soupsieve = "~=2.1"
-sqlparse = "~=0.4.2"
+sqlparse = "~=0.4.1"
 static3 = "~=0.7.0"
 svg2rlg = "~=0.3"
 tini = "~=3.0.1"
 tornado = "~=6.1"
-urllib3 = "~=1.26.5"
+urllib3 = "~=1.26.2"
 whitenoise = "~=5.2.0"
 yolk = "~=0.4.3"
 "z3c.rml" = "~=4.1.2"
@@ -76,8 +77,6 @@ zipp = "~=3.4.0"
 "zope.schema" = "~=6.0.1"
 sentry-sdk = "*"
 diff-match-patch = "*"
-python-barcode = "*"
-django-hCaptcha = "*"
 
 [dev-packages]
 selenium = "~=3.141.0"

PyRIGS/settings.py

@@ -65,8 +65,8 @@ INSTALLED_APPS = (
     'debug_toolbar',
     'registration',
     'reversion',
+    'captcha',
     'widget_tweaks',
-    'hcaptcha',
 )
 
 MIDDLEWARE = (
@@ -186,13 +186,12 @@ LOGOUT_URL = '/user/logout/'
 
 ACCOUNT_ACTIVATION_DAYS = 7
 
-# CAPTCHA settings
-if DEBUG or CI:
-    HCAPTCHA_SITEKEY = '10000000-ffff-ffff-ffff-000000000001'
-    HCAPTCHA_SECRET = '0x0000000000000000000000000000000000000000'
-else:
-    HCAPTCHA_SITEKEY = env('HCAPTCHA_SITEKEY')
-    HCAPTCHA_SECRET = env('HCAPTCHA_SECRET')
+# reCAPTCHA settings
+RECAPTCHA_PUBLIC_KEY = env('RECAPTCHA_PUBLIC_KEY', default="6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI")  # If not set, use development key
+RECAPTCHA_PRIVATE_KEY = env('RECAPTCHA_PUBLIC_KEY', default="6LeIxAcTAAAAAGG-vFI1TnRWxMZNFuojJ4WifJWe")  # If not set, use development key
+NOCAPTCHA = True
+
+SILENCED_SYSTEM_CHECKS = ['captcha.recaptcha_test_key_error']
 
 # Email
 EMAILER_TEST = False

RIGS/finance.py

@@ -33,7 +33,20 @@ class InvoiceIndex(generic.ListView):
         return context
 
     def get_queryset(self):
-        return self.model.objects.outstanding_invoices()
+        # Manual query is the only way I have found to do this efficiently. Not ideal but needs must
+        sql = "SELECT * FROM " \
+              "(SELECT " \
+              "(SELECT COUNT(p.amount) FROM \"RIGS_payment\" AS p WHERE p.invoice_id=\"RIGS_invoice\".id) AS \"payment_count\", " \
+              "(SELECT SUM(ei.cost * ei.quantity) FROM \"RIGS_eventitem\" AS ei WHERE ei.event_id=\"RIGS_invoice\".event_id) AS \"cost\", " \
+              "(SELECT SUM(p.amount) FROM \"RIGS_payment\" AS p WHERE p.invoice_id=\"RIGS_invoice\".id) AS \"payments\", " \
+              "\"RIGS_invoice\".\"id\", \"RIGS_invoice\".\"event_id\", \"RIGS_invoice\".\"invoice_date\", \"RIGS_invoice\".\"void\" FROM \"RIGS_invoice\") " \
+              "AS sub " \
+              "WHERE (((cost > 0.0) AND (payment_count=0)) OR (cost - payments) <> 0.0) AND void = '0'" \
+              "ORDER BY invoice_date"
+
+        query = self.model.objects.raw(sql)
+
+        return query
 
 
 class InvoiceDetail(generic.DetailView):
@@ -42,13 +55,7 @@ class InvoiceDetail(generic.DetailView):
 
     def get_context_data(self, **kwargs):
         context = super(InvoiceDetail, self).get_context_data(**kwargs)
-        context['page_title'] = "Invoice {} ({}) ".format(self.object.display_id, self.object.invoice_date.strftime("%d/%m/%Y"))
-        if self.object.void:
-            context['page_title'] += "<span class='badge badge-warning float-right'>VOID</span>"
-        elif self.object.is_closed:
-            context['page_title'] += "<span class='badge badge-success float-right'>PAID</span>"
-        else:
-            context['page_title'] += "<span class='badge badge-info float-right'>OUTSTANDING</span>"
+        context['page_title'] = "Invoice {} ({})".format(self.object.display_id, self.object.invoice_date.strftime("%d/%m/%Y"))
         return context
 
 
@@ -166,7 +173,24 @@ class InvoiceWaiting(generic.ListView):
         return context
 
     def get_queryset(self):
-        return self.model.objects.waiting_invoices()
+        return self.get_objects()
+
+    def get_objects(self):
+        # TODO find a way to select items
+        events = self.model.objects.filter(
+            (
+                Q(start_date__lte=datetime.date.today(), end_date__isnull=True) |  # Starts before with no end
+                Q(end_date__lte=datetime.date.today())  # Has end date, finishes before
+            ) & Q(invoice__isnull=True) &  # Has not already been invoiced
+            Q(is_rig=True)  # Is a rig (not non-rig)
+
+        ).order_by('start_date') \
+            .select_related('person',
+                            'organisation',
+                            'venue', 'mic') \
+            .prefetch_related('items')
+
+        return events
 
 
 class InvoiceEvent(generic.View):

RIGS/hs.py

@@ -70,11 +70,6 @@ class EventRiskAssessmentDetail(generic.DetailView):
     model = models.RiskAssessment
     template_name = 'risk_assessment_detail.html'
 
-    def get_context_data(self, **kwargs):
-        context = super(EventRiskAssessmentDetail, self).get_context_data(**kwargs)
-        context['page_title'] = "Risk Assessment for Event <a href='{}'>{} {}</a>".format(self.object.event.get_absolute_url(), self.object.event.display_id, self.object.event.name)
-        return context
-
 
 class EventRiskAssessmentList(generic.ListView):
     paginate_by = 20
@@ -82,7 +77,7 @@ class EventRiskAssessmentList(generic.ListView):
     template_name = 'hs_object_list.html'
 
     def get_queryset(self):
-        return self.model.objects.exclude(event__status=models.Event.CANCELLED).order_by('reviewed_at').select_related('event')
+        return self.model.objects.order_by('reviewed_at').select_related('event')
 
     def get_context_data(self, **kwargs):
         context = super(EventRiskAssessmentList, self).get_context_data(**kwargs)
@@ -112,7 +107,7 @@ class EventChecklistDetail(generic.DetailView):
 
     def get_context_data(self, **kwargs):
         context = super(EventChecklistDetail, self).get_context_data(**kwargs)
-        context['page_title'] = "Event Checklist for Event <a href='{}'>{} {}</a>".format(self.object.event.get_absolute_url(), self.object.event.display_id, self.object.event.name)
+        context['page_title'] = "Event Checklist for Event {} {}".format(self.object.event.display_id, self.object.event.name)
         return context
 
 
@@ -187,9 +182,6 @@ class EventChecklistList(generic.ListView):
     model = models.EventChecklist
     template_name = 'hs_object_list.html'
 
-    def get_queryset(self):
-        return self.model.objects.exclude(event__status=models.Event.CANCELLED).order_by('reviewed_at').select_related('event')
-
     def get_context_data(self, **kwargs):
         context = super(EventChecklistList, self).get_context_data(**kwargs)
         context['title'] = 'Event Checklist'
@@ -218,7 +210,7 @@ class HSList(generic.ListView):
     template_name = 'hs_list.html'
 
     def get_queryset(self):
-        return models.Event.objects.all().exclude(status=models.Event.CANCELLED).order_by('-start_date').select_related('riskassessment').prefetch_related('checklists')
+        return models.Event.objects.all().order_by('-start_date').select_related('riskassessment').prefetch_related('checklists')
 
     def get_context_data(self, **kwargs):
         context = super(HSList, self).get_context_data(**kwargs)

RIGS/migrations/0040_auto_20210302_1148.py

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

RIGS/migrations/0040_profile_dark_theme.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.1.5 on 2021-02-06 10:43
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('RIGS', '0039_auto_20210123_1910'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='profile',
+            name='dark_theme',
+            field=models.BooleanField(default=False),
+        ),
+    ]

RIGS/migrations/0041_auto_20210208_1603.py

@@ -1,4 +1,4 @@
-# Generated by Django 3.1.7 on 2021-03-02 12:04
+# Generated by Django 3.1.5 on 2021-02-08 16:03
 
 import RIGS.models
 from django.db import migrations, models
@@ -7,27 +7,10 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('RIGS', '0040_auto_20210302_1148'),
+        ('RIGS', '0040_profile_dark_theme'),
     ]
 
     operations = [
-        migrations.RemoveField(
-            model_name='event',
-            name='meet_info',
-        ),
-        migrations.RemoveField(
-            model_name='event',
-            name='payment_method',
-        ),
-        migrations.RemoveField(
-            model_name='event',
-            name='payment_received',
-        ),
-        migrations.AddField(
-            model_name='profile',
-            name='dark_theme',
-            field=models.BooleanField(default=False),
-        ),
         migrations.AlterField(
             model_name='event',
             name='auth_request_to',
@@ -43,11 +26,26 @@ class Migration(migrations.Migration):
             name='description',
             field=models.TextField(blank=True, default=''),
         ),
+        migrations.AlterField(
+            model_name='event',
+            name='meet_info',
+            field=models.CharField(blank=True, default='', max_length=255),
+        ),
         migrations.AlterField(
             model_name='event',
             name='notes',
             field=models.TextField(blank=True, default=''),
         ),
+        migrations.AlterField(
+            model_name='event',
+            name='payment_method',
+            field=models.CharField(blank=True, default='', max_length=255),
+        ),
+        migrations.AlterField(
+            model_name='event',
+            name='payment_received',
+            field=models.CharField(blank=True, default='', max_length=255),
+        ),
         migrations.AlterField(
             model_name='event',
             name='purchase_order',
@@ -146,7 +144,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='profile',
             name='phone',
-            field=models.CharField(blank=True, default='', max_length=13),
+            field=models.CharField(default='', max_length=13, null=True),
         ),
         migrations.AlterField(
             model_name='riskassessment',

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/migrations/0042_auto_20211007_2338.py

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

RIGS/models.py

@@ -278,19 +278,6 @@ class EventManager(models.Manager):
         ).count()
         return event_count
 
-    def waiting_invoices(self):
-        events = self.filter(
-            (
-                models.Q(start_date__lte=datetime.date.today(), end_date__isnull=True) |  # Starts before with no end
-                models.Q(end_date__lte=datetime.date.today())  # Or has end date, finishes before
-            ) & models.Q(invoice__isnull=True) &  # Has not already been invoiced
-            models.Q(is_rig=True)  # Is a rig (not non-rig)
-        ).order_by('start_date') \
-            .select_related('person', 'organisation', 'venue', 'mic') \
-            .prefetch_related('items')
-
-        return events
-
 
 @reversion.register(follow=['items'])
 class Event(models.Model, RevisionMixin):
@@ -325,6 +312,7 @@ class Event(models.Model, RevisionMixin):
     end_time = models.TimeField(blank=True, null=True)
     access_at = models.DateTimeField(blank=True, null=True)
     meet_at = models.DateTimeField(blank=True, null=True)
+    meet_info = models.CharField(max_length=255, blank=True, default='')
 
     # Crew management
     checked_in_by = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='event_checked_in', blank=True, null=True,
@@ -333,6 +321,8 @@ class Event(models.Model, RevisionMixin):
                             verbose_name="MIC", on_delete=models.CASCADE)
 
     # Monies
+    payment_method = models.CharField(max_length=255, blank=True, default='')
+    payment_received = models.CharField(max_length=255, blank=True, default='')
     purchase_order = models.CharField(max_length=255, blank=True, default='', verbose_name='PO')
     collector = models.CharField(max_length=255, blank=True, default='', verbose_name='collected by')
 
@@ -343,13 +333,10 @@ class Event(models.Model, RevisionMixin):
 
     @property
     def display_id(self):
-        if self.pk:
-            if self.is_rig:
-                return str("N%05d" % self.pk)
-            else:
-                return self.pk
+        if self.is_rig:
+            return str("N%05d" % self.pk)
         else:
-            return "????"
+            return self.pk
 
     # Calculated values
     """
@@ -372,9 +359,6 @@ class Event(models.Model, RevisionMixin):
 
     @property
     def vat(self):
-        # No VAT is owed on internal transfers
-        if self.internal:
-            return 0
         return Decimal(self.sum_total * self.vat_rate.rate).quantize(Decimal('.01'))
 
     """
@@ -545,23 +529,6 @@ class EventAuthorisation(models.Model, RevisionMixin):
         return "{} (requested by {})".format(self.event.display_id, self.sent_by.initials)
 
 
-class InvoiceManager(models.Manager):
-    def outstanding_invoices(self):
-        # Manual query is the only way I have found to do this efficiently. Not ideal but needs must
-        sql = "SELECT * FROM " \
-              "(SELECT " \
-              "(SELECT COUNT(p.amount) FROM \"RIGS_payment\" AS p WHERE p.invoice_id=\"RIGS_invoice\".id) AS \"payment_count\", " \
-              "(SELECT SUM(ei.cost * ei.quantity) FROM \"RIGS_eventitem\" AS ei WHERE ei.event_id=\"RIGS_invoice\".event_id) AS \"cost\", " \
-              "(SELECT SUM(p.amount) FROM \"RIGS_payment\" AS p WHERE p.invoice_id=\"RIGS_invoice\".id) AS \"payments\", " \
-              "\"RIGS_invoice\".\"id\", \"RIGS_invoice\".\"event_id\", \"RIGS_invoice\".\"invoice_date\", \"RIGS_invoice\".\"void\" FROM \"RIGS_invoice\") " \
-              "AS sub " \
-              "WHERE (((cost > 0.0) AND (payment_count=0)) OR (cost - payments) <> 0.0) AND void = '0'" \
-              "ORDER BY invoice_date"
-
-        query = self.raw(sql)
-        return query
-
-
 @reversion.register(follow=['payment_set'])
 class Invoice(models.Model, RevisionMixin):
     event = models.OneToOneField('Event', on_delete=models.CASCADE)
@@ -570,8 +537,6 @@ class Invoice(models.Model, RevisionMixin):
 
     reversion_perm = 'RIGS.view_invoice'
 
-    objects = InvoiceManager()
-
     @property
     def sum_total(self):
         return self.event.sum_total
@@ -802,21 +767,21 @@ class EventChecklist(models.Model, RevisionMixin):
     fd_voltage_l2 = models.IntegerField(blank=True, null=True, verbose_name="First Distro Voltage L2-N", help_text="L2 - N")
     fd_voltage_l3 = models.IntegerField(blank=True, null=True, verbose_name="First Distro Voltage L3-N", help_text="L3 - N")
     fd_phase_rotation = models.BooleanField(blank=True, null=True, verbose_name="Phase Rotation", help_text="Phase Rotation<br><small>(if required)</small>")
-    fd_earth_fault = models.DecimalField(blank=True, null=True, max_digits=5, decimal_places=2, verbose_name="Earth Fault Loop Impedance", help_text="Earth Fault Loop Impedance (Z<small>S</small>)")
+    fd_earth_fault = models.IntegerField(blank=True, null=True, verbose_name="Earth Fault Loop Impedance", help_text="Earth Fault Loop Impedance (Z<small>S</small>)")
     fd_pssc = models.IntegerField(blank=True, null=True, verbose_name="PSCC", help_text="Prospective Short Circuit Current")
     # Worst case points
     w1_description = models.CharField(blank=True, default='', max_length=255, help_text="Description")
     w1_polarity = models.BooleanField(blank=True, null=True, help_text="Polarity Checked?")
     w1_voltage = models.IntegerField(blank=True, null=True, help_text="Voltage")
-    w1_earth_fault = models.DecimalField(blank=True, null=True, max_digits=5, decimal_places=2, verbose_name="Earth Fault Loop Impedance", help_text="Earth Fault Loop Impedance (Z<small>S</small>)")
+    w1_earth_fault = models.IntegerField(blank=True, null=True, help_text="Earth Fault Loop Impedance (Z<small>S</small>)")
     w2_description = models.CharField(blank=True, default='', max_length=255, help_text="Description")
     w2_polarity = models.BooleanField(blank=True, null=True, help_text="Polarity Checked?")
     w2_voltage = models.IntegerField(blank=True, null=True, help_text="Voltage")
-    w2_earth_fault = models.DecimalField(blank=True, null=True, max_digits=5, decimal_places=2, verbose_name="Earth Fault Loop Impedance", help_text="Earth Fault Loop Impedance (Z<small>S</small>)")
+    w2_earth_fault = models.IntegerField(blank=True, null=True, help_text="Earth Fault Loop Impedance (Z<small>S</small>)")
     w3_description = models.CharField(blank=True, default='', max_length=255, help_text="Description")
     w3_polarity = models.BooleanField(blank=True, null=True, help_text="Polarity Checked?")
     w3_voltage = models.IntegerField(blank=True, null=True, help_text="Voltage")
-    w3_earth_fault = models.DecimalField(blank=True, null=True, max_digits=5, decimal_places=2, verbose_name="Earth Fault Loop Impedance", help_text="Earth Fault Loop Impedance (Z<small>S</small>)")
+    w3_earth_fault = models.IntegerField(blank=True, null=True, help_text="Earth Fault Loop Impedance (Z<small>S</small>)")
 
     all_rcds_tested = models.BooleanField(blank=True, null=True, help_text="All circuit RCDs tested?<br><small>(using test button)</small>")
     public_sockets_tested = models.BooleanField(blank=True, null=True, help_text="Public/Performer accessible circuits tested?<br><small>(using socket tester)</small>")

RIGS/rigboard.py

@@ -151,7 +151,6 @@ class EventDuplicate(EventUpdate):
         # Clear checked in by if it's a dry hire
         if new.dry_hire is True:
             new.checked_in_by = None
-            new.collector = None
 
         # Remove all the authorisation information from the new event
         new.auth_request_to = ''

RIGS/templates/base_rigs.html

@@ -1,12 +1,9 @@
 {% extends 'base.html' %}
 
 {% load static %}
-{% load invoices_waiting from filters %}
-{% load invoices_outstanding from filters %}
-{% load total_invoices_todo from filters %}
 
 {% block titleheader %}
-<a class="navbar-brand" style="margin-left: auto; margin-right: auto;" href="/">RIGS</a>
+<a class="navbar-brand" href="/">RIGS</a>
 {% endblock %}
 
 {% block titleelements %}
@@ -47,17 +44,14 @@
     {% endif %}
     {% if perms.RIGS.view_invoice %}
     <li class="nav-item dropdown">
-      {% total_invoices_todo as todo %}
-      {% invoices_waiting as waiting %}
-      {% invoices_outstanding as outstanding %}
       <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownInvoices" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-        Invoices <span class="badge {% if todo == 0 %}badge-success{% else %}badge-danger{% endif %} badge-pill">{{ todo }}</span>
+        Invoices
       </a>
       <div class="dropdown-menu" aria-labelledby="navbarDropdownInvoices">
         {% if perms.RIGS.add_invoice %}
-        <a class="dropdown-item text-nowrap" href="{% url 'invoice_waiting' %}"><span class="fas fa-briefcase text-danger"></span> Waiting <span class="badge {% if waiting == 0 %}badge-success{% else %}badge-danger{% endif %} badge-pill">{{ waiting }}</span></a>
+        <a class="dropdown-item" href="{% url 'invoice_waiting' %}"><span class="fas fa-briefcase text-danger"></span> Waiting</a>
         {% endif %}
-        <a class="dropdown-item" href="{% url 'invoice_list' %}"><span class="fas fa-pound-sign text-warning"></span> Outstanding <span class="badge {% if outstanding == 0 %}badge-success{% else %}badge-danger{% endif %} badge-pill">{{ outstanding }}</span></a>
+        <a class="dropdown-item" href="{% url 'invoice_list' %}"><span class="fas fa-pound-sign text-warning"></span> Outstanding</a>
         <a class="dropdown-item" href="{% url 'invoice_archive' %}"><span class="fas fa-book"></span> Archive</a>
       </div>
     </li>

RIGS/templates/event_checklist_detail.html

@@ -8,7 +8,7 @@
 <div class="row">
     <div class="col-12 text-right my-3">
         {% button 'edit' url='ec_edit' pk=object.pk %}
-        {% button 'view' url='event_detail' pk=object.event.pk text="Event" %}
+        {% button 'view' url='event_detail' pk=object.pk text="Event" %}
         {% include 'partials/review_status.html' with perm=perms.RIGS.review_eventchecklist review='ec_review' %}
     </div>
 </div>
@@ -32,11 +32,7 @@
                 </dd>
                 <dt class="col-6">{{ object|help_text:'power_mic' }}</dt>
                 <dd class="col-6">
-                    {% if object.power_mic %}
                     <a href="{% url 'profile_detail' object.power_mic.pk %}">{{ object.power_mic.name }}</a>
-                    {% else %}
-                    None
-                    {% endif %}
                 </dd>
             </dl>
             <p>List vehicles and their drivers</p>
@@ -102,10 +98,6 @@
                     <td>{{crew.role}}</td>
                     <td>{{crew.end}}</td>
                 </tr>
-                {% empty %}
-                <tr>
-                    <td colspan="4" class="text-center bg-warning">Apparently this event happened by magic...</td>
-                </tr>
                 {% endfor %}
             </tbody>
         </table>
@@ -113,27 +105,9 @@
 </div>
 <div class="card  mb-3">
     <div class="card-header">Power {% include 'partials/event_size.html' with object=object.event.riskassessment %}</div>
+    {% if object.event.riskassessment.event_size != 2 %}
     <div class="card-body">
-        {% if event.riskassessment.event_size == 0 %}
-        <dl class="row">
-            <dt class="col-10">{{ object|help_text:'rcds'|safe }}</dt>
-            <dd class="col-2">
-                {{ object.rcds|yesnoi }}
-            </dd>
-            <dt class="col-10">{{ object|help_text:'supply_test'|safe }}</dt>
-            <dd class="col-2">
-                {{ object.supply_test|yesnoi }}
-            </dd>
-            <dt class="col-10">{{ object|help_text:'earthing'|safe }}</dt>
-            <dd class="col-2">
-                {{ object.earthing|yesnoi }}
-            </dd>
-            <dt class="col-10">{{ object|help_text:'pat'|safe }}</dt>
-            <dd class="col-2">
-                {{ object.pat|yesnoi }}
-            </dd>
-        </dl>
-        {% else %}
+        {% if object.event.riskassessment.event_size == 1 %}
         <dl class="row">
             <dt class="col-10">{{ object|help_text:'source_rcd'|safe }}</dt>
             <dd class="col-2">
@@ -238,8 +212,28 @@
         </dl>
         <hr>
         {% include 'partials/ec_power_info.html' %}
+        {% else %}
+        <dl class="row">
+            <dt class="col-10">{{ object|help_text:'rcds'|safe }}</dt>
+            <dd class="col-2">
+                {{ object.rcds|yesnoi }}
+            </dd>
+            <dt class="col-10">{{ object|help_text:'supply_test'|safe }}</dt>
+            <dd class="col-2">
+                {{ object.supply_test|yesnoi }}
+            </dd>
+            <dt class="col-10">{{ object|help_text:'earthing'|safe }}</dt>
+            <dd class="col-2">
+                {{ object.earthing|yesnoi }}
+            </dd>
+            <dt class="col-10">{{ object|help_text:'pat'|safe }}</dt>
+            <dd class="col-2">
+                {{ object.pat|yesnoi }}
+            </dd>
+        </dl>
         {% endif %}
     </div>
+    {% endif %}
 </div>
 <div class="col-12 text-right">
 {% button 'edit' url='ec_edit' pk=object.pk %}

RIGS/templates/event_checklist_form.html

@@ -244,19 +244,12 @@
                     </div>
                 </div>
             </div>
-            {% else %}
+            {% elif event.riskassessment.event_size == 1 %}
             <div class="row my-3" id="size-1">
                 <div class="col-12">
-                    {% if event.riskassessment.event_size == 1 %}
                     <div class="card border-warning">
                         <div class="card-header">Electrical Checks <small>for ‘Medium’ TEC Events </small></div>
                         <div class="card-body">
-                    {% else %}
-                    <div class="card border-danger">
-                                    <div class="card-header">Electrical Checks <small>for ‘Large’ TEC Events</small></div>
-                        <div class="card-body">
-                            <div class="alert alert-danger"><strong>Here be dragons. Ensure you have appeased the Power Gods before continuing... (If you didn't check with a Supervisor, <em>you cannot continue your event!</em>)</strong></div>
-                    {% endif %}
                             {% include 'partials/checklist_checkbox.html' with formitem=form.source_rcd %}
                             {% include 'partials/checklist_checkbox.html' with formitem=form.labelling %}
                             {% include 'partials/checklist_checkbox.html' with formitem=form.earthing %}
@@ -346,6 +339,17 @@
                     </div>
                 </div>
             </div>
+            {% else %}
+            <div class="row my-3" id="size-2">
+                <div class="col-12">
+                    <div class="card border-danger">
+                        <div class="card-header">Electrical Checks <small>for ‘Large’ TEC Events</small></div>
+                        <div class="card-body">
+                            <p>Outside the scope of this assessment. <strong>I really hope you checked with a supervisor...</strong></p>
+                        </div>
+                    </div>
+                </div>
+            </div>
             {% endif %}
             <div class="row mt-3">
                 <div class="col-sm-12 text-right">

RIGS/templates/event_detail.html

@@ -1,4 +1,6 @@
 {% extends request.is_ajax|yesno:"base_ajax.html,base_rigs.html" %}
+{% load linkornone from filters %}
+{% load namewithnotes from filters %}
 
 {% block content %}
 <div class="row my-3 py-3">
@@ -12,7 +14,50 @@
     {% if object.is_rig and perms.RIGS.view_event %}
         {# only need contact details for a rig #}
         <div class="col-md-6">
-            {% include 'partials/contact_details.html' %}
+            {% if event.person %}
+            <div class="card card-default mb-3">
+                <div class="card-header">Contact Details</div>
+                <div class="card-body">
+                    <dl class="row">
+                        <dt class="col-sm-6">Person</dt>
+                        <dd class="col-sm-6">
+                            {% if object.person %}
+                                <a href="{% url 'person_detail' object.person.pk %}" class="modal-href">
+                                    {{ object.person|namewithnotes:'person_detail' }}
+                                </a>
+                            {% endif %}
+                        </dd>
+                        <dt class="col-sm-6">Email</dt>
+                        <dd class="col-sm-6">{{ object.person.email|linkornone:'mailto' }}</dd>
+                        <dt class="col-sm-6">Phone Number</dt>
+                        <dd class="col-sm-6">{{ object.person.phone|linkornone:'tel' }}</dd>
+                    </dl>
+                </div>
+            </div>
+            {% endif %}
+            {% if event.organisation %}
+                <div class="card card-default">
+                    <div class="card-header">Organisation</div>
+                    <div class="card-body">
+                        <dl class="row">
+                            <dt class="col-sm-6">Organisation</dt>
+                            <dd class="col-sm-6">
+                                {% if object.organisation %}
+                                    <a href="{% url 'organisation_detail' object.organisation.pk %}" class="modal-href">
+                                        {{ object.organisation|namewithnotes:'organisation_detail' }}
+                                    </a>
+                                {% endif %}
+                            </dd>
+                            <dt class="col-sm-6">Email</dt>
+                            <dd class="col-sm-6">{{ object.organisation.email|linkornone:'mailto' }}</dd>
+                            <dt class="col-sm-6">Phone Number</dt>
+                            <dd class="col-sm-6">{{ object.organisation.phone|linkornone:'tel' }}</dd>
+                            <dt class="col-sm-6">Has SU Account</dt>
+                            <dd class="col-sm-6">{{ event.organisation.union_account|yesno|capfirst }}</dd>
+                        </dl>
+                    </div>
+                </div>
+            {% endif %}
         </div>
     {% endif %}
     <div class="col-md-6">

RIGS/templates/event_form.html

@@ -27,26 +27,18 @@
         const matches = window.matchMedia("(prefers-reduced-motion: reduce)").matches || window.matchMedia("(update: slow)").matches;
         $(document).ready(function () {
             dur = matches ? 0 : 500;
-            {% if object.pk %}
-            // Editing
-                {% if not object.is_rig %}
+            {% if not object.pk and not form.errors %}
+                $('.form-hws').slideUp(dur, function () {
+                    $('.form-is_rig').slideUp(dur);
+                });
+            {% elif not object.pk and form.errors %}
+                if ($('#{{form.is_rig.auto_id}}').attr('checked') !== 'checked') {
                     $('.form-is_rig').hide();
-                {% endif %}
-            //Creation
-            {% else %}
-                // If there were errors, apply the previous Rig/not-Rig selection
-                {% if form.errors %}
-                    $('.form-hws').show();
-                    if ($('#{{form.is_rig.auto_id}}').attr('checked') !== 'checked') {
-                        $('.form-is_rig').hide();
-                    }
-                {% else %}
-                    //Initial hide
-                    $('.form-hws').slideUp(dur);
-                {% endif %}
-                //Button handling
+                }
+            {% endif %}
+            {% if not object.pk %}
                 $('#is_rig-selector button').on('click', function () {
-                    $('.form-non_rig').slideDown(dur); //Non rig stuff also needed for rig, so always slide down
+                    $('.form-non_rig').slideDown(dur);
                     if ($(this).data('is_rig') === 1) {
                         $('#{{form.is_rig.auto_id}}').prop('checked', true);
                         if ($('.form-non_rig').is(':hidden')) {
@@ -56,6 +48,7 @@
                         }
                         $('.form-hws, .form-hws .form-is_rig').css('overflow', 'visible');
                     } else {
+
                         $('#{{form.is_rig.auto_id}}').prop('checked', false);
                         $('.form-is_rig').slideUp(dur);
                     }
@@ -69,6 +62,13 @@
           $('[data-toggle="tooltip"]').tooltip();
         })
     </script>
+    <noscript>
+        <style>
+        .form-hws {
+            display: inherit !important;
+        }
+        </style>
+    </noscript>
 {% endblock %}
 
 {% block content %}

RIGS/templates/event_print_page.xml

@@ -190,21 +190,19 @@
                 {% endif %}
             </para>
         </td>
-        <td>£{{ item.cost|floatformat:2 }}</td>
+        <td>£ {{ item.cost|floatformat:2 }}</td>
         <td>{{ item.quantity }}</td>
-        <td>£{{ item.total_cost|floatformat:2 }}</td>
+        <td>£ {{ item.total_cost|floatformat:2 }}</td>
     </tr>
 {% endfor %}
 </blockTable>
 <keepTogether>
     <blockTable style="totalTable" colWidths="300,115,80">
-    {% if object.vat > 0 %}
     <tr>
-        <td>{% if quote %}VAT Registration Number: 170734807</td>
-        <td>Total (ex. VAT){% endif %}</td>
+        <td>{% if quote %}VAT Registration Number: 170734807{% endif %}</td>
+        <td>Total (ex. VAT)</td>
         <td>£ {{ object.sum_total|floatformat:2 }}</td>
     </tr>
-    {% endif %}
     <tr>
         <td>
             {% if quote %}
@@ -213,10 +211,8 @@
                 </para>
             {% endif %}
         </td>
-        {% if object.vat > 0 %}
         <td>VAT @ {{ object.vat_rate.as_percent|floatformat:2 }}%</td>
-        <td>£{{ object.vat|floatformat:2 }}</td>
-        {% endif %}
+        <td>£ {{ object.vat|floatformat:2 }}</td>
     </tr>
     <tr>
         <td>
@@ -228,7 +224,7 @@
         </td>
         {% if invoice %}
             <td>Total</td>
-            <td>£{{ object.total|floatformat:2 }}</td>
+            <td>£ {{ object.total|floatformat:2 }}</td>
         {% else %}
             <td>
                 <para>
@@ -237,7 +233,7 @@
             </td>
             <td>
                 <para>
-                    <b>£{{ object.total|floatformat:2 }}</b>
+                    <b>£ {{ object.total|floatformat:2 }}</b>
                 </para>
             </td>
         {% endif %}
@@ -271,7 +267,7 @@
             <tr>
                 <td>{{ payment.get_method_display }}</td>
                 <td>{{ payment.date }}</td>
-                <td>£{{ payment.amount|floatformat:2 }}</td>
+                <td>£ {{ payment.amount|floatformat:2 }}</td>
             </tr>
         {% endfor %}
     </blockTable>
@@ -279,18 +275,18 @@
         <tr>
             <td></td>
             <td>Payment Total</td>
-            <td>£{{ object.invoice.payment_total|floatformat:2 }}</td>
+            <td>£ {{ object.invoice.payment_total|floatformat:2 }}</td>
         </tr>
         <tr>
             <td></td>
             <td>
                 <para>
-                    <b>Balance</b> {% if object.vat > 0 %}(ex. VAT){% endif %}
+                    <b>Balance</b> (ex. VAT)
                 </para>
             </td>
             <td>
                 <para>
-                    <b>£{{ object.invoice.balance|floatformat:2 }}</b>
+                    <b>£ {{ object.invoice.balance|floatformat:2 }}</b>
                 </para>
             </td>
         </tr>
@@ -320,7 +316,7 @@
         <tr>
             <td>General Enquires and 24 Hour Emergency Contact: 0115 84 68720</td>
         </tr>
-    {% elif object.vat > 0 %}
+    {% else %}
         <tr>
         <td>
             <para>VAT Registration Number: 170734807</para>

RIGS/templates/eventauthorisation_client_request.html

@@ -5,13 +5,15 @@
     <p>Hi {{ to_name|default:"there" }},</p>
 
     <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>{% if object.person %}{{ object.person.name }}{% else %}{{ object.organisation.name }}{% endif %}</b>{% endif %}.</p>
+        | {{ object.name }}</b>{% if not to_name %} on behalf of <b>{{ object.person.name }}</b>{% endif %}.</p>
 
     <p>
         Please find the link below to complete the event booking process.
-        Remember that only Presidents or Treasurers are allowed to sign off payments. You may need to forward
-        this
-        email on.
+        {% if object.event.organisation and object.event.organisation.union_account %}{# internal #}
+            Remember that only Presidents or Treasurers are allowed to sign off payments. You may need to forward
+            this
+            email on.
+        {% endif %}
     </p>
 
 

RIGS/templates/eventauthorisation_client_request.txt

@@ -1,6 +1,6 @@
 Hi {{ to_name|default:"there" }},
 
-{{ request.user.get_full_name }} has requested that you authorise N{{ object.pk|stringformat:"05d" }}| {{ object.name }}{% if not to_name %} on behalf of {% if object.person %}{{ object.person.name }}{% else %}{{ object.organisation.name }}{% endif %}{% endif %}.
+{{ request.user.get_full_name }} has requested that you authorise N{{ object.pk|stringformat:"05d" }}| {{ object.name }}{% if not to_name %} on behalf of {{ object.person.name }}{% endif %}.
 
             Please find the link below to complete the event booking process.
             {% if object.event.organisation and object.event.organisation.union_account %}{# internal #}

RIGS/templates/hs_list.html

@@ -4,11 +4,10 @@
 
 {% block content %}
 <div class="table-responsive">
-    <table class="table mb-0 table-sm">
+    <table class="table mb-0">
         <thead>
             <tr>
                 <th scope="col">Event</th>
-                <th scope="col">MIC</th>
                 <th scope="col">Dates</th>
                 <th scope="col">RA</th>
                 <th scope="col">Checklists</th>
@@ -17,8 +16,7 @@
         <tbody>
         {% for event in object_list %}
         <tr id="event_row">
-            <th scope="row" id="event_number"><a href="{% url 'event_detail' event.pk %}">{{ event }}</a><br><small>{{ event.get_status_display }}</small></th>
-            <td>{% if event.mic is not None %}<a href="{% url 'profile_detail' event.mic.pk %}">{% else %}<span class="text-danger">{% endif %}{{ event.mic }}{% if event.mic is not None %}</a>{% else %}</span>{%endif%}</td>
+            <th scope="row" id="event_number"><a href="{% url 'event_detail' event.pk %}">{{ event }}</a></th>
             <!--Dates-->
             <td id="event_dates">
                 <span><strong>{{ event.start_date|date:"D d/m/Y" }}</strong></span>

RIGS/templates/hs_object_list.html

@@ -15,7 +15,7 @@
     <div class="row">
         <div class="col-12">
             <div class="table-responsive">
-                <table class="table mb-0 table-sm">
+                <table class="table mb-0">
                     <thead>
                         <tr>
                             <th scope="col">Event</th>
@@ -32,7 +32,7 @@
                     {% 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>
+                        <th scope="row"><a href="{% url 'event_detail' object.event.pk %}">{{ object.event }}</a></th>
                         {% for field in object_list.0.fieldz %}
                             <td>{{ object|get_field:field }}</td>
                         {% endfor %}

RIGS/templates/invoice_detail.html

@@ -2,88 +2,102 @@
 {% load button from filters %}
 
 {% block content %}
-<div class="row py-4">
-    <div class="col-sm-12 text-right px-0">
-        <div class="btn-group">
-            <a href="{% url 'event_detail' object.event.pk %}" class="btn btn-primary">Open Event Page <span class="fas fa-eye"></span></a>
-            <a href="{% url 'invoice_delete' object.pk %}" class="btn btn-danger" title="Delete Invoice">
-                <span class="fas fa-times"></span> <span
-                        class="d-none d-sm-inline">Delete</span>
-            </a>
-            <a href="{% url 'invoice_void' object.pk %}" class="btn btn-warning" title="Void Invoice">
-                <span class="fas fa-ban"></span> <span
-                        class="d-none d-sm-inline">Void</span>
-            </a>
-            {% button 'print' url='invoice_print' pk=object.pk %}
-        </div>
-    </div>
-<div>
-<div class="row py-4">
-    {% with object.event as object %}
-    <div class="col-sm-6">
-        {% include 'partials/contact_details.html' %}
-    </div>
-    <div class="col-sm-6">
-        {% include 'partials/event_details.html' %}
-    </div>
-    {% if object.event.internal %}
-    <div class="col-sm-6">
-        {% include 'partials/auth_details.html' %}
-    </div>
-    {% endif %}
-    {% endwith %}
-</div>
-<div class="row py-4">
-    <div class="col-sm-6">
-        <div class="card card-default">
-            <div class="card-body">
-                <div class="text-right py-3">
-                    <a href="{% url 'payment_create' %}?invoice={{ object.pk }}"
-                       class="btn btn-success modal-href"
-                       data-target="#{{ form.person.id_for_label }}">
-                        <span class="fas fa-plus"></span> Add
+    <div class="col-sm-12">
+        <div class="row justify-content-end py-3">
+            <div class="col-sm-4 text-right">
+                <div class="btn-group btn-page">
+                    <a href="{% url 'invoice_delete' object.pk %}" class="btn btn-danger" title="Delete Invoice">
+                        <span class="fas fa-times"></span> <span
+                                class="d-none d-sm-inline">Delete</span>
                     </a>
+                    <a href="{% url 'invoice_void' object.pk %}" class="btn btn-warning" title="Void Invoice">
+                        <span class="fas fa-ban"></span> <span
+                                class="d-none d-sm-inline">Void</span>
+                    </a>
+                    {% button 'print' url='invoice_print' pk=object.pk %}
                 </div>
-                <table class="table table-hover">
-                    <thead>
-                        <tr>
-                            <th scope="col">Date</th>
-                            <th scope="col">Amount</th>
-                            <th scope="col">Method</th>
-                            <th scope="col"></th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                    {% for payment in object.payment_set.all %}
-                        <tr>
-                            <th scope="row">{{ payment.date }}</th>
-                            <td>{{ payment.amount|floatformat:2 }}</td>
-                            <td>{{ payment.get_method_display }}</td>
-                            <td>
-                                <a href="{% url 'payment_delete' payment.pk %}" class="btn btn-small btn-danger"><span class="fas fa-times"></span></a>
-                            </td>
-                        </tr>
-                    {% endfor %}
-                    <tr>
-                        <td class="text-right"><strong>Balance:</strong></td>
-                        <td>{{ object.balance|floatformat:2 }}</td>
-                        <td></td>
-                        <td></td>
-                    </tbody>
-                </table>
             </div>
         </div>
-    </div>
 
-    <div class="col-sm-6">
-        <div class="card">
-            {% with object.event as object %}
-                {% include 'item_table.html' %}
-            {% endwith %}
+        <div class="row">
+            <div class="col-sm-6">
+                <div class="card card-default">
+                    <div class="card-header">Invoice Details<span class="float-right">
+                        {% if object.void %}(VOID){% elif object.is_closed %}(PAID){% else %}(OUTSTANDING){% endif %}
+                        </span></div>
+                    <div class="card-body">
+                        {% if object.event.organisation %}
+                            {{ object.event.organisation.name }}<br/>
+                            {{ object.event.organisation.address|linebreaksbr }}
+                        {% else %}
+                            {{ object.event.person.name }}<br/>
+                            {{ object.event.person.address|linebreaksbr }}
+                        {% endif %}
+                    </div>
+                </div>
+            </div>
+            <div class="col-sm-6">
+                {% include 'partials/event_details.html' %}
+            </div>
+            {% if object.event.internal %}
+            <div class="col-sm-6">
+                {% include 'partials/auth_details.html' %}
+            </div>
+            {% endif %}
+        </div>
+
+        <div class="row py-4">
+            <div class="col-sm-6">
+                <div class="card card-default">
+                    <div class="card-body">
+                        <div class="text-right py-3">
+                            <a href="{% url 'payment_create' %}?invoice={{ object.pk }}"
+                               class="btn btn-success modal-href"
+                               data-target="#{{ form.person.id_for_label }}">
+                                <span class="fas fa-plus"></span> Add
+                            </a>
+                        </div>
+                        <table class="table table-hover">
+                            <thead>
+                                <tr>
+                                    <th scope="col">Date</th>
+                                    <th scope="col">Amount</th>
+                                    <th scope="col">Method</th>
+                                    <th scope="col"></th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                            {% for payment in object.payment_set.all %}
+                                <tr>
+                                    <th scope="row">{{ payment.date }}</th>
+                                    <td>{{ payment.amount|floatformat:2 }}</td>
+                                    <td>{{ payment.get_method_display }}</td>
+                                    <td>
+                                        <a href="{% url 'payment_delete' payment.pk %}" class="btn btn-small btn-danger"><span class="fas fa-times"></span></a>
+                                    </td>
+                                </tr>
+                            {% endfor %}
+                            <tr>
+                                <td class="text-right"><strong>Balance:</strong></td>
+                                <td>{{ object.balance|floatformat:2 }}</td>
+                                <td></td>
+                                <td></td>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+
+            <div class="col-sm-6">
+                <div class="card">
+                    {% with object.event as object %}
+                        {% include 'item_table.html' %}
+                    {% endwith %}
+                </div>
+            </div>
+        </div>
+        <div class="col-12 text-right">
+            {% include 'partials/last_edited.html' with target="invoice_history" %}
         </div>
     </div>
-</div>
-<div class="col-12 text-right">
-    {% include 'partials/last_edited.html' with target="invoice_history" %}
-</div>
 {% endblock %}

RIGS/templates/item_row.html

@@ -6,11 +6,11 @@
         </div>
 	</th>
     {% if perms.RIGS.view_event %}
-	<td>£<span class="cost">{{item.cost|floatformat:2}}</span></td>
+	<td>£&nbsp;<span class="cost">{{item.cost|floatformat:2}}</span></td>
     {% endif %}
 	<td class="quantity">{{item.quantity}}</td>
     {% if perms.RIGS.view_event %}
-	<td>£<span class="sub-total" data-subtotal="{{item.total_cost}}">{{item.total_cost|floatformat:2}}</span></td>
+	<td>£&nbsp;<span class="sub-total" data-subtotal="{{item.total_cost}}">{{item.total_cost|floatformat:2}}</span></td>
     {% endif %}
 	{% if edit %}
     <td class="vert-align text-right">

RIGS/templates/item_table.html

@@ -27,13 +27,12 @@
 			{% endfor %}
 		</tbody>
         {% if auth or perms.RIGS.view_event %}
-		<tfoot style="font-weight: bold">
+		<tfoot>
 			<tr>
 				<td rowspan="3" colspan="2"></td>
-				<td>Total {% if object.vat > 0 or not object.pk %}(ex. VAT){% endif %}</td>
-				<td colspan="2">£<span id="sumtotal">{{object.sum_total|default:0|floatformat:2}}</span></td>
+				<td>Total (ex. VAT)</td>
+				<td colspan="2">£ <span id="sumtotal">{{object.sum_total|default:0|floatformat:2}}</span></td>
 			</tr>
-            {% if object.vat > 0 or not object.pk %}
 			<tr>
 				{% if not object.pk %}
 					<td id="vat-rate" data-rate="{{currentVAT.rate}}">VAT @
@@ -42,13 +41,12 @@
 					<td id="vat-rate" data-rate="{{object.vat_rate.rate}}">VAT @
 						{{object.vat_rate.as_percent|floatformat|default:"TBD"}}%</td>
 				{% endif %}
-				<td colspan="2">£<span id="vat">{{object.vat|default:0|floatformat:2}}</span></td>
+				<td colspan="2">£ <span id="vat">{{object.vat|default:0|floatformat:2}}</span></td>
 			</tr>
 			<tr>
 				<td>Total</td>
-				<td colspan="2">£<span id="total">{{object.total|default:0|floatformat:2}}</span></td>
+				<td colspan="2">£ <span id="total">{{object.total|default:0|floatformat:2}}</span></td>
 			</tr>
-            {% endif %}
 		</tfoot>
         {% endif %}
 	</table>
@@ -61,9 +59,9 @@
                     <em class="description"></em>
                 </div>
         </td>
-        <td>£<span class="cost"></span></td>
+        <td>£&nbsp;<span class="cost"></span></td>
         <td class="quantity"></td>
-        <td>£<span class="sub-total"></span></td>
+        <td>£&nbsp;<span class="sub-total"></span></td>
         {% if edit %}
         <td class="vert-align text-right">
             <div class="btn-group" role="group" aria-label="Action buttons">

RIGS/templates/partials/client_eventdetails.html

@@ -1,29 +1,27 @@
 <div class="col-sm-6">
-    {% if event.person %}
     <div class="card mb-3">
         <div class="card-header">Contact Details</div>
         <div class="card-body">
             <dl class="row">
                 <dt class="col-sm-5">Person</dt>
                 <dd class="col-sm-7">
-                      {{ event.person.name }}
+                    {% if event.person %}
+                        {{ event.person.name }}
+                    {% endif %}
                 </dd>
-                {% if event.person.email %}
+
                 <dt class="col-sm-5">Email</dt>
                 <dd class="col-sm-7">
                     <span class="overflow-ellipsis">{{ event.person.email }}</span>
                 </dd>
-                {% endif %}
-                {% if event.person.phone %}
+
                 <dt class="col-sm-5">Phone Number</dt>
                 <dd class="col-sm-7">{{ event.person.phone }}</dd>
-                {% endif %}
             </dl>
         </div>
     </div>
-    {% endif %}
     {% if event.organisation %}
-        <div class="card">
+        <div class="card mt-3">
             <div class="card-header">Organisation Details</div>
             <div class="card-body">
                 <dl class="row">
@@ -31,10 +29,9 @@
                     <dd class="col-sm-7">
                         {{ event.organisation.name }}
                     </dd>
-                    {% if event.organisation.phone %}
+
                     <dt class="col-sm-5">Phone Number</dt>
-                    <dd class="col-sm-7">{{ event.organisation.phone }}</dd>
-                    {% endif %}
+                    <dd class="col-sm-7">{{ object.organisation.phone }}</dd>
                 </dl>
             </div>
         </div>
@@ -46,12 +43,15 @@
         <div class="card-header">Event Info</div>
         <div class="card-body">
             <dl class="row">
-                {% if event.venue %}
                 <dt class="col-sm-5">Event Venue</dt>
                 <dd class="col-sm-7">
-                {{ event.venue }}
+                    {% if object.venue %}
+                        <a href="{% url 'venue_detail' object.venue.pk %}" class="modal-href">
+                            {{ object.venue }}
+                        </a>
+                    {% endif %}
                 </dd>
-                {% endif %}
+
                 <dt class="col-sm-5">Status</dt>
                 <dd class="col-sm-7">{{ event.get_status_display }}</dd>
 

RIGS/templates/partials/contact_details.html

@@ -1,47 +0,0 @@
-{% load linkornone from filters %}
-{% load namewithnotes from filters %}
-
-{% if object.person %}
-<div class="card card-default mb-3">
-    <div class="card-header">Person Details</div>
-    <div class="card-body">
-        <dl class="row">
-            <dt class="col-sm-6">Person</dt>
-            <dd class="col-sm-6">
-                {% if object.person %}
-                    <a href="{% url 'person_detail' object.person.pk %}" class="modal-href">
-                        {{ object.person|namewithnotes:'person_detail' }}
-                    </a>
-                {% endif %}
-            </dd>
-            <dt class="col-sm-6">Email</dt>
-            <dd class="col-sm-6">{{ object.person.email|linkornone:'mailto' }}</dd>
-            <dt class="col-sm-6">Phone Number</dt>
-            <dd class="col-sm-6">{{ object.person.phone|linkornone:'tel' }}</dd>
-        </dl>
-    </div>
-</div>
-{% endif %}
-{% if object.organisation %}
-    <div class="card card-default">
-        <div class="card-header">Organisation Details</div>
-        <div class="card-body">
-            <dl class="row">
-                <dt class="col-sm-6">Organisation</dt>
-                <dd class="col-sm-6">
-                    {% if object.organisation %}
-                        <a href="{% url 'organisation_detail' object.organisation.pk %}" class="modal-href">
-                            {{ object.organisation|namewithnotes:'organisation_detail' }}
-                        </a>
-                    {% endif %}
-                </dd>
-                <dt class="col-sm-6">Email</dt>
-                <dd class="col-sm-6">{{ object.organisation.email|linkornone:'mailto' }}</dd>
-                <dt class="col-sm-6">Phone Number</dt>
-                <dd class="col-sm-6">{{ object.organisation.phone|linkornone:'tel' }}</dd>
-                <dt class="col-sm-6">Has SU Account</dt>
-                <dd class="col-sm-6">{{ event.organisation.union_account|yesno|capfirst }}</dd>
-            </dl>
-        </div>
-    </div>
-{% endif %}

RIGS/templates/partials/event_detail_buttons.html

@@ -47,7 +47,5 @@
                     class="fas fa-pound-sign"></span>
                 <span class="d-none d-sm-inline">Invoice</span></a>
         {% endif %}
-
-        <a href="https://docs.google.com/forms/d/e/1FAIpQLSf-TBOuJZCTYc2L8DWdAaC3_Werq0ulsUs8-6G85I6pA9WVsg/viewform" class="btn btn-danger"><span class="fas fa-file-invoice-dollar"></span> <span class="d-none d-sm-inline">Subhire Insurance Form</span></a>
     {% endif %}
 </div>

RIGS/templates/partials/event_status.html

@@ -6,10 +6,6 @@
             <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 %}
-            <span class="badge badge-warning"> Authorisation: Issue <span class="fas fa-exclamation-circle"></span></span>
-        {% elif event.auth_request_to %}
-            <span class="badge badge-info"> Authorisation: Sent <span class="fas fa-paper-plane"></span></span>
         {% else %}
             <span class="badge badge-danger">Authorisation: <span class="fas fa-times"></span></span>
         {% endif %}

RIGS/templates/partials/event_table.html

@@ -30,25 +30,25 @@
             <th scope="row" id="event_number">{{ event.display_id }}</th>
             <!--Dates & Times-->
             <td id="event_dates">
-                <span class="text-nowrap">Start: <strong>{{ event.start_date|date:"D d/m/Y" }}
+                <span class="text-nowrap">Start: <strong>{{ event.start_date|date:"D d/m/Y" }}</strong>
                 {% if event.has_start_time %}
                     {{ event.start_time|date:"H:i" }}
-                {% endif %}</strong>
+                {% endif %}
                 </span>
                 {% if event.end_date %}
                     <br>
-                    <span class="text-nowrap">End: {% if event.end_date != event.start_date %}<strong>{{ event.end_date|date:"D d/m/Y"  }}{% endif %}
+                    <span class="text-nowrap">End: {% if event.end_date != event.start_date %}<strong>{{ event.end_date|date:"D d/m/Y"  }}</strong>{% endif %}
                     {% if event.has_end_time %}
                        {{ event.end_time|date:"H:i" }}
-                    {% endif %}</strong>
+                    {% endif %}
                     </span>
                 {% endif %}
                 {% if not event.cancelled %}
                     {% if event.meet_at %}
-                        <br><span class="text-nowrap">Meet: <strong>{{ event.meet_at|date:"D d/m/Y H:i" }}</strong></span>
+                        <br><span>Crew meet: <strong>{{ event.meet_at|date:"H:i" }}</strong> {{ event.meet_at|date:"(d/m/Y)" }}</span>
                     {% endif %}
                     {% if event.access_at %}
-                        <br><span class="text-nowrap">Access: <strong>{{ event.access_at|date:" D d/m/Y H:i" }}</strong></span>
+                        <br><span>Access at: <strong>{{ event.access_at|date:"H:i" }}</strong> {{ event.access_at|date:"(d/m/Y)" }}</span>
                     {% endif %}
                 {% endif %}
             </td>
@@ -67,9 +67,9 @@
                 </h4>
                 {% if event.is_rig and not event.cancelled %}
                     <h5>
-                        <a href="{{ event.person.get_absolute_url }}">{{ event.person.name }}</a>
+                        {{ event.person.name }}
                         {% if event.organisation %}
-                            for <a href="{{ event.organisation.get_absolute_url }}">{{ event.organisation.name }}</a>
+                            for {{ event.organisation.name }}
                         {% endif %}
                     </h5>
                 {% endif %}
@@ -90,7 +90,7 @@
                         </a>
                     {% endif %}
                 {% elif event.is_rig %}
-                    <span class="fas fa-user-slash"></span>
+                    <span class="fas fa-exclamation"></span>
                 {% endif %}
             </td>
         </tr>

RIGS/templates/risk_assessment_detail.html

@@ -1,4 +1,5 @@
 {% extends request.is_ajax|yesno:"base_ajax.html,base_rigs.html" %}
+{% block title %}Risk Assessment for Event N{{ object.event.pk|stringformat:"05d" }} {{ object.event.name }}{% endblock %}
 {% load help_text from filters %}
 {% load yesnoi from filters %}
 {% load linkornone from filters %}
@@ -6,6 +7,7 @@
 {% block content %}
     <div class="row py-3">
         <div class="col-12">
+            <h3>Risk Assessment for Event N{{ object.event.pk|stringformat:"05d" }} {{ object.event.name }}</h3>
             <div class="card card-default mb-3">
                 <div class="card-header">General</div>
                 <div class="card-body">
@@ -49,11 +51,11 @@
                         <dd class="col-sm-6">
                             {{ object.power_mic.name|default:'None' }}
                         </dd>
-                        <dt class="col-sm-6">{{ object|help_text:'outside' }}</dt>
+                        <dt class="col-sm-6">{{ object|help_text:'generators' }}</dt>
                         <dd class="col-sm-6">
                             {{ object.outside|yesnoi:'invert' }}
                         </dd>
-                        <dt class="col-sm-6">{{ object|help_text:'generators' }}</dt>
+                        <dt class="col-sm-6">{{ object|help_text:'outside' }}</dt>
                         <dd class="col-sm-6">
                             {{ object.generators|yesnoi:'invert' }}
                         </dd>
@@ -95,64 +97,58 @@
                     </dl>
                 </div>
             </div>
-            <div class="row">
-                <div class="col-lg-6 col-12">
-                    <div class="card card-default mb-3">
-                        <div class="card-header">Site Details</div>
-                        <div class="card-body">
-                            <dl class="row">
-                                <dt class="col-10">{{ object|help_text:'known_venue' }}</dt>
-                                <dd class="col-2">
-                                    {{ object.known_venue|yesnoi:'invert' }}
-                                </dd>
-                                <dt class="col-10">{{ object|help_text:'safe_loading'|safe }}</dt>
-                                <dd class="col-2">
-                                    {{ object.safe_loading|yesnoi:'invert' }}
-                                </dd>
-                                <dt class="col-10">{{ object|help_text:'safe_storage' }}</dt>
-                                <dd class="col-2">
-                                    {{ object.safe_storage|yesnoi:'invert' }}
-                                </dd>
-                                <dt class="col-10">{{ object|help_text:'area_outside_of_control' }}</dt>
-                                <dd class="col-2">
-                                    {{ object.area_outside_of_control|yesnoi:'invert' }}
-                                </dd>
-                                <dt class="col-10">{{ object|help_text:'barrier_required' }}</dt>
-                                <dd class="col-2">
-                                    {{ object.barrier_required|yesnoi:'invert' }}
-                                </dd>
-                                <dt class="col-10">{{ object|help_text:'nonstandard_emergency_procedure' }}</dt>
-                                <dd class="col-2">
-                                    {{ object.nonstandard_emergency_procedure|yesnoi:'invert' }}
-                                </dd>
-                            </dl>
-                        </div>
-                    </div>
+            <div class="card card-default mb-3">
+                <div class="card-header">Site Details</div>
+                <div class="card-body">
+                    <dl class="row">
+                        <dt class="col-sm-6">{{ object|help_text:'known_venue' }}</dt>
+                        <dd class="col-sm-6">
+                            {{ object.known_venue|yesnoi:'invert' }}
+                        </dd>
+                        <dt class="col-sm-6">{{ object|help_text:'safe_loading'|safe }}</dt>
+                        <dd class="col-sm-6">
+                            {{ object.safe_loading|yesnoi:'invert' }}
+                        </dd>
+                        <dt class="col-sm-6">{{ object|help_text:'safe_storage' }}</dt>
+                        <dd class="col-sm-6">
+                            {{ object.safe_storage|yesnoi:'invert' }}
+                        </dd>
+                        <dt class="col-sm-6">{{ object|help_text:'area_outside_of_control' }}</dt>
+                        <dd class="col-sm-6">
+                            {{ object.area_outside_of_control|yesnoi:'invert' }}
+                        </dd>
+                        <dt class="col-sm-6">{{ object|help_text:'barrier_required' }}</dt>
+                        <dd class="col-sm-6">
+                            {{ object.barrier_required|yesnoi:'invert' }}
+                        </dd>
+                        <dt class="col-sm-6">{{ object|help_text:'nonstandard_emergency_procedure' }}</dt>
+                        <dd class="col-sm-6">
+                            {{ object.nonstandard_emergency_procedure|yesnoi:'invert' }}
+                        </dd>
+                    </dl>
                 </div>
-                <div class="col-lg-6 col-12">
-                    <div class="card card-default mb-3">
-                        <div class="card-header">Structures</div>
-                        <div class="card-body">
-                            <dl class="row">
-                                <dt class="col-10">{{ object|help_text:'special_structures' }}</dt>
-                                <dd class="col-2">
-                                    {{ object.special_structures|yesnoi:'invert' }}
-                                </dd>
-                                <dt class="col-10">{{ object|help_text:'suspended_structures' }}</dt>
-                                <dd class="col-2">
-                                    {{ object.suspended_structures|yesnoi:'invert' }}
-                                </dd>
-                                <dt class="col-12">{{ object|help_text:'persons_responsible_structures' }}</dt>
-                                <dd class="col-12">
-                                    {{ object.persons_responsible_structures.name|default:'N/A'|linebreaks }}
-                                </dd>
-                                <dt class="col-12">{{ object|help_text:'rigging_plan'|safe }}</dt>
-                                <dd class="col-12">
-                                    {{ object.rigging_plan|linkornone|default:'N/A' }}
-                                </dd>
-                            </dl>
-                        </div>
-                    </div>
+            </div>
+            <div class="card card-default mb-3">
+                <div class="card-header">Structures</div>
+                <div class="card-body">
+                    <dl class="row">
+                        <dt class="col-sm-6">{{ object|help_text:'special_structures' }}</dt>
+                        <dd class="col-sm-6">
+                            {{ object.special_structures|yesnoi:'invert' }}
+                        </dd>
+                        <dt class="col-sm-6">{{ object|help_text:'suspended_structures' }}</dt>
+                        <dd class="col-sm-6">
+                            {{ object.suspended_structures|yesnoi:'invert' }}
+                        </dd>
+                        <dt class="col-sm-6">{{ object|help_text:'persons_responsible_structures' }}</dt>
+                        <dd class="col-sm-6">
+                            {{ object.persons_responsible_structures.name|default:'N/A'|linebreaks }}
+                        </dd>
+                        <dt class="col-6">{{ object|help_text:'rigging_plan'|safe }}</dt>
+                        <dd class="col-6">
+                            {{ object.rigging_plan|linkornone }}
+                        </dd>
+                    </dl>
                 </div>
             </div>
         </div>

RIGS/templates/risk_assessment_form.html

@@ -11,12 +11,13 @@
 
 {% block preload_js %}
     {{ block.super }}
-    <script src="{% static 'js/selects.js' %}"></script>
+    <script src="{% static 'js/selects.js' %}" async></script>
 {% endblock %}
 
 {% block js %}
     {{ block.super }}
     <script src="{% static 'js/autocompleter.js' %}"></script>
+    <script src="{% static 'js/tooltip.js' %}"></script>
 
     <script>
         function parseBool(str) {

RIGS/templatetags/filters.py

@@ -217,18 +217,3 @@ def button(type, url=None, pk=None, clazz="", icon=None, text="", id=None, style
     elif type == 'submit':
         return {'submit': True, 'class': 'btn-primary', 'icon': 'fa-save', 'text': 'Save', 'id': id, 'style': style}
     return {'target': url, 'pk': pk, 'class': clazz, 'icon': icon, 'text': text, 'id': id, 'style': style}
-
-
-@register.simple_tag
-def invoices_waiting():
-    return len(models.Event.objects.waiting_invoices())
-
-
-@register.simple_tag
-def invoices_outstanding():
-    return len(models.Invoice.objects.outstanding_invoices())
-
-
-@register.simple_tag
-def total_invoices_todo():
-    return len(models.Event.objects.waiting_invoices()) + len(models.Invoice.objects.outstanding_invoices())

RIGS/tests/pages.py

@@ -53,7 +53,7 @@ class EventDetail(BasePage):
 
     # TODO Refactor into regions to match template fragmentation
     _event_name_selector = (By.XPATH, '//h2')
-    _person_panel_selector = (By.XPATH, '//div[contains(text(), "Person Details")]/..')
+    _person_panel_selector = (By.XPATH, '//div[contains(text(), "Contact Details")]/..')
     _name_selector = (By.XPATH, '//dt[text()="Person"]/following-sibling::dd[1]')
     _email_selector = (By.XPATH, '//dt[text()="Email"]/following-sibling::dd[1]')
     _phone_selector = (By.XPATH, '//dt[text()="Phone Number"]/following-sibling::dd[1]')

RIGS/tests/test_interaction.py

@@ -721,12 +721,12 @@ def test_ec_create_medium(logged_in_browser, live_server, admin_user, medium_ra)
     page.fd_voltage_l2 = 235
     page.fd_voltage_l3 = 0
     page.fd_phase_rotation = True
-    page.fd_earth_fault = "1.21"
+    page.fd_earth_fault = 666
     page.fd_pssc = 1984
     page.w1_description = "In the carpark, by the bins"
     page.w1_polarity = True
     page.w1_voltage = 240
-    page.w1_earth_fault = "0.42"
+    page.w1_earth_fault = 333
 
     page.submit()
     assert page.success

assets/converters.py

@@ -1,8 +0,0 @@
-class AssetIDConverter:  # Forces lowercase to uppercase
-    regex = '[^/]+'
-
-    def to_python(self, value):
-        return str(value).upper()
-
-    def to_url(self, value):
-        return str(value).upper()

assets/migrations/0019_fix_cabletype.py

@@ -8,9 +8,9 @@ def add_default(apps, schema_editor):
     Connector = apps.get_model('assets', 'Connector')
     for cable_type in CableType.objects.all():
         if cable_type.plug is None:
-            cable_type.plug = Connector.objects.first()
+            cable_type.plug = Connector.first()
         if cable_type.socket is None:
-            cable_type.socket = Connector.objects.first()
+            cable_type.socket = Connector.first()
         cable_type.save()
 
 

assets/migrations/0020_auto_20210208_1603.py

@@ -1,4 +1,4 @@
-# Generated by Django 3.1.7 on 2021-03-02 12:04
+# Generated by Django 3.1.5 on 2021-02-08 16:03
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -7,7 +7,7 @@ import django.db.models.deletion
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('assets', '0020_auto_20210302_1201'),
+        ('assets', '0019_fix_cabletype'),
     ]
 
     operations = [

assets/migrations/0020_auto_20210302_1201.py

@@ -1,23 +0,0 @@
-# Generated by Django 3.1.7 on 2021-03-02 12:01
-
-from django.db import migrations
-
-
-def postgres_migration_prep(apps, schema_editor):
-    model = apps.get_model("assets", "Supplier")
-    fields = ["address", "email", "notes", "phone"]
-    for field in fields:
-        filter_param = {"{}__isnull".format(field): True}
-        update_param = {field: ""}
-        model.objects.filter(**filter_param).update(**update_param)
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('assets', '0019_fix_cabletype'),
-    ]
-
-    operations = [
-        migrations.RunPython(postgres_migration_prep, migrations.RunPython.noop)
-    ]

assets/models.py

@@ -49,7 +49,7 @@ class Supplier(models.Model, RevisionMixin):
         ordering = ['name']
 
     def get_absolute_url(self):
-        return reverse('supplier_detail', kwargs={'pk': self.pk})
+        return reverse('supplier_list')
 
     def __str__(self):
         return self.name
@@ -82,9 +82,6 @@ class CableType(models.Model):
         else:
             return "Unknown"
 
-    def get_absolute_url(self):
-        return reverse('cable_type_detail', kwargs={'pk': self.pk})
-
 
 def get_available_asset_id(wanted_prefix=""):
     sql = """

assets/templates/asset_detail.html

@@ -2,9 +2,6 @@
 {% load widget_tweaks %}
 
 {% block content %}
-<div class="row justify-content-end">
-{% include 'partials/asset_buttons.html' %}
-</div>
 <div class="row">
     <div class="col-md-6 mb-3">
     {% include 'partials/asset_detail_form.html' %}

assets/templates/asset_form.html

@@ -34,7 +34,7 @@
         })
         .ajaxSelectPicker({
             ajax: {
-                url: "{% url 'asset_search_json' %}",
+                url: '{% url 'asset_search_json' %}',
                 type: "GET",
                 data: function () {
                     let params = {

assets/templates/partials/asset_buttons.html

@@ -11,10 +11,7 @@
     <div class="btn-group">
         {% button 'edit' url='asset_update' pk=object.asset_id %}
         {% button 'duplicate' url='asset_duplicate' pk=object.asset_id %}
-        <a type="button" class="btn btn-info" href="{% url 'asset_audit' object.asset_id %}"><span class="fas fa-certificate"></span> Audit</a>
-        {% if object.is_cable %}
-        <a type="button" class="btn btn-primary" href="{% url 'generate_label' object.asset_id %}"><span class="fas fa-barcode"></span> Generate Label</a>
-        {% endif %}
+        <a type="button" class="btn btn-info" href="{% url 'asset_audit' object.asset_id %}"><i class="fas fa-certificate"></i> Audit</a>
     </div>
     {% endif %}
     {% if create or edit or duplicate %}

assets/templates/partials/cable_form.html

@@ -17,9 +17,11 @@
     {% else %}
     <dl>
       <dt>Cable Type</dt>
-      <dd>{% if object.cable_type %}<a href="{{object.cable_type.get_absolute_url}}">{{ object.cable_type }}</a>{%else%}-{%endif%}</dd>
+      <dd>{{ object.cable_type|default_if_none:'-' }}</dd>
+
       <dt>Length</dt>
       <dd>{{ object.length|default_if_none:'-' }}m</dd>
+
       <dt>Cross Sectional Area</dt>
       <dd>{{ object.csa|default_if_none:'-' }}mm²</dd>
     </dl>

assets/templates/partials/parent_form.html

@@ -28,13 +28,13 @@
 
       <dt>Children</dt>
       {% if object.asset_parent.all %}
-      <div style="max-height: 200px; overflow-y: auto; -webkit-overflow-scrolling: touch; ">
       {% for child in object.asset_parent.all %}
       <dd>
-        <a href="{% url 'asset_detail' child.asset_id %}">{{ child }}</a>
+        <a href="{% url 'asset_detail' child.asset_id %}">
+        {{ child.asset_id }} - {{ child.description }}
+        </a>
       </dd>
       {% endfor %}
-      </div>
       {% else %}
       <dd><span>-</span></dd>
       {% endif %}

assets/templates/partials/purchasedetails_form.html

@@ -1,5 +1,4 @@
 {% load widget_tweaks %}
-{% load linkornone from filters %}
 <div class="card mb-2">
   <div class="card-header">
     Purchase Details
@@ -8,26 +7,11 @@
     {% if create or edit or duplicate %}
     <div class="form-group" id="purchased-from-group">
       <label for="{{ form.purchased_from.id_for_label }}">Supplier</label>
-      <div class="row">
-          <div class="col">
-              <select id="{{ form.purchased_from.id_for_label }}" name="{{ form.purchased_from.name }}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='supplier' %}">
-                {% if object.purchased_from %}
-                <option value="{{form.purchased_from.value}}" selected="selected" data-update_url="{% url 'supplier_update' form.purchased_from.value %}">{{ object.purchased_from }}</option>
-                {% endif %}
-              </select>
-          </div>
-          <div class="col align-right">
-            <div class="btn-group">
-                <a href="{% url 'supplier_create' %}" class="btn btn-success modal-href"
-                   data-target="#{{ form.purchased_from.id_for_label }}">
-                    <span class="fas fa-plus"></span>
-                </a>
-                <a {% if form.supplier.value %}href="{% url 'supplier_update' form.purchased_from.value %}"{% endif %} class="btn btn-warning modal-href" id="{{ form.purchased_from.id_for_label }}-update" data-target="#{{ form.purchased_from.id_for_label }}">
-                    <span class="fas fa-edit"></span>
-                </a>
-            </div>
-          </div>
-      </div>
+      <select id="{{ form.purchased_from.id_for_label }}" name="{{ form.purchased_from.name }}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='supplier' %}">
+        {% if object.purchased_from %}
+        <option value="{{form.purchased_from.value}}" selected="selected" data-update_url="{% url 'supplier_update' form.purchased_from.value %}">{{ object.purchased_from }}</option>
+        {% endif %}
+      </select>
     </div>
 
     <div class="form-group">
@@ -67,11 +51,14 @@
       {% else %}
       <dl>
         <dt>Purchased From</dt>
-        <dd>{% if object.purchased_from %}<a href="{{object.purchased_from.get_absolute_url}}">{{ object.purchased_from }}</a>{%else%}-{%endif%}</dd>
+        <dd>{{ object.purchased_from|default_if_none:'-' }}</dd>
+
         <dt>Purchase Price</dt>
         <dd>£{{ object.purchase_price|default_if_none:'-' }}</dd>
+
         <dt>Salvage Value</dt>
         <dd>£{{ object.salvage_value|default_if_none:'-' }}</dd>
+
         <dt>Date Acquired</dt>
         <dd>{{ object.date_acquired|default_if_none:'-' }}</dd>
         {% if object.date_sold %}

assets/urls.py

@@ -1,24 +1,21 @@
 from django.contrib.auth.decorators import login_required
-from django.urls import path, register_converter
+from django.urls import path
 from django.views.decorators.clickjacking import xframe_options_exempt
 
 from PyRIGS.decorators import has_oembed, permission_required_with_403
 from PyRIGS.views import OEmbedView
-from . import views, converters
-
-register_converter(converters.AssetIDConverter, 'asset')
+from assets import views
 
 urlpatterns = [
     path('', login_required(views.AssetList.as_view()), name='asset_index'),
     path('asset/list/', login_required(views.AssetList.as_view()), name='asset_list'),
-    path('asset/id/<asset:pk>/', has_oembed(oembed_view="asset_oembed")(views.AssetDetail.as_view()), name='asset_detail'),
+    path('asset/id/<str:pk>/', has_oembed(oembed_view="asset_oembed")(views.AssetDetail.as_view()), name='asset_detail'),
     path('asset/create/', permission_required_with_403('assets.add_asset')
          (views.AssetCreate.as_view()), name='asset_create'),
-    path('asset/id/<asset:pk>/edit/', permission_required_with_403('assets.change_asset')
+    path('asset/id/<str:pk>/edit/', permission_required_with_403('assets.change_asset')
          (views.AssetEdit.as_view()), name='asset_update'),
-    path('asset/id/<asset:pk>/duplicate/', permission_required_with_403('assets.add_asset')
+    path('asset/id/<str:pk>/duplicate/', permission_required_with_403('assets.add_asset')
          (views.AssetDuplicate.as_view()), name='asset_duplicate'),
-    path('asset/id/<asset:pk>/label', login_required(views.GenerateLabel.as_view()), name='generate_label'),
 
     path('cabletype/list/', login_required(views.CableTypeList.as_view()), name='cable_type_list'),
     path('cabletype/create/', permission_required_with_403('assets.add_cable_type')(views.CableTypeCreate.as_view()), name='cable_type_create'),

assets/views.py

@@ -1,5 +1,4 @@
 import simplejson
-import random
 from django.contrib import messages
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.core import serializers
@@ -10,11 +9,6 @@ from django.utils import timezone
 from django.utils.decorators import method_decorator
 from django.views import generic
 from django.views.decorators.csrf import csrf_exempt
-from django.shortcuts import get_object_or_404
-
-from PIL import Image, ImageDraw, ImageFont
-from barcode import Code39
-from barcode.writer import ImageWriter
 
 from PyRIGS.views import GenericListView, GenericDetailView, GenericUpdateView, GenericCreateView, ModalURLMixin, \
     is_ajax, OEmbedView
@@ -48,9 +42,9 @@ class AssetList(LoginRequiredMixin, generic.ListView):
             queryset = self.model.objects.all()
         elif len(query_string) >= 3:
             queryset = self.model.objects.filter(
-                Q(asset_id__exact=query_string.upper()) | Q(description__icontains=query_string) | Q(serial_number__exact=query_string))
+                Q(asset_id__exact=query_string) | Q(description__icontains=query_string) | Q(serial_number__exact=query_string))
         else:
-            queryset = self.model.objects.filter(Q(asset_id__exact=query_string.upper()))
+            queryset = self.model.objects.filter(Q(asset_id__exact=query_string))
 
         if form.cleaned_data['category']:
             queryset = queryset.filter(category__in=form.cleaned_data['category'])
@@ -344,37 +338,3 @@ class CableTypeUpdate(generic.UpdateView):
 
     def get_success_url(self):
         return reverse("cable_type_detail", kwargs={"pk": self.object.pk})
-
-
-class GenerateLabel(generic.View):
-    def get(self, request, pk):
-        black = (0, 0, 0)
-        white = (255, 255, 255)
-        size = (700, 200)
-        font = ImageFont.truetype("static/fonts/OpenSans-Regular.tff", 20)
-        obj = get_object_or_404(models.Asset, asset_id=pk)
-
-        asset_id = "Asset: {}".format(obj.asset_id)
-        length = "Length: {}m".format(obj.length)
-        csa = "CSA: {}mm²".format(obj.csa)
-
-        image = Image.new("RGB", size, white)
-        logo = Image.open("static/imgs/square_logo.png")
-        draw = ImageDraw.Draw(image)
-
-        draw.text((210, 140), asset_id, fill=black, font=font)
-        draw.text((210, 170), length, fill=black, font=font)
-        draw.text((350, 170), csa, fill=black, font=font)
-        draw.multiline_text((500, 140), "TEC PA & Lighting\n(0115) 84 68720", fill=black, font=font)
-
-        barcode = Code39(str(obj.asset_id), writer=ImageWriter())
-
-        logo_size = (200, 200)
-        image.paste(logo.resize(logo_size, Image.ANTIALIAS))
-        barcode_image = barcode.render(writer_options={"quiet_zone": 0, "write_text": False})
-        width, height = barcode_image.size
-        image.paste(barcode_image.crop((0, 0, width, 135)), (int(((size[0] + logo_size[0]) - width) / 2), 0))
-
-        response = HttpResponse(content_type="image/png")
-        image.save(response, "PNG")
-        return response

pipeline/source_assets/scss/dark_screen.scss

@@ -119,18 +119,4 @@
         background: #222;
         color: $gray-100;
     }
-    input:-webkit-autofill,
-    input:-webkit-autofill:hover, 
-    input:-webkit-autofill:focus,
-    textarea:-webkit-autofill,
-    textarea:-webkit-autofill:hover,
-    textarea:-webkit-autofill:focus,
-    select:-webkit-autofill,
-    select:-webkit-autofill:hover,
-    select:-webkit-autofill:focus {
-      border: 1px solid $info;
-      -webkit-text-fill-color: white;
-      -webkit-box-shadow: 0 0 0px 1000px rgba($info, .3) inset;
-      transition: background-color 5000s ease-in-out 0s;
-    }
 }

pipeline/source_assets/scss/screen.scss

@@ -177,11 +177,6 @@ svg {
     white-space: no-wrap;
 }
 
-span.fas {
-    padding-left: 0.1em !important;
-    padding-right: 0.1em !important;
-}
-
 html.embedded {
   display: flex;
   flex-direction: column;

templates/base.html

@@ -15,6 +15,7 @@
 
     <link rel="icon" type="image/png" href="{% static 'imgs/pyrigs-avatar.png' %}">
     <link rel="apple-touch-icon" href="{% static 'imgs/pyrigs-avatar.png' %}">
+    <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/screen.css' %}">
     {% block css %}
@@ -31,26 +32,26 @@
 <a class="skip-link" href='#main'>Skip to content</a>
 {% include "analytics.html" %}
 {% block navbar %}
-<nav class="navbar navbar-expand-lg navbar-dark bg-dark" role="navigation">
-  <div class="container">
-  <a class="navbar-brand" style="position: absolute; left:0.5em; top: 2px;" href="{% if request.user.is_authenticated %}https://members.nottinghamtec.co.uk{%else%}https://nottinghamtec.co.uk{%endif%}">
-    <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" id="logo">
+<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.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>
-  {% block titleheader %}
-  {% endblock %}
-  <button class="navbar-toggler ml-auto" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation" onclick="document.getElementById('logo').classList.toggle('d-none');">
-  <span class="navbar-toggler-icon"></span>
-  </button>
-  <div class="collapse navbar-collapse justify-content-between" id="navbarSupportedContent">
-    <ul class="navbar-nav">
-        {% block titleelements %}
-        {% endblock %}
-    </ul>
-    <ul class="navbar-nav align-self-end">
-        {% block titleelements_right %}
-        {% endblock %}
-    </ul>
-  </div>
+  <div class="container">
+      {% block titleheader %}
+      {% endblock %}
+      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+      </button>
+      <div class="collapse navbar-collapse" id="navbarSupportedContent">
+        <ul class="navbar-nav">
+            {% block titleelements %}
+            {% endblock %}
+        </ul>
+        <ul class="navbar-nav ml-auto">
+            {% block titleelements_right %}
+            {% endblock %}
+        </ul>
+      </div>
   </div>
 </nav>
 {% endblock %}

templates/base_ajax.html

@@ -1,7 +1,7 @@
 <div class="modal-dialog modal-lg">
     <div class="modal-content">
         <div class="modal-header">
-            <h4 class="modal-title">{{page_title|safe}}{% block title %}{% endblock %}</h4>
+            <h4 class="modal-title">{{page_title}}{% block title %}{% endblock %}</h4>
             <button type="button" class="close" data-dismiss="modal" aria-label="Close">
               <span aria-hidden="true">&times;</span>
             </button>

templates/partials/search.html

@@ -1,10 +1,10 @@
 {% if user.is_authenticated %}
-<form id="searchForm" class="form-inline flex-nowrap mx-md-3 px-2 border border-light rounded w-75" role="form" method="GET" action="{% url 'event_archive' %}">
+<form id="searchForm" class="form-inline flex-nowrap mx-md-3 px-2 border border-light rounded" role="form" method="GET" action="{% url 'event_archive' %}">
     <div class="input-group input-group-sm flex-nowrap">
         <div class="input-group-prepend">
             <input id="id_search_input" type="search" name="q" class="form-control form-control-sm" placeholder="Search..." value="{{ request.GET.q }}" />
         </div>
-        <select id="search-options" class="custom-select form-control" style="border-top-right-radius: 0px; border-bottom-right-radius: 0px; width: 15ch;">
+        <select id="search-options" class="custom-select form-control" style="border-top-right-radius: 0px; border-bottom-right-radius: 0px; width: 20ch;">
           <option selected data-action="{% url 'event_archive' %}" href="#">Events</option>
           <option data-action="{% url 'person_list' %}" href="#">People</option>
           <option data-action="{% url 'organisation_list' %}" href="#">Organisations</option>
@@ -17,7 +17,7 @@
         </select>
     </div>
     <button class="btn btn-info form-control form-control-sm btn-sm w-25" style="border-top-left-radius: 0px;border-bottom-left-radius: 0px;"><span class="fas fa-search"></span><span class="sr-only"> Search</span></button>
-    <a href="{% url 'search_help' %}" class="nav-link modal-href ml-1"><span class="fas fa-question-circle"></span></a>
+    <a href="{% url 'search_help' %}" class="nav-link modal-href ml-2"><span class="fas fa-question-circle"></span></a>
 </form>
 {% endif %}
 

templates/registration/registration_form.html

@@ -1,36 +1,29 @@
 {% extends 'base_rigs.html' %}
 {% load widget_tweaks %}
-{% load static %}
 {% block title %}Registration{% endblock %}
 
 {% block content %}
-<div style="background-image: linear-gradient(rgba(0, 0, 0, 0.7), rgba(0, 0, 0, 0.7)), url({% static 'imgs/wof2014-1-small.jpg' %}); background-repeat: no-repeat; background-size: cover; width: 100vw; height: 100vh; position: relative; left: 50%; right: 50%; margin-left: -50vw; margin-right: -50vw; margin-top: -24px; padding-top: 24px;">
-    <div class="container">
-            <div class="card">
-                <h3 class="card-header">New User Registration</h3>
-                <div class="card-body">
-                    {% if form.errors or supplement_form.errors %}
-                    	<div class="alert alert-danger">
-                    		{{form.errors}}
-                    		{{supplement_form.errors}}
-                    	</div>
-                    {% endif %}
-                    <div class="col-sm-8 col-sm-offset-2">
-                        <form method="post" role="form">{% csrf_token %}
-                            {% for field in form %}
-                            	<div class="form-group form-row">
-                            		<label for="{{ field.id_for_label }}" class="col-form-label col-sm-4">{{ field.label }}</label>
-                            		<div class="controls col-sm-8">
-                            			{% render_field field class+="form-control" placeholder=field.label %}
-                            		</div>
-                            	</div>
-                            {% endfor %}
-                            <p><input type="submit" value="Register" class="btn btn-primary pull-right"></p>
-                        </form>
-                    </div>
-                </div>
-            </div>
-        </div>
+<div class="col-sm-10 col-sm-offset-1">
+    <h3>New User Registration</h3>
+    {% if form.errors or supplement_form.errors %}
+    	<div class="alert alert-danger">
+    		{{form.errors}}
+    		{{supplement_form.errors}}
+    	</div>
+    {% endif %}
+
+    <div class="col-sm-8 col-sm-offset-2">
+        <form action="" method="post" class="" role="form">{% csrf_token %}
+            {% for field in form %}
+            	<div class="form-group">
+            		<label for="{{ field.id_for_label }}" class="col-form-label col-sm-4">{{ field.label }}</label>
+            		<div class="controls col-sm-8">
+            			{% render_field field class+="form-control" placeholder=field.label %}
+            		</div>
+            	</div>
+            {% endfor %}
+            <p><input type="submit" value="Register" class="btn btn-primary pull-right"></p>
+        </form>
     </div>
 </div>
-{% endblock %}
+{% endblock %}

users/forms.py

@@ -1,24 +1,15 @@
-from hcaptcha.fields import hCaptchaField
+from captcha.fields import ReCaptchaField
 from django import forms
 from django.contrib.auth.forms import (AuthenticationForm, PasswordResetForm,
                                        UserChangeForm, UserCreationForm)
-from django.conf import settings
 from registration.forms import RegistrationFormUniqueEmail
 
 from RIGS import models
 
 
-class CaptchaField(hCaptchaField):
-    def validate(self, value):
-        # Skip validation if we're testing FIXME: Arona, y u so lazy
-        if settings.HCAPTCHA_SITEKEY != '10000000-ffff-ffff-ffff-000000000001':
-            super().validate(value)
-
 # Registration
-
-
 class ProfileRegistrationFormUniqueEmail(RegistrationFormUniqueEmail):
-    hcaptcha = CaptchaField()
+    captcha = ReCaptchaField()
 
     class Meta:
         model = models.Profile
@@ -50,7 +41,7 @@ class EmbeddedAuthenticationForm(CheckApprovedForm):
 
 
 class PasswordReset(PasswordResetForm):
-    hcaptcha = CaptchaField()
+    captcha = ReCaptchaField(label='Captcha')
 
 
 class ProfileCreationForm(UserCreationForm):

users/templates/partials/navbar_user.html

@@ -1,4 +1,4 @@
-<li class="nav-item dropdown align-self-end" id="user">
+<li class="nav-item dropdown" id="user">
 {% if user.is_authenticated %}
     <a class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
         Hi {{ user.first_name }}

users/tests/test_users.py

@@ -1,10 +1,8 @@
 import os
 import re
-import time
 
 from django.core import mail
 from django.test import LiveServerTestCase
-from django.test.utils import override_settings
 from selenium.webdriver.common.keys import Keys
 
 from PyRIGS.tests.base import create_browser
@@ -15,12 +13,14 @@ from RIGS import models
 class UserRegistrationTest(LiveServerTestCase):
     def setUp(self):
         self.browser = create_browser()
-        self.browser.implicitly_wait(5)  # Set implicit wait session wide
+
+        self.browser.implicitly_wait(3)  # Set implicit wait session wide
+        os.environ['RECAPTCHA_TESTING'] = 'True'
 
     def tearDown(self):
         self.browser.quit()
+        os.environ['RECAPTCHA_TESTING'] = 'False'
 
-    @override_settings(DEBUG=True)
     def test_registration(self):
         # Navigate to the registration page
         self.browser.get(self.live_server_url + '/user/register/')
@@ -61,11 +61,9 @@ class UserRegistrationTest(LiveServerTestCase):
         last_name.send_keys('Smith')
         initials.send_keys('JS')
         # phone.send_keys('0123456789')
-        time.sleep(1)
-        self.browser.switch_to.frame(self.browser.find_element_by_tag_name("iframe"))
-        self.browser.find_element_by_id('anchor').click()
-        self.browser.switch_to.default_content()
-        time.sleep(3)
+        self.browser.execute_script(
+            "return function() {jQuery('#g-recaptcha-response').val('PASSED'); return 0}()")
+
         # Submit incorrect form
         submit = self.browser.find_element_by_xpath("//input[@type='submit']")
         submit.click()
@@ -87,6 +85,9 @@ class UserRegistrationTest(LiveServerTestCase):
         # Correct error
         password1.send_keys('correcthorsebatterystaple')
         password2.send_keys('correcthorsebatterystaple')
+        self.browser.execute_script("console.log('Hello, world!')")
+        self.browser.execute_script(
+            "return function() {jQuery('#g-recaptcha-response').val('PASSED'); return 0}()")
 
         # Submit again
         password2.send_keys(Keys.ENTER)
@@ -125,6 +126,8 @@ class UserRegistrationTest(LiveServerTestCase):
         # Expected to fail as not approved
         username.send_keys('TestUsername')
         password.send_keys('correcthorsebatterystaple')
+        self.browser.execute_script(
+            "return function() {jQuery('#g-recaptcha-response').val('PASSED'); return 0}()")
         password.send_keys(Keys.ENTER)
 
         # Test approval
@@ -146,6 +149,8 @@ class UserRegistrationTest(LiveServerTestCase):
         username.send_keys('TestUsername')
         password = self.browser.find_element_by_id('id_password')
         password.send_keys('correcthorsebatterystaple')
+        self.browser.execute_script(
+            "return function() {jQuery('#g-recaptcha-response').val('PASSED'); return 0}()")
         password.send_keys(Keys.ENTER)
 
         # Check we are logged in