Initial noodling

.github/workflows/combine-prs.yml

@@ -1,151 +0,0 @@
-name: 'Combine PRs'
-
-# Controls when the action will run - in this case triggered manually
-on:
-  workflow_dispatch:
-    inputs:
-      branchPrefix:
-        description: 'Branch prefix to find combinable PRs based on'
-        required: true
-        default: 'dependabot'
-      mustBeGreen:
-        description: 'Only combine PRs that are green (status is success)'
-        required: true
-        default: true
-      combineBranchName:
-        description: 'Name of the branch to combine PRs into'
-        required: true
-        default: 'combine-prs-branch'
-      ignoreLabel:
-        description: 'Exclude PRs with this label'
-        required: true
-        default: 'nocombine'
-
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
-jobs:
-  # This workflow contains a single job called "combine-prs"
-  combine-prs:
-    # The type of runner that the job will run on
-    runs-on: ubuntu-latest
-
-    # Steps represent a sequence of tasks that will be executed as part of the job
-    steps:
-      - uses: actions/github-script@v6
-        id: create-combined-pr
-        name: Create Combined PR
-        with:
-          github-token: ${{secrets.GITHUB_TOKEN}}
-          script: |
-            const pulls = await github.paginate('GET /repos/:owner/:repo/pulls', {
-              owner: context.repo.owner,
-              repo: context.repo.repo
-            });
-            let branchesAndPRStrings = [];
-            let baseBranch = null;
-            let baseBranchSHA = null;
-            for (const pull of pulls) {
-              const branch = pull['head']['ref'];
-              console.log('Pull for branch: ' + branch);
-              if (branch.startsWith('${{ github.event.inputs.branchPrefix }}')) {
-                console.log('Branch matched prefix: ' + branch);
-                let statusOK = true;
-                if(${{ github.event.inputs.mustBeGreen }}) {
-                  console.log('Checking green status: ' + branch);
-                  const stateQuery = `query($owner: String!, $repo: String!, $pull_number: Int!) {
-                    repository(owner: $owner, name: $repo) {
-                      pullRequest(number:$pull_number) {
-                        commits(last: 1) {
-                          nodes {
-                            commit {
-                              statusCheckRollup {
-                                state
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }`
-                  const vars = {
-                    owner: context.repo.owner,
-                    repo: context.repo.repo,
-                    pull_number: pull['number']
-                  };
-                  const result = await github.graphql(stateQuery, vars);
-                  const [{ commit }] = result.repository.pullRequest.commits.nodes;
-                  const state = commit.statusCheckRollup.state
-                  console.log('Validating status: ' + state);
-                  if(state != 'SUCCESS') {
-                    console.log('Discarding ' + branch + ' with status ' + state);
-                    statusOK = false;
-                  }
-                }
-                console.log('Checking labels: ' + branch);
-                const labels = pull['labels'];
-                for(const label of labels) {
-                  const labelName = label['name'];
-                  console.log('Checking label: ' + labelName);
-                  if(labelName == '${{ github.event.inputs.ignoreLabel }}') {
-                    console.log('Discarding ' + branch + ' with label ' + labelName);
-                    statusOK = false;
-                  }
-                }
-                if (statusOK) {
-                  console.log('Adding branch to array: ' + branch);
-                  const prString = '#' + pull['number'] + ' ' + pull['title'];
-                  branchesAndPRStrings.push({ branch, prString });
-                  baseBranch = pull['base']['ref'];
-                  baseBranchSHA = pull['base']['sha'];
-                }
-              }
-            }
-            if (branchesAndPRStrings.length == 0) {
-              core.setFailed('No PRs/branches matched criteria');
-              return;
-            }
-            try {
-              await github.rest.git.createRef({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                ref: 'refs/heads/' + '${{ github.event.inputs.combineBranchName }}',
-                sha: baseBranchSHA
-              });
-            } catch (error) {
-              console.log(error);
-              core.setFailed('Failed to create combined branch - maybe a branch by that name already exists?');
-              return;
-            }
-            
-            let combinedPRs = [];
-            let mergeFailedPRs = [];
-            for(const { branch, prString } of branchesAndPRStrings) {
-              try {
-                await github.rest.repos.merge({
-                  owner: context.repo.owner,
-                  repo: context.repo.repo,
-                  base: '${{ github.event.inputs.combineBranchName }}',
-                  head: branch,
-                });
-                console.log('Merged branch ' + branch);
-                combinedPRs.push(prString);
-              } catch (error) {
-                console.log('Failed to merge branch ' + branch);
-                mergeFailedPRs.push(prString);
-              }
-            }
-            
-            console.log('Creating combined PR');
-            const combinedPRsString = combinedPRs.join('\n');
-            let body = '✅ This PR was created by the Combine PRs action by combining the following PRs:\n' + combinedPRsString;
-            if(mergeFailedPRs.length > 0) {
-              const mergeFailedPRsString = mergeFailedPRs.join('\n');
-              body += '\n\n⚠️ The following PRs were left out due to merge conflicts:\n' + mergeFailedPRsString
-            }
-            await github.rest.pulls.create({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              title: 'Combined PR',
-              head: '${{ github.event.inputs.combineBranchName }}',
-              base: baseBranch,
-              body: body
-            });

.github/workflows/django.yml

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

Pipfile

@@ -11,6 +11,7 @@ asgiref = "~=3.3.1"
 beautifulsoup4 = "~=4.9.3"
 Brotli = "~=1.0.9"
 cachetools = "~=4.2.1"
+certifi = "~=2020.12.5"
 chardet = "~=4.0.0"
 configparser = "~=5.0.1"
 contextlib2 = "~=0.6.0.post1"
@@ -25,16 +26,18 @@ django-ical = "~=1.7.1"
 django-recurrence = "~=1.10.3"
 django-registration-redux = "~=2.9"
 django-reversion = "~=3.0.9"
+django-toolbelt = "~=0.0.1"
 django-widget-tweaks = "~=1.4.8"
 django-htmlmin = "~=0.11.0"
-envparse = "*"
+envparse = "~=0.2.0"
 gunicorn = "~=20.0.4"
 icalendar = "~=4.0.7"
 idna = "~=2.10"
+lxml = "~=4.7.1"
 Markdown = "~=3.3.3"
 msgpack = "~=1.0.2"
 pep517 = "~=0.9.1"
-Pillow = "~=9.3.0"
+Pillow = "~=9.0.0"
 premailer = "~=3.7.0"
 progress = "~=1.5"
 psutil = "~=5.8.0"
@@ -42,7 +45,7 @@ psycopg2 = "~=2.8.6"
 Pygments = "~=2.7.4"
 pyparsing = "~=2.4.7"
 PyPDF2 = "~=1.27.5"
-PyPOM = "~=2.2.4"
+PyPOM = "~=2.2.0"
 python-dateutil = "~=2.8.1"
 pytoml = "~=0.1.21"
 pytz = "~=2020.5"
@@ -79,10 +82,10 @@ django-hcaptcha = "*"
 pikepdf = "*"
 django-queryable-properties = "*"
 django-mass-edit = "*"
-selenium = "~=3.141.0"
 
 [dev-packages]
-pycodestyle = "~=2.9.1"
+selenium = "~=3.141.0"
+pycodestyle = "*"
 coveralls = "*"
 django-coverage-plugin = "*"
 pytest-cov = "*"

PyRIGS/settings.py

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

PyRIGS/views.py

@@ -321,60 +321,45 @@ class OEmbedView(generic.View):
         return JsonResponse(data)
 
 
-def get_info_string(user):
-    user_str = f"by {user.name} " if user else ""
-    time = timezone.now().strftime('%d/%m/%Y %H:%I')
-    return f"[Paperwork generated {user_str}on {time}"
-
-
-def render_pdf_response(template, context, append_terms):
-    merger = PdfFileMerger()
-    rml = template.render(context)
-    buffer = rml2pdf.parseString(rml)
-    merger.append(PdfFileReader(buffer))
-    buffer.close()
-
-    if append_terms:
-        terms = urllib.request.urlopen(settings.TERMS_OF_HIRE_URL)
-        merger.append(BytesIO(terms.read()))
-
-    merged = BytesIO()
-    merger.write(merged)
-
-    response = HttpResponse(content_type='application/pdf')
-    f = context['filename']
-    response['Content-Disposition'] = f'filename="{f}"'
-    response.write(merged.getvalue())
-    return response
-
-
 class PrintView(generic.View):
     append_terms = False
 
     def get_context_data(self, **kwargs):
         obj = get_object_or_404(self.model, pk=self.kwargs['pk'])
+        user_str = f"by {self.request.user.name} " if self.request.user is not None else ""
+        time = timezone.now().strftime('%d/%m/%Y %H:%I')
         object_name = re.sub(r'[^a-zA-Z0-9 \n\.]', '', obj.name)
 
         context = {
             'object': obj,
             'current_user': self.request.user,
             'object_name': object_name,
-            'info_string': get_info_string(self.request.user) + f"- {obj.current_version_id}]",
+            'info_string': f"[Paperwork generated {user_str}on {time} - {obj.current_version_id}]",
         }
 
         return context
 
     def get(self, request, pk):
-        return render_pdf_response(get_template(self.template_name), self.get_context_data(), self.append_terms)
+        template = get_template(self.template_name)
 
+        merger = PdfFileMerger()
 
-class PrintListView(generic.ListView):
-    def get_context_data(self, *args, **kwargs):
-        context = super().get_context_data(*args, **kwargs)
-        context['current_user'] = self.request.user
-        context['info_string'] = get_info_string(self.request.user) + "]"
-        return context
+        context = self.get_context_data()
 
-    def get(self, request):
-        self.object_list = self.get_queryset()
-        return render_pdf_response(get_template(self.template_name), self.get_context_data(), False)
+        rml = template.render(context)
+        buffer = rml2pdf.parseString(rml)
+        merger.append(PdfFileReader(buffer))
+        buffer.close()
+
+        if self.append_terms:
+            terms = urllib.request.urlopen(settings.TERMS_OF_HIRE_URL)
+            merger.append(BytesIO(terms.read()))
+
+        merged = BytesIO()
+        merger.write(merged)
+
+        response = HttpResponse(content_type='application/pdf')
+        f = context['filename']
+        response['Content-Disposition'] = f'filename="{f}"'
+        response.write(merged.getvalue())
+        return response

RIGS/admin.py

@@ -206,8 +206,3 @@ class RiskAssessmentAdmin(VersionAdmin):
 @admin.register(models.EventChecklist)
 class EventChecklistAdmin(VersionAdmin):
     list_display = ('id', 'event', 'reviewed_at', 'reviewed_by')
-
-
-@admin.register(models.PowerTestRecord)
-class EventChecklistAdmin(VersionAdmin):
-    list_display = ('id', 'event', 'reviewed_at', 'reviewed_by')

RIGS/forms.py

@@ -44,7 +44,7 @@ class EventForm(forms.ModelForm):
         return simplejson.dumps(items)
 
     def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
+        super(EventForm, self).__init__(*args, **kwargs)
 
         self.fields['items_json'].initial = self._get_items_json
         self.fields['start_date'].widget.format = '%Y-%m-%d'
@@ -217,7 +217,7 @@ class EventChecklistForm(forms.ModelForm):
         for key in vehicles:
             pk = int(key.split('_')[1])
             driver_key = 'driver_' + str(pk)
-            if (self.data[driver_key] == ''):
+            if(self.data[driver_key] == ''):
                 raise forms.ValidationError('Add a driver to vehicle ' + str(pk), code='vehicle_mismatch')
             else:
                 try:
@@ -283,27 +283,3 @@ class EventChecklistForm(forms.ModelForm):
         model = models.EventChecklist
         fields = '__all__'
         exclude = ['reviewed_at', 'reviewed_by']
-
-
-class PowerTestRecordForm(forms.ModelForm):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        for name, field in self.fields.items():
-            if field.__class__ == forms.NullBooleanField:
-                # Only display yes/no to user, the 'none' is only ever set in the background
-                field.widget = forms.CheckboxInput()
-
-    class Meta:
-        model = models.PowerTestRecord
-        fields = '__all__'
-        exclude = ['reviewed_at', 'reviewed_by']
-
-
-class EventCheckInForm(forms.ModelForm):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.fields['time'].initial = timezone.now()
-
-    class Meta:
-        model = models.EventCheckIn
-        fields = '__all__'

RIGS/management/commands/generateSampleRIGSData.py

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

RIGS/management/commands/send_reminders.py

@@ -1,38 +0,0 @@
-import premailer
-import datetime
-
-from django.template.loader import get_template
-from django.contrib.staticfiles import finders
-from django.conf import settings
-from django.core.management.base import BaseCommand, CommandError
-from django.core.mail import EmailMultiAlternatives
-from django.utils import timezone
-from django.urls import reverse
-
-from RIGS import models
-
-
-class Command(BaseCommand):
-    help = 'Sends email reminders as required. Triggered daily through heroku-scheduler in production.'
-
-    def handle(self, *args, **options):
-        events = models.Event.objects.current_events().select_related('riskassessment')
-        for event in events:
-            earliest_time = event.earliest_time if isinstance(event.earliest_time, datetime.datetime) else timezone.make_aware(datetime.datetime.combine(event.earliest_time, datetime.time(00, 00)))
-            # 48 hours = 172800 seconds
-            if event.is_rig and not event.cancelled and not event.dry_hire and (earliest_time - timezone.now()).total_seconds() <= 172800 and not hasattr(event, 'riskassessment'):
-                context = {
-                    "event": event,
-                    "url": "https://" + settings.DOMAIN + reverse('event_ra', kwargs={'pk': event.pk})
-                }
-                target = event.mic.email if event.mic else f"productions@{settings.DOMAIN}"
-                msg = EmailMultiAlternatives(
-                    f"{event} - Risk Assessment Incomplete",
-                    get_template("email/ra_reminder.txt").render(context),
-                    to=[target],
-                    reply_to=[f"h.s.manager@{settings.DOMAIN}"],
-                )
-                css = finders.find('css/email.css')
-                html = premailer.Premailer(get_template("email/ra_reminder.html").render(context), external_styles=css).transform()
-                msg.attach_alternative(html, 'text/html')
-                msg.send()

RIGS/migrations/0045_alter_profile_is_approved.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.2.12 on 2022-10-20 23:02
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('RIGS', '0044_profile_is_supervisor'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='profile',
-            name='is_approved',
-            field=models.BooleanField(default=False, help_text='Designates whether a staff member has approved this user.', verbose_name='Approval Status'),
-        ),
-    ]

RIGS/migrations/0046_create_powertests.py

@@ -1,71 +0,0 @@
-# Generated by Django 3.2.16 on 2023-05-08 15:58
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-import versioning.versioning
-
-def migrate_old_data(apps, schema_editor):
-    EventChecklist = apps.get_model('RIGS', 'EventChecklist')
-    PowerTestRecord = apps.get_model('RIGS', 'PowerTestRecord')
-    for ec in EventChecklist.objects.all():
-        # New highscore for the most pythonic BS I've ever written.
-        PowerTestRecord.objects.create(event=ec.event, **{i.name:getattr(ec, i.attname) for i in PowerTestRecord._meta.get_fields() if not (i.is_relation or i.auto_created)})
-
-
-def revert(apps, schema_editor):
-    apps.get_model('RIGS', 'PowerTestRecord').objects.all().delete()
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('RIGS', '0045_alter_profile_is_approved'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='PowerTestRecord',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('event', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='power_tests', to='RIGS.event')),
-                ('notes', models.TextField(blank=True, default='')),
-                ('venue', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='RIGS.venue')),
-                ('reviewed_at', models.DateTimeField(null=True)),
-                ('rcds', models.BooleanField(blank=True, help_text='RCDs installed where needed and tested?', null=True)),
-                ('supply_test', models.BooleanField(blank=True, help_text='Electrical supplies tested?<br><small>(using socket tester)</small>', null=True)),
-                ('earthing', models.BooleanField(blank=True, help_text='Equipment appropriately earthed?<br><small>(truss, stage, generators etc)</small>', null=True)),
-                ('pat', models.BooleanField(blank=True, help_text='All equipment in PAT period?', null=True)),
-                ('source_rcd', models.BooleanField(blank=True, help_text='Source RCD protected?<br><small>(if cable is more than 3m long) </small>', null=True)),
-                ('labelling', models.BooleanField(blank=True, help_text='Appropriate and clear labelling on distribution and cabling?', null=True)),
-                ('fd_voltage_l1', models.IntegerField(blank=True, help_text='L1 - N', null=True, verbose_name='First Distro Voltage L1-N')),
-                ('fd_voltage_l2', models.IntegerField(blank=True, help_text='L2 - N', null=True, verbose_name='First Distro Voltage L2-N')),
-                ('fd_voltage_l3', models.IntegerField(blank=True, help_text='L3 - N', null=True, verbose_name='First Distro Voltage L3-N')),
-                ('fd_phase_rotation', models.BooleanField(blank=True, help_text='Phase Rotation<br><small>(if required)</small>', null=True, verbose_name='Phase Rotation')),
-                ('fd_earth_fault', models.DecimalField(blank=True, decimal_places=2, help_text='Earth Fault Loop Impedance (Z<small>S</small>)', max_digits=5, null=True, verbose_name='Earth Fault Loop Impedance')),
-                ('fd_pssc', models.IntegerField(blank=True, help_text='Prospective Short Circuit Current', null=True, verbose_name='PSCC')),
-                ('w1_description', models.CharField(blank=True, default='', help_text='Description', max_length=255)),
-                ('w1_polarity', models.BooleanField(blank=True, help_text='Polarity Checked?', null=True)),
-                ('w1_voltage', models.IntegerField(blank=True, help_text='Voltage', null=True)),
-                ('w1_earth_fault', models.DecimalField(blank=True, decimal_places=2, help_text='Earth Fault Loop Impedance (Z<small>S</small>)', max_digits=5, null=True, verbose_name='Earth Fault Loop Impedance')),
-                ('w2_description', models.CharField(blank=True, default='', help_text='Description', max_length=255)),
-                ('w2_polarity', models.BooleanField(blank=True, help_text='Polarity Checked?', null=True)),
-                ('w2_voltage', models.IntegerField(blank=True, help_text='Voltage', null=True)),
-                ('w2_earth_fault', models.DecimalField(blank=True, decimal_places=2, help_text='Earth Fault Loop Impedance (Z<small>S</small>)', max_digits=5, null=True, verbose_name='Earth Fault Loop Impedance')),
-                ('w3_description', models.CharField(blank=True, default='', help_text='Description', max_length=255)),
-                ('w3_polarity', models.BooleanField(blank=True, help_text='Polarity Checked?', null=True)),
-                ('w3_voltage', models.IntegerField(blank=True, help_text='Voltage', null=True)),
-                ('w3_earth_fault', models.DecimalField(blank=True, decimal_places=2, help_text='Earth Fault Loop Impedance (Z<small>S</small>)', max_digits=5, null=True, verbose_name='Earth Fault Loop Impedance')),
-                ('all_rcds_tested', models.BooleanField(blank=True, help_text='All circuit RCDs tested?<br><small>(using test button)</small>', null=True)),
-                ('public_sockets_tested', models.BooleanField(blank=True, help_text='Public/Performer accessible circuits tested?<br><small>(using socket tester)</small>', null=True)),
-                ('reviewed_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Reviewer')),
-            ],
-            options={
-                'abstract': False,
-                'ordering': ['event'],
-                'permissions': [('review_power', 'Can review Power Test Records')],
-            },
-            bases=(models.Model, versioning.versioning.RevisionMixin),
-        ),
-        migrations.RunPython(migrate_old_data, reverse_code=revert),
-    ]

RIGS/migrations/0047_auto_20230508_1946.py

@@ -1,117 +0,0 @@
-# Generated by Django 3.2.16 on 2023-05-08 18:46
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('RIGS', '0046_create_powertests'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='all_rcds_tested',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='earthing',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='fd_earth_fault',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='fd_phase_rotation',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='fd_pssc',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='fd_voltage_l1',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='fd_voltage_l2',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='fd_voltage_l3',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='labelling',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='pat',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='public_sockets_tested',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='rcds',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='source_rcd',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='supply_test',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='w1_description',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='w1_earth_fault',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='w1_polarity',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='w1_voltage',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='w2_description',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='w2_earth_fault',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='w2_polarity',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='w2_voltage',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='w3_description',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='w3_earth_fault',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='w3_polarity',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='w3_voltage',
-        ),
-    ]

RIGS/migrations/0048_auto_20230509_2043.py

@@ -1,38 +0,0 @@
-# Generated by Django 3.2.18 on 2023-05-09 19:43
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('RIGS', '0047_auto_20230508_1946'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='eventchecklistvehicle',
-            name='checklist',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklistvehicle',
-            name='driver',
-        ),
-        migrations.RemoveField(
-            model_name='eventchecklist',
-            name='power_mic',
-        ),
-        migrations.AddField(
-            model_name='powertestrecord',
-            name='power_mic',
-            field=models.ForeignKey(blank=True, help_text='Who is the Power MIC?', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='checklists', to=settings.AUTH_USER_MODEL, verbose_name='Power MIC'),
-        ),
-        migrations.DeleteModel(
-            name='EventChecklistCrew',
-        ),
-        migrations.DeleteModel(
-            name='EventChecklistVehicle',
-        ),
-    ]

RIGS/migrations/0049_eventcheckin_eventcheckout.py

@@ -1,35 +0,0 @@
-# Generated by Django 3.2.18 on 2023-05-09 20:12
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('RIGS', '0048_auto_20230509_2043'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='EventCheckOut',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('time', models.DateTimeField()),
-                ('vehicle', models.CharField(max_length=100)),
-                ('event', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='RIGS.event')),
-                ('person', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='checkouts', to=settings.AUTH_USER_MODEL)),
-            ],
-        ),
-        migrations.CreateModel(
-            name='EventCheckIn',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('time', models.DateTimeField()),
-                ('vehicle', models.CharField(max_length=100)),
-                ('event', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='crew', to='RIGS.event')),
-                ('person', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='checkins', to=settings.AUTH_USER_MODEL)),
-            ],
-        ),
-    ]

RIGS/models.py

@@ -36,7 +36,7 @@ class Profile(AbstractUser):
     initials = models.CharField(max_length=5, null=True, blank=False)
     phone = models.CharField(max_length=13, blank=True, default='')
     api_key = models.CharField(max_length=40, blank=True, editable=False, default='')
-    is_approved = models.BooleanField(default=False, verbose_name="Approval Status", help_text="Designates whether a staff member has approved this user.")
+    is_approved = models.BooleanField(default=False)
     # Currently only populated by the admin approval email. TODO: Populate it each time we send any email, might need that...
     last_emailed = models.DateTimeField(blank=True, null=True)
     dark_theme = models.BooleanField(default=False)
@@ -689,21 +689,8 @@ def validate_url(value):
         raise ValidationError('URL must point to a location on the TEC Sharepoint')
 
 
-class ReviewableModel(models.Model):
-    reviewed_at = models.DateTimeField(null=True)
-    reviewed_by = models.ForeignKey(settings.AUTH_USER_MODEL, blank=True, null=True,
-                                    verbose_name="Reviewer", on_delete=models.CASCADE)
-
-    @cached_property
-    def fieldz(self):
-        return [n.name for n in list(self._meta.get_fields()) if n.name != 'reviewed_at' and n.name != 'reviewed_by' and not n.is_relation and not n.auto_created]
-
-    class Meta:
-        abstract = True
-
-
 @reversion.register
-class RiskAssessment(ReviewableModel, RevisionMixin):
+class RiskAssessment(models.Model, RevisionMixin):
     SMALL = (0, 'Small')
     MEDIUM = (1, 'Medium')
     LARGE = (2, 'Large')
@@ -751,6 +738,10 @@ class RiskAssessment(ReviewableModel, RevisionMixin):
 
     # Blimey that was a lot of options
 
+    reviewed_at = models.DateTimeField(null=True)
+    reviewed_by = models.ForeignKey(settings.AUTH_USER_MODEL, blank=True, null=True,
+                                    verbose_name="Reviewer", on_delete=models.CASCADE)
+
     supervisor_consulted = models.BooleanField(null=True)
 
     expected_values = {
@@ -787,6 +778,10 @@ class RiskAssessment(ReviewableModel, RevisionMixin):
             ('review_riskassessment', 'Can review Risk Assessments')
         ]
 
+    @cached_property
+    def fieldz(self):
+        return [n.name for n in list(self._meta.get_fields()) if n.name != 'reviewed_at' and n.name != 'reviewed_by' and not n.is_relation and not n.auto_created]
+
     @property
     def event_size(self):
         # Confirm event size. Check all except generators, since generators entails outside
@@ -816,10 +811,12 @@ class RiskAssessment(ReviewableModel, RevisionMixin):
 
 
 @reversion.register(follow=['vehicles', 'crew'])
-class EventChecklist(ReviewableModel, RevisionMixin):
+class EventChecklist(models.Model, RevisionMixin):
     event = models.ForeignKey('Event', related_name='checklists', on_delete=models.CASCADE)
 
     # General
+    power_mic = models.ForeignKey(settings.AUTH_USER_MODEL, blank=True, null=True, related_name='checklists',
+                                  verbose_name="Power MIC", on_delete=models.CASCADE, help_text="Who is the Power MIC?")
     venue = models.ForeignKey('Venue', on_delete=models.CASCADE)
     date = models.DateField()
 
@@ -833,32 +830,6 @@ class EventChecklist(ReviewableModel, RevisionMixin):
     hs_location = models.CharField(blank=True, default='', max_length=255, help_text="Location of Safety Bag/Box")
     extinguishers_location = models.CharField(blank=True, default='', max_length=255, help_text="Location of fire extinguishers")
 
-    inverted_fields = []
-
-    class Meta:
-        ordering = ['event']
-        permissions = [
-            ('review_eventchecklist', 'Can review Event Checklists')
-        ]
-
-    @property
-    def activity_feed_string(self):
-        return str(self.event)
-
-    def get_absolute_url(self):
-        return reverse('ec_detail', kwargs={'pk': self.pk})
-
-    def __str__(self):
-        return f"{self.pk} - {self.event}"
-
-
-@reversion.register
-class PowerTestRecord(ReviewableModel, RevisionMixin):
-    event = models.ForeignKey('Event', related_name='power_tests', on_delete=models.CASCADE)
-    power_mic = models.ForeignKey(settings.AUTH_USER_MODEL, blank=True, null=True, related_name='checklists',
-                              verbose_name="Power MIC", on_delete=models.CASCADE, help_text="Who is the Power MIC?")
-    venue = models.ForeignKey('Venue', on_delete=models.CASCADE)
-    notes = models.TextField(blank=True, default='')
     # Small Electrical Checks
     rcds = models.BooleanField(blank=True, null=True, help_text="RCDs installed where needed and tested?")
     supply_test = models.BooleanField(blank=True, null=True, help_text="Electrical supplies tested?<br><small>(using socket tester)</small>")
@@ -894,25 +865,58 @@ class PowerTestRecord(ReviewableModel, RevisionMixin):
     all_rcds_tested = models.BooleanField(blank=True, null=True, help_text="All circuit RCDs tested?<br><small>(using test button)</small>")
     public_sockets_tested = models.BooleanField(blank=True, null=True, help_text="Public/Performer accessible circuits tested?<br><small>(using socket tester)</small>")
 
-    def __str__(self):
-        return f"{self.pk} - {self.event}"
+    reviewed_at = models.DateTimeField(null=True)
+    reviewed_by = models.ForeignKey(settings.AUTH_USER_MODEL, blank=True, null=True,
+                                    verbose_name="Reviewer", on_delete=models.CASCADE)
+
+    inverted_fields = []
 
     class Meta:
         ordering = ['event']
         permissions = [
-            ('review_power', 'Can review Power Test Records')
+            ('review_eventchecklist', 'Can review Event Checklists')
         ]
 
+    @cached_property
+    def fieldz(self):
+        return [n.name for n in list(self._meta.get_fields()) if n.name != 'reviewed_at' and n.name != 'reviewed_by' and not n.is_relation and not n.auto_created]
 
-class EventCheckIn(models.Model):
-    event = models.ForeignKey('Event', related_name='crew', on_delete=models.CASCADE)
-    person = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='checkins', on_delete=models.CASCADE)
-    time = models.DateTimeField()
-    vehicle = models.CharField(max_length=100)
+    @property
+    def activity_feed_string(self):
+        return str(self.event)
+
+    def get_absolute_url(self):
+        return reverse('ec_detail', kwargs={'pk': self.pk})
+
+    def __str__(self):
+        return f"{self.pk} - {self.event}"
 
 
-class EventCheckOut(models.Model):
-    event = models.ForeignKey('Event', on_delete=models.CASCADE)
-    person = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='checkouts', on_delete=models.CASCADE)
-    time = models.DateTimeField() # TODO Validate may not check in in future
-    vehicle = models.CharField(max_length=100)
+@reversion.register
+class EventChecklistVehicle(models.Model, RevisionMixin):
+    checklist = models.ForeignKey('EventChecklist', related_name='vehicles', blank=True, on_delete=models.CASCADE)
+    vehicle = models.CharField(max_length=255)
+    driver = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='vehicles', on_delete=models.CASCADE)
+
+    reversion_hide = True
+
+    def __str__(self):
+        return f"{self.vehicle} driven by {self.driver}"
+
+
+@reversion.register
+class EventChecklistCrew(models.Model, RevisionMixin):
+    checklist = models.ForeignKey('EventChecklist', related_name='crew', blank=True, on_delete=models.CASCADE)
+    crewmember = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='crewed', on_delete=models.CASCADE)
+    role = models.CharField(max_length=255)
+    start = models.DateTimeField()
+    end = models.DateTimeField()
+
+    reversion_hide = True
+
+    def clean(self):
+        if self.start > self.end:
+            raise ValidationError('Unless you\'ve invented time travel, crew can\'t finish before they have started.')
+
+    def __str__(self):
+        return f"{self.crewmember} ({self.role})"

RIGS/signals.py

@@ -58,13 +58,13 @@ def send_eventauthorisation_success_email(instance):
 
     client_email = EmailMultiAlternatives(
         subject,
-        get_template("email/eventauthorisation_client_success.txt").render(context),
+        get_template("eventauthorisation_client_success.txt").render(context),
         to=[instance.email],
         reply_to=[settings.AUTHORISATION_NOTIFICATION_ADDRESS],
     )
 
     css = finders.find('css/email.css')
-    html = Premailer(get_template("email/eventauthorisation_client_success.html").render(context),
+    html = Premailer(get_template("eventauthorisation_client_success.html").render(context),
                      external_styles=css).transform()
     client_email.attach_alternative(html, 'text/html')
 
@@ -82,7 +82,7 @@ def send_eventauthorisation_success_email(instance):
 
     mic_email = EmailMessage(
         subject,
-        get_template("email/eventauthorisation_mic_success.txt").render(context),
+        get_template("eventauthorisation_mic_success.txt").render(context),
         to=[mic_email_address]
     )
 
@@ -117,12 +117,12 @@ def send_admin_awaiting_approval_email(user, request, **kwargs):
 
             email = EmailMultiAlternatives(
                 f"{context['number_of_users']} new users awaiting approval on RIGS",
-                get_template("email/admin_awaiting_approval.txt").render(context),
+                get_template("admin_awaiting_approval.txt").render(context),
                 to=[admin.email],
                 reply_to=[user.email],
             )
             css = finders.find('css/email.css')
-            html = Premailer(get_template("email/admin_awaiting_approval.html").render(context),
+            html = Premailer(get_template("admin_awaiting_approval.html").render(context),
                              external_styles=css).transform()
             email.attach_alternative(html, 'text/html')
             email.send()

RIGS/templates/base_print.xml

@@ -11,7 +11,6 @@
         <initialize>
             <color id="LightGray" RGB="#D3D3D3"/>
             <color id="DarkGray" RGB="#707070"/>
-            <color id="Brand" RGB="#3853a4"/>
         </initialize>
 
         <paraStyle name="style.para" fontName="OpenSans" />
@@ -28,8 +27,6 @@
         <paraStyle name="style.times" fontName="OpenSans"  fontSize="10" />
         <paraStyle name="style.head_titles" fontName="OpenSans-Bold" fontSize="10" />
         <paraStyle name="style.head_numbers" fontName="OpenSans"  fontSize="10" />
-        <paraStyle name="style.emheader" fontName="OpenSans" textColor="White" fontSize="12" backColor="Brand" leading="20" borderPadding="4"/>
-        <paraStyle name="style.breakbefore" parent="emheader" pageBreakBefore="1"/>
 
         <blockTableStyle id="eventSpecifics">
             <blockValign value="top"/>
@@ -87,7 +84,7 @@
                    bulletFontSize="10"/>
     </stylesheet>
 
-    <template title="{{filename}}"> {# Note: page is 595x842 points (1 point=1/72in) #}
+    <template > {# Note: page is 595x842 points (1 point=1/72in) #}
             <pageTemplate id="Headed" >
                 <pageGraphics>
                     <image file="static/imgs/paperwork/corner-tr-su.jpg" x="395" y="642" height="200" width="200"/>

RIGS/templates/base_rigs.html

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

RIGS/templates/email/eventauthorisation_mic_success.txt

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

RIGS/templates/email/ra_reminder.html

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

RIGS/templates/email/ra_reminder.txt

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

RIGS/templates/eventauthorisation_mic_success.txt

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

RIGS/templates/eventauthorisation_request.html

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

RIGS/templates/hs/event_checklist_detail.html

@@ -30,6 +30,14 @@
                     </a>
                     {% endif %}
                 </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>
             <ul>

RIGS/templates/hs/event_checklist_form.html

@@ -19,6 +19,41 @@
     {{ block.super }}
     <script src="{% static 'js/autocompleter.js' %}"></script>
     <script src="{% static 'js/tooltip.js' %}"></script>
+
+    <script>
+    $(document).ready(function () {
+        $('button[data-action=add]').on('click', function (event) {
+            event.preventDefault();
+            let target = $($(this).attr('data-target'));
+            let newID = Number(target.attr('data-pk'));
+            let newRow = $($(this).attr('data-clone'))
+                    .clone().attr('style', "")
+                   .attr('id', function(i, val){
+                        return val.split("_")[0] + '_' + newID;
+                   })
+                   .appendTo(target);
+            newRow.find('select,input').attr('name', function(i, val){
+                        return val.split("_")[0] + '_' + newID;
+                   })//Disabled is to prevent the hidden row being sent to the form
+                   .removeAttr('disabled');
+            newRow.find('button[data-action=delete]').attr('data-id', newID);
+            newRow.find('select').addClass('selectpicker');
+            newRow.find('.selectpicker').selectpicker('refresh');
+            $(".selectpicker").each(function(){initPicker($(this))});
+            initDatetime();
+            $(target).attr('data-pk', newID - 1);
+        });
+        $(document).on('click', 'button[data-action=delete]', function(event) {
+           event.preventDefault();
+           $(this).closest('tr').remove();
+        });
+        //Somewhat rudimentary way of ensuring people fill in completely (if it hits the database validation the whole table row disappears when the page reloads...)
+        //the not is to avoid adding it to some of bootstrap-selects extra crap
+        $('#vehiclest,#crewmemberst').on('change', 'select,input', function () {
+            $(this).closest('tr').find("select,input").not(':input[type=search]').attr('required', 'true');
+        });
+    });
+    </script>
 {% endblock %}
 
 {% block content %}
@@ -67,6 +102,52 @@
                                 {% endif %}
                                 </select>
                             </div>
+                            <div class="form-group form-row" id="{{ form.power_mic.id_for_label }}-group">
+                            <label for="{{ form.power_mic.id_for_label }}"
+                                class="col-4 col-form-label">{{ form.power_mic.help_text }}</label>
+                                <select id="{{ form.power_mic.id_for_label }}" name="{{ form.power_mic.name }}" class="form-control selectpicker col-8" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials" required="true">
+                                    {% if power_mic %}
+                                        <option value="{{power_mic.pk}}" selected="selected">{{ power_mic.name }}</option>
+                                    {% elif event.riskassessment.power_mic %}
+                                        <option value="{{event.riskassessment.power_mic.pk}}" selected="selected">{{ event.riskassessment.power_mic.name }}</option>
+                                    {% endif %}
+                                </select>
+                            </div>
+                            <p class="pt-3 font-weight-bold">List vehicles and their drivers</p>
+                            <div class="table-responsive">
+                                <table class="table table-sm">
+                                    <thead>
+                                        <tr>
+                                            <th scope="col">Vehicle</th>
+                                            <th scope="col">Driver</th>
+                                            <th scope="col"></th>
+                                        </tr>
+                                    </thead>
+                                    <tbody id="vehiclest" data-pk="-1">
+                                        <tr id="vehicles_new" style="display: none;">
+                                            <td><input type="text" class="form-control" name="vehicle_new" disabled="true"/></td>
+                                            <td><select data-container="body" class="form-control" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials" name="driver_new" disabled="true"></select></td>
+                                            <td><button type="button" class="btn btn-danger btn-sm mt-1" data-action='delete' data-target='#vehicle'><span class="fas fa-times"></span></button></td>
+                                        </tr>
+                                        {% for i in object.vehicles.all %}
+                                        <tr id="vehicles_{{i.pk}}">
+                                            <td><input name="vehicle_{{i.pk}}" type="text" class="form-control" value="{{ i.vehicle }}"/></td>
+                                            <td>
+                                                <select data-container="body" name="driver_{{i.pk}}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials">
+                                                    {% if i.driver != '' %}
+                                                        <option value="{{i.driver.pk}}" selected="selected">{{ i.driver.name }}</option>
+                                                    {% endif %}
+                                                </select>
+                                            </td>
+                                            <td><button type="button" class="btn btn-danger btn-sm mt-1" data-id='{{i.pk}}' data-action='delete' data-target='#vehicle'><span class="fas fa-times"></span></button></td>
+                                        </tr>
+                                        {% endfor %}
+                                    </tbody>
+                                </table>
+                            </div>
+                            <div class="text-right">
+                                <button type="button" class="btn btn-secondary" id="vehicle-add" data-action='add' data-target='#vehiclest' data-clone='#vehicles_new'><span class="fas fa-plus"></span> Add Vehicle</button>
+                            </div>
                         </div>
                     </div>
                 </div>
@@ -94,6 +175,176 @@
                     </div>
                 </div>
             </div>
+            <div class="row my-3">
+                <div class="col-12">
+                    <div class="card">
+                        <div class="card-header">Crew Record</div>
+                        <div class="card-body">
+                            <div class="table-responsive">
+                                <table class="table table-sm">
+                                    <thead>
+                                        <tr>
+                                            <th scope="col">Person</th>
+                                            <th scope="col">Start Time</th>
+                                            <th scope="col">Role</th>
+                                            <th scope="col">End Time</th>
+                                            <th scope="col"></th>
+                                        </tr>
+                                    </thead>
+                                    <tbody id="crewmemberst" data-pk="-1">
+                                        <tr id="crew_new" style="display: none;">
+                                            <td>
+                                                <select name="crewmember_new" class="form-control" data-container="body" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials" disabled="true"></select>
+                                            </td>
+                                            <td style="min-width: 15ch"><input name="start_new" type="datetime-local" class="form-control" value="{{ i.start }}" disabled=""/></td>
+                                            <td style="min-width: 15ch"><input name="role_new" type="text" class="form-control" value="{{ i.role }}" disabled="true"/></td>
+                                            <td style="min-width: 15ch"><input name="end_new" type="datetime-local" class="form-control" value="{{ i.end }}" disabled="true" /></td>
+                                            <td><button type="button" class="btn btn-danger btn-sm mt-1" data-id='{{crew.pk}}' data-action='delete' data-target='#crewmember'><span class="fas fa-times"></span></button></td>
+                                        </tr>
+                                        {% for crew in object.crew.all %}
+                                        <tr id="crew_{{crew.pk}}">
+                                            <td>
+                                                <select data-container="body" name="crewmember_{{crew.pk}}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials">
+                                                    {% if crew.crewmember != '' %}
+                                                        <option value="{{crew.crewmember.pk}}" selected="selected">{{ crew.crewmember.name }}</option>
+                                                    {% endif %}
+                                                </select>
+                                            </td>
+                                            <td><input name="start_{{crew.pk}}" type="datetime-local" class="form-control" value="{{ crew.start|date:'Y-m-d' }}T{{ crew.start|date:'H:i:s' }}"/></td>
+                                            <td><input name="role_{{crew.pk}}" type="text" class="form-control" value="{{ crew.role }}"/></td>
+                                            <td><input name="end_{{crew.pk}}" type="datetime-local" class="form-control" value="{{ crew.end|date:'Y-m-d' }}T{{ crew.end|date:'H:i:s' }}"/></td>
+                                            <td><button type="button" class="btn btn-danger btn-sm mt-1" data-id='{{crew.pk}}' data-action='delete' data-target='#crewmember'><span class="fas fa-times"></span></button></td>
+                                        </tr>
+                                        {% endfor %}
+                                    </tbody>
+                                </table>
+                            </div>
+                        </div>
+                        <div class="card-footer">
+                            <div class="text-right">
+                                <button type="button" class="btn btn-secondary" data-action='add' data-target='#crewmemberst' data-clone='#crew_new'><span class="fas fa-plus"></span> Add Crewmember</button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            {% if event.riskassessment.event_size == 0 %}
+            <div class="row my-3" id="size-0">
+                <div class="col-12">
+                    <div class="card border-success">
+                        <div class="card-header">Electrical Checks <small>for ‘Small’ TEC Events <6kVA (approx. 26A)</small></div>
+                        <div class="card-body">
+                            {% include 'partials/checklist_checkbox.html' with formitem=form.rcds %}
+                            {% include 'partials/checklist_checkbox.html' with formitem=form.supply_test %}
+                            {% include 'partials/checklist_checkbox.html' with formitem=form.earthing %}
+                            {% include 'partials/checklist_checkbox.html' with formitem=form.pat %}
+                        </div>
+                    </div>
+                </div>
+            </div>
+            {% else %}
+            <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 %}
+                            {% include 'partials/checklist_checkbox.html' with formitem=form.pat %}
+                            <hr>
+                            <p>Tests at first distro</p>
+                            <div class="table-responsive">
+                                <table class="table table-bordered table-sm">
+                                    <thead>
+                                        <tr>
+                                            <th scope="col" class="text-center">Test</th>
+                                            <th scope="col" colspan="3" class="text-center">Value</th>
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        <tr>
+                                            <th scope="row" rowspan="2">Voltage<br><small>(cube meter)</small></th>
+                                            <th class="text-center">{{ form.fd_voltage_l1.help_text }}</th>
+                                            <th class="text-center">{{ form.fd_voltage_l2.help_text }}</th>
+                                            <th class="text-center">{{ form.fd_voltage_l3.help_text }}</th>
+                                        </tr>
+                                        <tr>
+                                           <td>{% render_field form.fd_voltage_l1 class+="form-control" style="min-width: 5rem;" %}</td>
+                                           <td>{% render_field form.fd_voltage_l2 class+="form-control" style="min-width: 5rem;" %}</td>
+                                           <td>{% render_field form.fd_voltage_l3 class+="form-control" style="min-width: 5rem;" %}</td>
+                                        </tr>
+                                        <tr>
+                                            <th scope="row">{{form.fd_phase_rotation.help_text|safe}}</th>
+                                            <td colspan="3">{% include 'partials/checklist_checkbox.html' with formitem=form.fd_phase_rotation %}</td>
+                                        </tr>
+                                        <tr>
+                                            <th scope="row">{{form.fd_earth_fault.help_text|safe}}</th>
+                                            <td colspan="3">{% render_field form.fd_earth_fault class+="form-control" %}</td>
+                                        </tr>
+                                        <tr>
+                                            <th scope="row">{{form.fd_pssc.help_text|safe}}</th>
+                                            <td colspan="3">{% render_field form.fd_pssc class+="form-control" %}</td>
+                                        </tr>
+                                    </tbody>
+                                </table>
+                            </div>
+                            <hr>
+                            <p>Tests at 'Worst Case' points (at least 1 point required)</p>
+                            <div class="table-responsive">
+                                <table class="table table-bordered">
+                                    <thead>
+                                        <tr>
+                                            <th scope="col" class="text-center">Test</th>
+                                            <th scope="col" class="text-center">Point 1</th>
+                                            <th scope="col" class="text-center">Point 2</th>
+                                            <th scope="col" class="text-center">Point 3</th>
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        <tr>
+                                            <th scope="row">{{form.w1_description.help_text|safe}}</th>
+                                            <td>{% render_field form.w1_description class+="form-control" style="min-width: 5rem;" %}</td>
+                                            <td>{% render_field form.w2_description class+="form-control" style="min-width: 5rem;" %}</td>
+                                            <td>{% render_field form.w3_description class+="form-control" style="min-width: 5rem;" %}</td>
+                                        </tr>
+                                        <tr>
+                                            <th scope="row">{{form.w1_polarity.help_text|safe}}</th>
+                                            <td>{% render_field form.w1_polarity %}</td>
+                                            <td>{% render_field form.w2_polarity %}</td>
+                                            <td>{% render_field form.w3_polarity %}</td>
+                                        </tr>
+                                        <tr>
+                                            <th scope="row">{{form.w1_voltage.help_text|safe}}</th>
+                                            <td>{% render_field form.w1_voltage class+="form-control" %}</td>
+                                            <td>{% render_field form.w2_voltage class+="form-control" %}</td>
+                                            <td>{% render_field form.w3_voltage class+="form-control" %}</td>
+                                        </tr>
+                                        <tr>
+                                            <th scope="row">{{form.w1_earth_fault.help_text|safe}}</th>
+                                            <td>{% render_field form.w1_earth_fault class+="form-control" %}</td>
+                                            <td>{% render_field form.w2_earth_fault class+="form-control" %}</td>
+                                            <td>{% render_field form.w3_earth_fault class+="form-control" %}</td>
+                                        </tr>
+                                    </tbody>
+                                </table>
+                            </div>
+                            <hr/>
+                            {% include 'partials/checklist_checkbox.html' with formitem=form.all_rcds_tested %}
+                            {% include 'partials/checklist_checkbox.html' with formitem=form.public_sockets_tested %}
+                            {% include 'partials/ec_power_info.html' %}
+                        </div>
+                    </div>
+                </div>
+            </div>
+            {% endif %}
             <div class="row mt-3">
                 <div class="col-sm-12 text-right">
                     {% button 'submit' %}

RIGS/templates/hs/eventcheckin_form.html

@@ -1,56 +0,0 @@
-{% extends request.is_ajax|yesno:'base_ajax.html,base_rigs.html' %}
-{% load widget_tweaks %}
-{% load static %}
-{% load help_text from filters %}
-{% load profile_by_index from filters %}
-{% load button from filters %}
-
-{% block css %}
-    {{ block.super }}
-    <link rel="stylesheet" href="{% static 'css/selects.css' %}"/>
-{% endblock %}
-
-{% block preload_js %}
-    {{ block.super }}
-    <script src="{% static 'js/selects.js' %}"></script>
-{% endblock %}
-
-{% block js %}
-    {{ block.super }}
-    <script src="{% static 'js/autocompleter.js' %}"></script>
-    <script src="{% static 'js/tooltip.js' %}"></script>
-{% endblock %}
-
-{% block content %}
-    <div class="col-12">
-        {% include 'form_errors.html' %}
-        <form role="form" method="POST" action="{% url 'event_checkin' pk=event.pk %}">
-            <input type="hidden" name="{{ form.event.name }}" id="{{ form.event.id_for_label }}"
-               value="{{event.pk}}"/>
-            <input type="hidden" name="{{ form.person.name }}" id="{{ form.person.id_for_label }}"
-               value="{{request.user.pk}}"/>
-            {% csrf_token %}
-            <div class="form-group">
-                <label for="{{ form.time.id_for_label }}"
-                       class="col-sm-4 col-form-label">{{ form.time.label }}</label>
-                <div class="col-sm-8">
-                    {% render_field form.time class+="form-control" %}
-                </div>
-            </div>
-            <div class="form-group">
-                <label for="{{ form.vehicle.id_for_label }}" class="col-sm-4 col-form-label">Did you drive? If so, what did you drive?</label>
-                <br><button type="button" class="btn btn-primary" onclick="document.getElementById('id_vehicle').value='Virgil'"><span class="fas fa-truck-moving"></span> Virgil</button>
-                <button type="button" class="btn btn-secondary" onclick="document.getElementById('id_vehicle').value='Virgil + Erms'"><span class="fas fa-trailer"></span><span class="fas fa-truck-moving"></span> Virgil + Erms</button>
-                <br>Other (enter text)
-                <div class="col-sm-8">
-                    {% render_field form.vehicle class+="form-control" %}
-                </div>
-            </div>
-            <div class="row mt-3">
-                <div class="col-sm-12 text-right">
-                    {% button 'submit' %}
-                </div>
-            </div>
-        </form>
-    </div>
-{% endblock %}

RIGS/templates/hs/hs_list.html

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

RIGS/templates/hs/hs_object_list.html

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

RIGS/templates/hs/power_detail.html

@@ -1,175 +0,0 @@
-{% extends request.is_ajax|yesno:"base_ajax.html,base_rigs.html" %}
-{% load help_text from filters %}
-{% load profile_by_index from filters %}
-{% load yesnoi from filters %}
-{% load button from filters %}
-
-{% block content %}
-<div class="row">
-    <div class="col-12 text-right my-3">
-        {% button 'edit' url='pt_edit' pk=object.pk %}
-        {% button 'view' url='event_detail' pk=object.event.pk text="Event" %}
-        {% include 'partials/review_status.html' with perm=perms.RIGS.review_power review='pt_review' %}
-    </div>
-</div>
-<div class="card mb-3">
-    <div class="card-header">{% include 'partials/event_size.html' with object=object.event.riskassessment %}</div>
-    <div class="card-body">
-        <dl class="row">
-                <dt class="col-6">{{ object|help_text:'power_mic' }}</dt>
-                <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>
-                <dt class="col-6">Venue</dt>
-                <dd class="col-6">
-                    {% if object.venue %}
-                    <a href="{% url 'venue_detail' object.venue.pk %}" class="modal-href">
-                        {{ object.venue }}
-                    </a>
-                    {% endif %}
-                </dd>
-                <dt class="col-6">Notes</dt>
-                <dd class="col-6">
-                    {{ object.notes }}
-                </dd>
-        </dl>
-        {% if object.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 %}
-        <dl class="row">
-            <dt class="col-10">{{ object|help_text:'source_rcd'|safe }}</dt>
-            <dd class="col-2">
-                {{ object.source_rcd|yesnoi }}
-            </dd>
-            <dt class="col-10">{{ object|help_text:'labelling'|safe }}</dt>
-            <dd class="col-2">
-                {{ object.labelling|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>
-        <hr>
-        <p>Tests at first distro</p>
-        <table class="table table-bordered">
-            <thead>
-                <tr>
-                    <th scope="col" class="text-center">Test</th>
-                    <th scope="col" colspan="3" class="text-center">Value</th>
-                </tr>
-            </thead>
-            <tbody>
-                <tr>
-                    <th scope="row" rowspan="2">Voltage<br><small>(cube meter)</small></th>
-                    <th>{{ object|help_text:'fd_voltage_l1' }}</th>
-                    <th>{{ object|help_text:'fd_voltage_l2' }}</th>
-                    <th>{{ object|help_text:'fd_voltage_l3' }}</th>
-                </tr>
-                <tr>
-                   <td>{{ object.fd_voltage_l1 }}</td>
-                   <td>{{ object.fd_voltage_l2 }}</td>
-                   <td>{{ object.fd_voltage_l3 }}</td>
-                </tr>
-                <tr>
-                    <th scope="row">{{ object|help_text:'fd_phase_rotation'|safe }}</th>
-                    <td colspan="3">{{ object.fd_phase_rotation|yesnoi }}</td>
-                </tr>
-                <tr>
-                    <th scope="row">{{ object|help_text:'fd_earth_fault'|safe}}</th>
-                    <td colspan="3">{{ object.fd_earth_fault }}</td>
-                </tr>
-                <tr>
-                    <th scope="row">{{ object|help_text:'fd_pssc'}}</th>
-                    <td colspan="3">{{ object.fd_pssc }}</td>
-                </tr>
-            </tbody>
-        </table>
-        <hr>
-        <p>Tests at 'Worst Case' points (at least 1 point required)</p>
-        <table class="table table-bordered">
-            <thead>
-                <tr>
-                    <th scope="col" class="text-center">Test</th>
-                    <th scope="col" class="text-center">Point 1</th>
-                    <th scope="col" class="text-center">Point 2</th>
-                    <th scope="col" class="text-center">Point 3</th>
-                </tr>
-            </thead>
-            <tbody>
-                <tr>
-                    <th scope="row">{{ object|help_text:'w1_description'|safe}}</th>
-                    <td>{{ object.w1_description }}</td>
-                    <td>{{ object.w2_description|default:'' }}</td>
-                    <td>{{ object.w3_description|default:'' }}</td>
-                </tr>
-                <tr>
-                    <th scope="row">{{ object|help_text:'w1_polarity'|safe}}</th>
-                    <td>{{ object.w1_polarity|yesnoi }}</td>
-                    <td>{{ object.w2_polarity|default:''|yesnoi }}</td>
-                    <td>{{ object.w3_polarity|default:''|yesnoi }}</td>
-                </tr>
-                <tr>
-                    <th scope="row">{{ object|help_text:'w1_voltage'|safe}}</th>
-                    <td>{{ object.w1_voltage }}</td>
-                    <td>{{ object.w2_voltage|default:'' }}</td>
-                    <td>{{ object.w3_voltage|default:'' }}</td>
-                </tr>
-                <tr>
-                    <th scope="row">{{ object|help_text:'w1_earth_fault'|safe}}</th>
-                    <td>{{ object.w1_earth_fault }}</td>
-                    <td>{{ object.w2_earth_fault|default:'' }}</td>
-                    <td>{{ object.w3_earth_fault|default:'' }}</td>
-                </tr>
-            </tbody>
-        </table>
-        <hr>
-        <dl class="row">
-            <dt class="col-10">{{ object|help_text:'all_rcds_tested'|safe }}</dt>
-            <dd class="col-2">
-                {{ object.all_rcds_tested|yesnoi }}
-            </dd>
-            <dt class="col-10">{{ object|help_text:'public_sockets_tested'|safe }}</dt>
-            <dd class="col-2">
-                {{ object.public_sockets_tested|yesnoi }}
-            </dd>
-        </dl>
-        <hr>
-        {% include 'partials/ec_power_info.html' %}
-        {% endif %}
-    </div>
-</div>
-<div class="col-12 text-right">
-{% button 'edit' url='ec_edit' pk=object.pk %}
-{% button 'view' url='event_detail' pk=object.pk text="Event" %}
-{% include 'partials/review_status.html' with perm=perms.RIGS.review_eventchecklist review='ec_review' %}
-</div>
-<div class="col-12 text-right">
-{% include 'partials/last_edited.html' with target="eventchecklist_history" %}
-</div>
-{% endblock %}

RIGS/templates/hs/power_form.html

@@ -1,203 +0,0 @@
-{% extends request.is_ajax|yesno:'base_ajax.html,base_rigs.html' %}
-{% load widget_tweaks %}
-{% load static %}
-{% load help_text from filters %}
-{% load profile_by_index from filters %}
-{% load button from filters %}
-
-{% block css %}
-    {{ block.super }}
-    <link rel="stylesheet" href="{% static 'css/selects.css' %}"/>
-{% endblock %}
-
-{% block preload_js %}
-    {{ block.super }}
-    <script src="{% static 'js/selects.js' %}"></script>
-{% endblock %}
-
-{% block js %}
-    {{ block.super }}
-    <script src="{% static 'js/autocompleter.js' %}"></script>
-    <script src="{% static 'js/tooltip.js' %}"></script>
-{% endblock %}
-
-{% block content %}
-    <div class="col-12">
-        {% include 'form_errors.html' %}
-        {% if edit %}
-        <form role="form" method="POST" action="{% url 'pt_edit' pk=object.pk %}">
-        {% else %}
-        <form role="form" method="POST" action="{% url 'event_pt' pk=event.pk %}">
-        {% endif %}
-            <input type="hidden" name="{{ form.event.name }}" id="{{ form.event.id_for_label }}"
-               value="{{event.pk}}"/>
-            {% csrf_token %}
-            <div class="row">
-                <div class="col-12">
-                    <div class="card">
-                        <div class="card-header">Event Information</div>
-                        <div class="card-body">
-                            <dl class="row">
-                                <dt class="col-4">Event Date</dt>
-                                <dd class="col-8">{{ event.start_date}}{%if event.end_date %}-{{ event.end_date}}{%endif%}</dd>
-                                <dt class="col-4">Event Name</dt>
-                                <dd class="col-8">{{ event.name }}</dd>
-                                <dt class="col-4">Client</dt>
-                                <dd class="col-8">{{ event.person }}</dd>
-                                <dt class="col-4">Event Size</dt>
-                                <dd class="col-8">{% include 'partials/event_size.html' with object=event.riskassessment %}</dd>
-                            </dl>
-                            <hr>
-                            <div class="form-group form-row" id="{{ form.power_mic.id_for_label }}-group">
-                            <label for="{{ form.power_mic.id_for_label }}"
-                                class="col-4 col-form-label">{{ form.power_mic.help_text }}</label>
-                                <select id="{{ form.power_mic.id_for_label }}" name="{{ form.power_mic.name }}" class="form-control selectpicker col-8" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials" required="true">
-                                    {% if power_mic %}
-                                        <option value="{{power_mic.pk}}" selected="selected">{{ power_mic.name }}</option>
-                                    {% elif event.riskassessment.power_mic %}
-                                        <option value="{{event.riskassessment.power_mic.pk}}" selected="selected">{{ event.riskassessment.power_mic.name }}</option>
-                                    {% endif %}
-                                </select>
-                            </div>
-                            <div class="form-group form-row" id="{{ form.venue.id_for_label }}-group">
-                                <label for="{{ form.venue.id_for_label }}"
-                                class="col-4 col-form-label">{{ form.venue.label }}</label>
-                                <select id="{{ form.venue.id_for_label }}" name="{{ form.venue.name }}" class="form-control selectpicker col-8" data-live-search="true" data-sourceurl="{% url 'api_secure' model='venue' %}">
-                                {% if venue %}
-                                    <option value="{{venue.pk}}" selected="selected">{{ venue.name }}</option>
-                                {% elif event.venue %}
-                                    <option value="{{event.venue.pk}}" selected="selected">{{ event.venue.name }}</option>
-                                {% endif %}
-                                </select>
-                            </div>
-                            <label for="{{ form.notes.id_for_label }}">Notes</label>
-                            {% render_field form.notes class+="form-control" %}
-                       </div>
-                    </div>
-                </div>
-            </div>
-            {% if event.riskassessment.event_size == 0 %}
-            <div class="row my-3" id="size-0">
-                <div class="col-12">
-                    <div class="card border-success">
-                        <div class="card-header">Electrical Checks <small>for ‘Small’ TEC Events <6kVA (approx. 26A)</small></div>
-                        <div class="card-body">
-                            {% include 'partials/checklist_checkbox.html' with formitem=form.rcds %}
-                            {% include 'partials/checklist_checkbox.html' with formitem=form.supply_test %}
-                            {% include 'partials/checklist_checkbox.html' with formitem=form.earthing %}
-                            {% include 'partials/checklist_checkbox.html' with formitem=form.pat %}
-                        </div>
-                    </div>
-                </div>
-            </div>
-            {% else %}
-            <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 %}
-                            {% include 'partials/checklist_checkbox.html' with formitem=form.pat %}
-                            <hr>
-                            <p>Tests at first distro</p>
-                            <div class="table-responsive">
-                                <table class="table table-bordered table-sm">
-                                    <thead>
-                                        <tr>
-                                            <th scope="col" class="text-center">Test</th>
-                                            <th scope="col" colspan="3" class="text-center">Value</th>
-                                        </tr>
-                                    </thead>
-                                    <tbody>
-                                        <tr>
-                                            <th scope="row" rowspan="2">Voltage<br><small>(cube meter)</small></th>
-                                            <th class="text-center">{{ form.fd_voltage_l1.help_text }}</th>
-                                            <th class="text-center">{{ form.fd_voltage_l2.help_text }}</th>
-                                            <th class="text-center">{{ form.fd_voltage_l3.help_text }}</th>
-                                        </tr>
-                                        <tr>
-                                           <td>{% render_field form.fd_voltage_l1 class+="form-control" style="min-width: 5rem;" %}</td>
-                                           <td>{% render_field form.fd_voltage_l2 class+="form-control" style="min-width: 5rem;" %}</td>
-                                           <td>{% render_field form.fd_voltage_l3 class+="form-control" style="min-width: 5rem;" %}</td>
-                                        </tr>
-                                        <tr>
-                                            <th scope="row">{{form.fd_phase_rotation.help_text|safe}}</th>
-                                            <td colspan="3">{% include 'partials/checklist_checkbox.html' with formitem=form.fd_phase_rotation %}</td>
-                                        </tr>
-                                        <tr>
-                                            <th scope="row">{{form.fd_earth_fault.help_text|safe}}</th>
-                                            <td colspan="3">{% render_field form.fd_earth_fault class+="form-control" %}</td>
-                                        </tr>
-                                        <tr>
-                                            <th scope="row">{{form.fd_pssc.help_text|safe}}</th>
-                                            <td colspan="3">{% render_field form.fd_pssc class+="form-control" %}</td>
-                                        </tr>
-                                    </tbody>
-                                </table>
-                            </div>
-                            <hr>
-                            <p>Tests at 'Worst Case' points (at least 1 point required)</p>
-                            <div class="table-responsive">
-                                <table class="table table-bordered">
-                                    <thead>
-                                        <tr>
-                                            <th scope="col" class="text-center">Test</th>
-                                            <th scope="col" class="text-center">Point 1</th>
-                                            <th scope="col" class="text-center">Point 2</th>
-                                            <th scope="col" class="text-center">Point 3</th>
-                                        </tr>
-                                    </thead>
-                                    <tbody>
-                                        <tr>
-                                            <th scope="row">{{form.w1_description.help_text|safe}}</th>
-                                            <td>{% render_field form.w1_description class+="form-control" style="min-width: 5rem;" %}</td>
-                                            <td>{% render_field form.w2_description class+="form-control" style="min-width: 5rem;" %}</td>
-                                            <td>{% render_field form.w3_description class+="form-control" style="min-width: 5rem;" %}</td>
-                                        </tr>
-                                        <tr>
-                                            <th scope="row">{{form.w1_polarity.help_text|safe}}</th>
-                                            <td>{% render_field form.w1_polarity %}</td>
-                                            <td>{% render_field form.w2_polarity %}</td>
-                                            <td>{% render_field form.w3_polarity %}</td>
-                                        </tr>
-                                        <tr>
-                                            <th scope="row">{{form.w1_voltage.help_text|safe}}</th>
-                                            <td>{% render_field form.w1_voltage class+="form-control" %}</td>
-                                            <td>{% render_field form.w2_voltage class+="form-control" %}</td>
-                                            <td>{% render_field form.w3_voltage class+="form-control" %}</td>
-                                        </tr>
-                                        <tr>
-                                            <th scope="row">{{form.w1_earth_fault.help_text|safe}}</th>
-                                            <td>{% render_field form.w1_earth_fault class+="form-control" %}</td>
-                                            <td>{% render_field form.w2_earth_fault class+="form-control" %}</td>
-                                            <td>{% render_field form.w3_earth_fault class+="form-control" %}</td>
-                                        </tr>
-                                    </tbody>
-                                </table>
-                            </div>
-                            <hr/>
-                            {% include 'partials/checklist_checkbox.html' with formitem=form.all_rcds_tested %}
-                            {% include 'partials/checklist_checkbox.html' with formitem=form.public_sockets_tested %}
-                            {% include 'partials/ec_power_info.html' %}
-                        </div>
-                    </div>
-                </div>
-            </div>
-            {% endif %}
-            <div class="row mt-3">
-                <div class="col-sm-12 text-right">
-                    {% button 'submit' %}
-                </div>
-            </div>
-        </form>
-    </div>
-{% endblock %}

RIGS/templates/partials/ec_power_info.html

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

RIGS/templates/partials/event_detail_buttons.html

@@ -49,6 +49,5 @@
         {% endif %}
 
         <a href="https://docs.google.com/forms/d/e/1FAIpQLSf-TBOuJZCTYc2L8DWdAaC3_Werq0ulsUs8-6G85I6pA9WVsg/viewform" class="btn btn-danger"><span class="fas fa-file-invoice-dollar"></span> <span class="d-none d-sm-inline">Subhire Insurance Form</span></a>
-        <a href="{% url 'event_checkin' event.pk %}" class="btn btn-success"><span class="fas fa-user-clock"></span> <span class="d-none d-sm-inline">Check In</span></a>
     {% endif %}
 </div>

RIGS/templates/partials/hs_details.html

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

RIGS/templatetags/filters.py

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

RIGS/urls.py

@@ -75,34 +75,26 @@ urlpatterns = [
 
     path('event/<int:pk>/ra/', permission_required_with_403('RIGS.add_riskassessment')(views.EventRiskAssessmentCreate.as_view()),
          name='event_ra'),
-    path('event/ra/<int:pk>/', login_required(views.EventRiskAssessmentDetail.as_view()),
+    path('event/ra/<int:pk>/', permission_required_with_403('RIGS.view_riskassessment')(views.EventRiskAssessmentDetail.as_view()),
          name='ra_detail'),
     path('event/ra/<int:pk>/edit/', permission_required_with_403('RIGS.change_riskassessment')(views.EventRiskAssessmentEdit.as_view()),
          name='ra_edit'),
-    path('event/ra/<int:pk>/review/', permission_required_with_403('RIGS.review_riskassessment')(views.MarkReviewed.as_view()),
-         name='ra_review', kwargs={'model': 'RiskAssessment'}),
+    path('event/ra/list', permission_required_with_403('RIGS.view_riskassessment')(views.EventRiskAssessmentList.as_view()),
+         name='ra_list'),
+    path('event/ra/<int:pk>/review/', permission_required_with_403('RIGS.review_riskassessment')(views.EventRiskAssessmentReview.as_view()),
+         name='ra_review'),
     path('event/ra/<int:pk>/print/', permission_required_with_403('RIGS.view_riskassessment')(views.RAPrint.as_view()), name='ra_print'),
 
     path('event/<int:pk>/checklist/', permission_required_with_403('RIGS.add_eventchecklist')(views.EventChecklistCreate.as_view()),
          name='event_ec'),
-    path('event/checklist/<int:pk>/', login_required(views.EventChecklistDetail.as_view()),
+    path('event/checklist/<int:pk>/', permission_required_with_403('RIGS.view_eventchecklist')(views.EventChecklistDetail.as_view()),
          name='ec_detail'),
     path('event/checklist/<int:pk>/edit/', permission_required_with_403('RIGS.change_eventchecklist')(views.EventChecklistEdit.as_view()),
          name='ec_edit'),
-    path('event/checklist/<int:pk>/review/', permission_required_with_403('RIGS.review_eventchecklist')(views.MarkReviewed.as_view()),
-         name='ec_review', kwargs={'model': 'EventChecklist'}),
-
-    path('event/<int:pk>/power/', permission_required_with_403('RIGS.add_powertestrecord')(views.PowerTestCreate.as_view()),
-         name='event_pt'),
-    path('event/power/<int:pk>/', login_required(views.PowerTestDetail.as_view()),
-         name='pt_detail'),
-    path('event/power/<int:pk>/edit/', permission_required_with_403('RIGS.change_powertestrecord')(views.PowerTestEdit.as_view()),
-         name='pt_edit'),
-    path('event/power/<int:pk>/review/', permission_required_with_403('RIGS.review_power')(views.MarkReviewed.as_view()),
-         name='pt_review', kwargs={'model': 'PowerTestRecord'}),
-
-    path('event/<int:pk>/checkin/', permission_required_with_403('RIGS.add_eventcheckin')(views.EventCheckIn.as_view()),
-         name='event_checkin'),
+    path('event/checklist/list', permission_required_with_403('RIGS.view_eventchecklist')(views.EventChecklistList.as_view()),
+         name='ec_list'),
+    path('event/checklist/<int:pk>/review/', permission_required_with_403('RIGS.review_eventchecklist')(views.EventChecklistReview.as_view()),
+         name='ec_review'),
 
     # Finance
     path('invoice/', permission_required_with_403('RIGS.view_invoice')(views.InvoiceIndex.as_view()),

RIGS/views/hs.py

@@ -1,4 +1,3 @@
-from django.apps import apps
 from django.contrib import messages
 from django.http import HttpResponseRedirect
 from django.urls import reverse_lazy
@@ -11,35 +10,7 @@ from RIGS.views.rigboard import get_related
 from PyRIGS.views import PrintView
 
 
-class HSCreateView(generic.CreateView):
-    def get_form(self, **kwargs):
-        form = super().get_form(**kwargs)
-        epk = self.kwargs.get('pk')
-        event = models.Event.objects.get(pk=epk)
-        form.instance.event = event
-        return form
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        epk = self.kwargs.get('pk')
-        event = models.Event.objects.get(pk=epk)
-        context['event'] = event
-        context['page_title'] = f'Create {self} for Event {event.display_id}'
-        return context
-
-
-class MarkReviewed(generic.View):
-    def get(self, *args, **kwargs):
-        obj = apps.get_model('RIGS', kwargs.get('model')).objects.get(pk=kwargs.get('pk'))
-        with reversion.create_revision():
-            reversion.set_user(self.request.user)
-            obj.reviewed_by = self.request.user
-            obj.reviewed_at = timezone.now()
-            obj.save()
-        return HttpResponseRedirect(reverse_lazy('hs_list'))
-
-
-class EventRiskAssessmentCreate(HSCreateView):
+class EventRiskAssessmentCreate(generic.CreateView):
     model = models.RiskAssessment
     template_name = 'hs/risk_assessment_form.html'
     form_class = forms.EventRiskAssessmentForm
@@ -56,6 +27,22 @@ class EventRiskAssessmentCreate(HSCreateView):
 
         return super(EventRiskAssessmentCreate, self).get(self)
 
+    def get_form(self, **kwargs):
+        form = super(EventRiskAssessmentCreate, self).get_form(**kwargs)
+        epk = self.kwargs.get('pk')
+        event = models.Event.objects.get(pk=epk)
+        form.instance.event = event
+        return form
+
+    def get_context_data(self, **kwargs):
+        context = super(EventRiskAssessmentCreate, self).get_context_data(**kwargs)
+        epk = self.kwargs.get('pk')
+        event = models.Event.objects.get(pk=epk)
+        context['event'] = event
+        context['page_title'] = f'Create Risk Assessment for Event {event.display_id}'
+        get_related(context['form'], context)
+        return context
+
     def get_success_url(self):
         return reverse_lazy('ra_detail', kwargs={'pk': self.object.pk})
 
@@ -93,6 +80,36 @@ class EventRiskAssessmentDetail(generic.DetailView):
         return context
 
 
+class EventRiskAssessmentList(generic.ListView):
+    paginate_by = 20
+    model = models.RiskAssessment
+    template_name = 'hs/hs_object_list.html'
+
+    def get_queryset(self):
+        return self.model.objects.exclude(event__status=models.Event.CANCELLED).order_by('reviewed_at').select_related('event')
+
+    def get_context_data(self, **kwargs):
+        context = super(EventRiskAssessmentList, self).get_context_data(**kwargs)
+        context['title'] = 'Risk Assessment'
+        context['view'] = 'ra_detail'
+        context['edit'] = 'ra_edit'
+        context['review'] = 'ra_review'
+        context['perm'] = 'perms.RIGS.review_riskassessment'
+        return context
+
+
+class EventRiskAssessmentReview(generic.View):
+    def get(self, *args, **kwargs):
+        rpk = kwargs.get('pk')
+        ra = models.RiskAssessment.objects.get(pk=rpk)
+        with reversion.create_revision():
+            reversion.set_user(self.request.user)
+            ra.reviewed_by = self.request.user
+            ra.reviewed_at = timezone.now()
+            ra.save()
+        return HttpResponseRedirect(reverse_lazy('ra_list'))
+
+
 class EventChecklistDetail(generic.DetailView):
     model = models.EventChecklist
     template_name = 'hs/event_checklist_detail.html'
@@ -126,7 +143,7 @@ class EventChecklistEdit(generic.UpdateView):
         return context
 
 
-class EventChecklistCreate(HSCreateView):
+class EventChecklistCreate(generic.CreateView):
     model = models.EventChecklist
     template_name = 'hs/event_checklist_form.html'
     form_class = forms.EventChecklistForm
@@ -145,63 +162,53 @@ class EventChecklistCreate(HSCreateView):
 
         return super(EventChecklistCreate, self).get(self)
 
-    def get_success_url(self):
-        return reverse_lazy('ec_detail', kwargs={'pk': self.object.pk})
-
-
-class PowerTestDetail(generic.DetailView):
-    model = models.PowerTestRecord
-    template_name = 'hs/power_detail.html'
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        context['page_title'] = f"Power Test Record for Event <a href='{self.object.event.get_absolute_url()}'>{self.object.event.display_id} {self.object.event.name}</a>"
-        return context
-
-
-class PowerTestEdit(generic.UpdateView):
-    model = models.PowerTestRecord
-    template_name = 'hs/power_form.html'
-    form_class = forms.PowerTestRecordForm
-
-    def get_success_url(self):
-        ec = self.get_object()
-        ec.reviewed_by = None
-        ec.reviewed_at = None
-        ec.save()
-        return reverse_lazy('ec_detail', kwargs={'pk': self.object.pk})
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        pk = self.kwargs.get('pk')
-        ec = models.PowerTestRecord.objects.get(pk=pk)
-        context['event'] = ec.event
-        context['edit'] = True
-        context['page_title'] = f'Edit Power Test Record for Event {ec.event.display_id}'
-        # get_related(context['form'], context)
-        return context
-
-
-class PowerTestCreate(HSCreateView):
-    model = models.PowerTestRecord
-    template_name = 'hs/power_form.html'
-    form_class = forms.PowerTestRecordForm
-
-    def get(self, *args, **kwargs):
-        epk = kwargs.get('pk')
+    def get_form(self, **kwargs):
+        form = super(EventChecklistCreate, self).get_form(**kwargs)
+        epk = self.kwargs.get('pk')
         event = models.Event.objects.get(pk=epk)
+        form.instance.event = event
+        return form
 
-        # Check if RA exists
-        ra = models.RiskAssessment.objects.filter(event=event).first()
-
-        if ra is None:
-            messages.error(self.request, f'A Risk Assessment must exist prior to creating any Power Test Records for {event}! Please create one now.')
-            return HttpResponseRedirect(reverse_lazy('event_ra', kwargs={'pk': epk}))
-
-        return super().get(self)
+    def get_context_data(self, **kwargs):
+        context = super(EventChecklistCreate, self).get_context_data(**kwargs)
+        epk = self.kwargs.get('pk')
+        event = models.Event.objects.get(pk=epk)
+        context['event'] = event
+        context['page_title'] = f'Create Event Checklist for Event {event.display_id}'
+        return context
 
     def get_success_url(self):
-        return reverse_lazy('pt_detail', kwargs={'pk': self.object.pk})
+        return reverse_lazy('ec_detail', kwargs={'pk': self.object.pk})
+
+
+class EventChecklistList(generic.ListView):
+    paginate_by = 20
+    model = models.EventChecklist
+    template_name = 'hs/hs_object_list.html'
+
+    def get_queryset(self):
+        return self.model.objects.exclude(event__status=models.Event.CANCELLED).order_by('reviewed_at').select_related('event')
+
+    def get_context_data(self, **kwargs):
+        context = super(EventChecklistList, self).get_context_data(**kwargs)
+        context['title'] = 'Event Checklist'
+        context['view'] = 'ec_detail'
+        context['edit'] = 'ec_edit'
+        context['review'] = 'ec_review'
+        context['perm'] = 'perms.RIGS.review_eventchecklist'
+        return context
+
+
+class EventChecklistReview(generic.View):
+    def get(self, *args, **kwargs):
+        rpk = kwargs.get('pk')
+        ec = models.EventChecklist.objects.get(pk=rpk)
+        with reversion.create_revision():
+            reversion.set_user(self.request.user)
+            ec.reviewed_by = self.request.user
+            ec.reviewed_at = timezone.now()
+            ec.save()
+        return HttpResponseRedirect(reverse_lazy('ec_list'))
 
 
 class HSList(generic.ListView):
@@ -226,16 +233,3 @@ class RAPrint(PrintView):
         context = super().get_context_data(**kwargs)
         context['filename'] = f"EventSpecificRiskAssessment_for_{context['object'].event.display_id}.pdf"
         return context
-
-
-class EventCheckIn(generic.CreateView):
-    model = models.EventCheckIn
-    template_name = 'hs/eventcheckin_form.html'
-    form_class = forms.EventCheckInForm
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        context['event'] = models.Event.objects.get(pk=self.kwargs.get('pk'))
-        context['page_title'] = f'Check In to Event {context["event"].display_id}'
-        # get_related(context['form'], context)
-        return context

RIGS/views/rigboard.py

@@ -342,12 +342,12 @@ class EventAuthorisationRequest(generic.FormView, generic.detail.SingleObjectMix
 
         msg = EmailMultiAlternatives(
             f"{self.object.display_id} | {self.object.name} - Event Authorisation Request",
-            get_template("email/eventauthorisation_client_request.txt").render(context),
+            get_template("eventauthorisation_client_request.txt").render(context),
             to=[email],
             reply_to=[self.request.user.email],
         )
         css = finders.find('css/email.css')
-        html = premailer.Premailer(get_template("email/eventauthorisation_client_request.html").render(context),
+        html = premailer.Premailer(get_template("eventauthorisation_client_request.html").render(context),
                                    external_styles=css).transform()
         msg.attach_alternative(html, 'text/html')
 
@@ -357,7 +357,7 @@ class EventAuthorisationRequest(generic.FormView, generic.detail.SingleObjectMix
 
 
 class EventAuthoriseRequestEmailPreview(generic.DetailView):
-    template_name = "email/eventauthorisation_client_request.html"
+    template_name = "eventauthorisation_client_request.html"
     model = models.Event
 
     def render_to_response(self, context, **response_kwargs):

assets/forms.py

@@ -3,7 +3,6 @@ from django.db.models import Q
 
 from assets import models
 
-
 class AssetForm(forms.ModelForm):
     related_models = {
         'asset': models.Asset,

assets/management/commands/generateSampleAssetsData.py

@@ -105,7 +105,8 @@ class Command(BaseCommand):
 
         for i in range(100):
             prefix = random.choice(asset_prefixes)
-            asset_id = get_available_asset_id(wanted_prefix=prefix)
+            asset_id = str(get_available_asset_id(wanted_prefix=prefix))
+            asset_id = prefix + asset_id
             asset = models.Asset(
                 asset_id=asset_id,
                 description=random.choice(asset_description),

assets/migrations/0025_rename_salvage_value_asset_replacement_cost.py

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

assets/migrations/0026_auto_20220526_1623.py

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

assets/migrations/0027_asset_nickname.py

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

assets/models.py

@@ -95,20 +95,14 @@ class AssetManager(models.Manager):
     def search(self, query=None):
         qs = self.get_queryset()
         if query is not None:
-            or_lookup = (Q(asset_id__exact=query.upper()) | Q(description__icontains=query) | Q(serial_number__exact=query) | Q(nickname__icontains=query))
+            or_lookup = (Q(asset_id__exact=query.upper()) | Q(description__icontains=query) | Q(serial_number__exact=query))
             qs = qs.filter(or_lookup).distinct()  # distinct() is often necessary with Q lookups
         return qs
 
 
 def get_available_asset_id(wanted_prefix=""):
     last_asset = Asset.objects.filter(asset_id_prefix=wanted_prefix).last()
-    last_asset_id = last_asset.asset_id_number if last_asset else 0
-    return wanted_prefix + str(last_asset_id + 1)
-
-
-def validate_positive(value):
-    if value < 0:
-        raise ValidationError("A price cannot be negative")
+    return 9000 if last_asset is None else wanted_prefix + str(last_asset.asset_id_number + 1)
 
 
 @reversion.register
@@ -123,10 +117,9 @@ class Asset(models.Model, RevisionMixin):
     purchased_from = models.ForeignKey(to=Supplier, on_delete=models.SET_NULL, blank=True, null=True, related_name="assets")
     date_acquired = models.DateField()
     date_sold = models.DateField(blank=True, null=True)
-    purchase_price = models.DecimalField(blank=True, null=True, decimal_places=2, max_digits=10, validators=[validate_positive])
-    replacement_cost = models.DecimalField(null=True, decimal_places=2, max_digits=10, validators=[validate_positive])
+    purchase_price = models.DecimalField(blank=True, null=True, decimal_places=2, max_digits=10)
+    salvage_value = models.DecimalField(null=True, decimal_places=2, max_digits=10)
     comments = models.TextField(blank=True)
-    nickname = models.CharField(max_length=120, blank=True)
 
     # Audit
     last_audited_at = models.DateTimeField(blank=True, null=True)
@@ -172,6 +165,12 @@ class Asset(models.Model, RevisionMixin):
             errdict["asset_id"] = [
                 "An Asset ID can only consist of letters and numbers, with a final number"]
 
+        if self.purchase_price and self.purchase_price < 0:
+            errdict["purchase_price"] = ["A price cannot be negative"]
+
+        if self.salvage_value and self.salvage_value < 0:
+            errdict["salvage_value"] = ["A price cannot be negative"]
+
         if self.is_cable:
             if not self.length or self.length <= 0:
                 errdict["length"] = ["The length of a cable must be more than 0"]

assets/templates/asset_audit.html

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

assets/templates/cable_test_form.html

@@ -0,0 +1,28 @@
+{% extends 'base_assets.html' %}
+{% load widget_tweaks %}
+{% load button from filters %}
+{% load cache %}
+
+{% block content %}
+    {% if create %}
+        <form method="POST" action="{% url 'cable_test'%}">
+    {% elif edit %}
+        <form method="POST" action="{% url 'cable_test' object.id %}">
+    {% endif %}
+{% include 'form_errors.html' %}
+{% csrf_token %}
+<input type="hidden" name="id" value="{{ object.id|default:0 }}" hidden="">
+<div class="row">
+    <div class="col-sm-12">
+        {% for field in form %}
+            <div class="form-group">
+                {% include 'partials/form_field.html' with field=field %}
+            </div>
+        {% endfor %}
+        <div class="text-right">
+            {% button 'submit' %}
+        </div>
+    </div>
+</div>
+</form>
+{% endblock %}

assets/templates/partials/asset_detail_form.html

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

assets/templates/partials/form_field.html

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

assets/templates/partials/purchasedetails_form.html

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

assets/testing.py

@@ -0,0 +1,42 @@
+from django.db import models
+
+from . import models as am
+
+
+class Test(models.Model):
+    item = models.ForeignKey(to=am.Asset, on_delete=models.CASCADE)
+    date = models.DateField()
+    tested_by = models.ForeignKey(to='RIGS.Profile', on_delete=models.CASCADE)
+
+
+class ElectricalTest(Test):
+    visual = models.BooleanField()
+    remarks = models.TextField()
+
+
+class CableTest(ElectricalTest):
+    # Should contain X circuit tests, where X is determined by circuits as per cable type
+    pass
+
+
+class CircuitTest(models.Model):
+    test = models.ForeignKey(to=CableTest, on_delete=models.CASCADE)
+    continuity = models.DecimalField(help_text='Ω')
+    insulation_resistance = models.DecimalField(help_text='MΩ')
+
+
+class TestRequirement(models.Model):
+    item = models.ForeignKey(to=am.Asset, on_delete=models.CASCADE)
+    test_type = models.ForeignKey(to=Test, on_delete=models.CASCADE)
+    period = models.IntegerField() # X months
+
+
+class CableTestForm(forms.ModelForm):
+    class Meta
+        model = CableTest
+
+
+class CircuitTest(forms.ModelForm):
+    class Meta:
+        model = Choice
+        exclude = ('test',)

assets/tests/conftest.py

@@ -28,13 +28,13 @@ def cable_type(db):
 
 @pytest.fixture
 def test_cable(db, category, status, cable_type):
-    cable = models.Asset.objects.create(asset_id="9666", description="125A -> Jack", comments="The cable from Hell...", status=status, category=category, date_acquired=datetime.date(2006, 6, 6), is_cable=True, cable_type=cable_type, length=10, csa="1.5", replacement_cost=50)
+    cable = models.Asset.objects.create(asset_id="9666", description="125A -> Jack", comments="The cable from Hell...", status=status, category=category, date_acquired=datetime.date(2006, 6, 6), is_cable=True, cable_type=cable_type, length=10, csa="1.5", salvage_value=50)
     yield cable
     cable.delete()
 
 
 @pytest.fixture
 def test_asset(db, category, status):
-    asset, created = models.Asset.objects.get_or_create(asset_id="91991", description="Spaceflower", status=status, category=category, date_acquired=datetime.date(1991, 12, 26), replacement_cost=100)
+    asset, created = models.Asset.objects.get_or_create(asset_id="91991", description="Spaceflower", status=status, category=category, date_acquired=datetime.date(1991, 12, 26), salvage_value=100)
     yield asset
     asset.delete()

assets/tests/pages.py

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

assets/tests/test_interaction.py

@@ -102,7 +102,7 @@ def test_cable_create(logged_in_browser, admin_user, live_server, test_asset, ca
     page.status = status.name
     page.serial_number = "MELON-MELON-MELON"
     page.comments = "You might need that"
-    page.replacement_cost = "666"
+    page.salvage_value = "666"
     page.is_cable = True
 
     assert logged_in_browser.driver.find_element(By.ID, 'cable-table').is_displayed()
@@ -179,7 +179,7 @@ class TestAssetForm(AutoLoginTest):
         self.page.comments = comments = "This is actually a sledgehammer, not a cable..."
 
         self.page.purchase_price = "12.99"
-        self.page.replacement_cost = "99.12"
+        self.page.salvage_value = "99.12"
         self.page.date_acquired = acquired = datetime.date(2020, 5, 2)
         self.page.purchased_from_selector.toggle()
         self.assertTrue(self.page.purchased_from_selector.is_open)
@@ -320,14 +320,14 @@ class TestAssetAudit(AutoLoginTest):
         self.connector = models.Connector.objects.create(description="Trailer Socket", current_rating=1,
                                                          voltage_rating=40, num_pins=13)
         models.Asset.objects.create(asset_id="1", description="Trailer Cable", status=self.status,
-                                    category=self.category, date_acquired=datetime.date(2020, 2, 1), replacement_cost=10)
+                                    category=self.category, date_acquired=datetime.date(2020, 2, 1), salvage_value=10)
         models.Asset.objects.create(asset_id="11", description="Trailerboard", status=self.status,
-                                    category=self.category, date_acquired=datetime.date(2020, 2, 1), replacement_cost=10)
+                                    category=self.category, date_acquired=datetime.date(2020, 2, 1), salvage_value=10)
         models.Asset.objects.create(asset_id="111", description="Erms", status=self.status, category=self.category,
-                                    date_acquired=datetime.date(2020, 2, 1), replacement_cost=10)
+                                    date_acquired=datetime.date(2020, 2, 1), salvage_value=10)
         self.asset = models.Asset.objects.create(asset_id="1111", description="A hammer", status=self.status,
                                                  category=self.category,
-                                                 date_acquired=datetime.date(2020, 2, 1), replacement_cost=10)
+                                                 date_acquired=datetime.date(2020, 2, 1), salvage_value=10)
         self.page = pages.AssetAuditList(self.driver, self.live_server_url).open()
         self.wait = WebDriverWait(self.driver, 20)
 

assets/tests/test_unit.py

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

assets/urls.py

@@ -43,4 +43,6 @@ urlpatterns = [
          (views.SupplierCreate.as_view()), name='supplier_create'),
     path('supplier/<int:pk>/edit/', permission_required_with_403('assets.change_supplier')
          (views.SupplierUpdate.as_view()), name='supplier_update'),
+
+    path('testing/<int:pk>/cable_test/' views.AddCableTest.as_view(), name='cable_test'),
 ]

assets/views.py

@@ -24,7 +24,7 @@ from z3c.rml import rml2pdf
 
 from PyRIGS.views import GenericListView, GenericDetailView, GenericUpdateView, GenericCreateView, ModalURLMixin, \
     is_ajax, OEmbedView
-from assets import forms, models
+from assets import forms, models, testing
 
 
 class AssetList(LoginRequiredMixin, generic.ListView):
@@ -168,7 +168,7 @@ class DuplicateMixin:
 class AssetDuplicate(DuplicateMixin, AssetIDUrlMixin, AssetCreate):
     def get_initial(self, *args, **kwargs):
         initial = super().get_initial(*args, **kwargs)
-        initial["asset_id"] = models.get_available_asset_id()
+        initial["asset_id"] = models.get_available_asset_id(wanted_prefix=self.get_object().asset_id_prefix)
         return initial
 
     def get_context_data(self, **kwargs):
@@ -430,3 +430,8 @@ class GenerateLabels(generic.View):
         response['Content-Disposition'] = f'filename="{name}"'
         response.write(merged.getvalue())
         return response
+
+
+class AddCableTest(generic.CreateView):
+    model = testing.CableTest
+    template = 'cable_test_form.html'

conftest.py

@@ -28,7 +28,6 @@ def admin_user(admin_user):
     admin_user.last_name = "Test"
     admin_user.initials = "ETU"
     admin_user.is_approved = True
-    admin_user.is_supervisor = True
     admin_user.save()
     return admin_user
 

package.json

@@ -27,14 +27,14 @@
     "html5sortable": "^0.13.3",
     "jquery": "^3.6.0",
     "konami": "^1.6.3",
-    "moment": "^2.29.4",
-    "node-sass": "^7.0.3",
+    "moment": "^2.29.2",
+    "node-sass": "^7.0.0",
     "popper.js": "^1.16.1",
     "postcss": "^8.4.5",
     "uglify-js": "^3.14.5"
   },
   "devDependencies": {
-    "browser-sync": "^2.27.11"
+    "browser-sync": "^2.27.7"
   },
   "scripts": {
     "gulp": "gulp",

pipeline/source_assets/js/autocompleter.js

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

templates/form_errors.html

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

templates/partials/button.html

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

templates/registration/loginform.html

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

training/decorators.py

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

training/management/commands/generateSampleTrainingData.py

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

training/migrations/0006_rename_description_trainingitem_name.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.2.18 on 2023-02-19 14:02
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('training', '0005_auto_20220223_1535'),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name='trainingitem',
-            old_name='description',
-            new_name='name',
-        ),
-    ]

training/migrations/0007_trainingitem_description.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.2.18 on 2023-02-19 14:02
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('training', '0006_rename_description_trainingitem_name'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='trainingitem',
-            name='description',
-            field=models.TextField(blank=True),
-        ),
-    ]

training/models.py

@@ -85,7 +85,7 @@ class TrainingItemManager(QueryablePropertiesManager):
     def search(self, query=None):
         qs = self.get_queryset()
         if query is not None:
-            or_lookup = (Q(name__icontains=query) | Q(description__icontains=query) | Q(display_id=query))
+            or_lookup = (Q(description__icontains=query) | Q(display_id=query))
             qs = qs.filter(or_lookup).distinct()  # distinct() is often necessary with Q lookups
         return qs
 
@@ -94,13 +94,16 @@ class TrainingItemManager(QueryablePropertiesManager):
 class TrainingItem(models.Model):
     reference_number = models.IntegerField()
     category = models.ForeignKey('TrainingCategory', related_name='items', on_delete=models.CASCADE)
-    name = models.CharField(max_length=50)
-    description = models.TextField(blank=True)
+    description = models.CharField(max_length=50)
     active = models.BooleanField(default=True)
     prerequisites = models.ManyToManyField('self', symmetrical=False, blank=True)
 
     objects = TrainingItemManager()
 
+    @property
+    def name(self):
+        return str(self)
+
     @queryable_property
     def display_id(self):
         return f"{self.category.reference_number}.{self.reference_number}"
@@ -118,7 +121,7 @@ class TrainingItem(models.Model):
         return models.Q()
 
     def __str__(self):
-        name = f"{self.display_id} {self.name}"
+        name = f"{self.display_id} {self.description}"
         if not self.active:
             name += " (inactive)"
         return name
@@ -146,7 +149,7 @@ class TrainingItemQualificationManager(QueryablePropertiesManager):
     def search(self, query=None):
         qs = self.get_queryset().select_related('item', 'supervisor', 'item__category')
         if query is not None:
-            or_lookup = (Q(item__name__icontains=query) | Q(supervisor__first_name__icontains=query) | Q(supervisor__last_name__icontains=query) | Q(item__category__name__icontains=query) | Q(item__display_id=query))
+            or_lookup = (Q(item__description__icontains=query) | Q(supervisor__first_name__icontains=query) | Q(supervisor__last_name__icontains=query) | Q(item__category__name__icontains=query) | Q(item__display_id=query))
 
             try:
                 or_lookup = Q(item__category__reference_number=int(query)) | or_lookup
@@ -198,7 +201,7 @@ class TrainingItemQualification(models.Model, RevisionMixin):
 
     @property
     def activity_feed_string(self):
-        return f"{self.trainee} {self.get_depth_display().lower()} in {self.item}"
+        return f"{self.trainee} {self.get_depth_display().lower()} {self.get_depth_display()} in {self.item}"
 
     @classmethod
     def get_colour_from_depth(cls, depth):

training/templates/base_training.html

@@ -30,7 +30,7 @@
         <a class="dropdown-item" href="{% url 'item_list' %}"><span class="fas fa-sitemap"></span> Item List</a>
       </div>
     </li>
-    {% if request.user.is_supervisor %}
+    {% if perms.training.add_trainingitemqualification or request.user.is_supervisor %}
     <li class="nav-item"><a class="nav-link" href="{% url 'session_log' %}"><span class="fas fa-users"></span> Log Session</a></li>
     {% endif %}
     <li class="nav-item"><a class="nav-link" href="{% url 'training_activity_table' %}"><span class="fas fa-random"></span> Recent Changes</a></li>

training/templates/edit_training_record.html

@@ -43,7 +43,7 @@
             {% render_field form.date|add_class:'form-control'|attr:'type="date"' value=training_date %}
             {% endwith %}
         </div>
-        {% button 'today' id='id_date' %}
+        <button class="btn btn-info col-sm-2" onclick="var date = new Date(); $('#id_date').val([date.getFullYear(), ('0' + (date.getMonth()+1)).slice(-2), ('0' + date.getDate()).slice(-2)].join('-'))" tabindex="-1" type="button">Today</button>
     </div>
     <div class="form-group form-row">
         <label for="id_notes" class="col-sm-2 col-form-label">Notes</label>

training/templates/item_list.html

@@ -1,11 +1,6 @@
 {% extends 'base_training.html' %}
 
-{% load button from filters %}
-
 {% block content %}
-<div class="col-12 text-right py-2 pr-0">
-{% button 'print' 'item_list_export' %}
-</div>
 <div id="accordion">
   {% for category in categories %}
   <div class="card">
@@ -18,11 +13,10 @@
       <div class="card-body">
         <div class="list-group list-group-flush">
             {% for item in category.items.all %}
-                <li class="list-group-item {% if not item.active%}text-warning{%endif%}">{{ item }} <a href="{% url 'item_qualification' item.pk %}" class="btn btn-info float-right"><span class="fas fa-user"></span> Qualified Users</a>
-                <br><small>{{ item.description }}</small>
+                <li class="list-group-item {% if not item.active%}text-warning{%endif%}">{{ item }}
                 {% if item.prerequisites.exists %}
                     <div class="ml-3 font-italic">
-                    <p class="text-info mb-0">Competency Assessment Prerequisites:</p>
+                    <p class="text-info mb-0">Passed Out Prerequisites:</p>
                     <ul>
                     {% for p in item.prerequisites.all %}
                     <li>{{p}}</li>
@@ -30,6 +24,7 @@
                     </ul>
                     </div>
                 {% endif %}
+                <a href="{% url 'item_qualification' item.pk %}" class="btn btn-info"><span class="fas fa-user"></span> Qualified Users</a>
                 </li>
             {% endfor %}
         </div>

training/templates/item_list.xml

@@ -1,25 +0,0 @@
-{% extends 'base_print.xml' %}
-
-{% block content %}
-<h1 style="page-head">TEC Training Item List</h1>
-<spacer length="15" />
-{% for category in categories %}
-<h2 {% if not forloop.first %}style="breakbefore"{%else%}style="emheader"{%endif%}>{{category}}</h2>
-<spacer length="10" />
-    {% for item in category.items.all %}
-        <h3>{{ item }}</h3>
-        <spacer length="4" />
-        <para>{{ item.description }}</para>
-        {% if item.prerequisites.exists %}
-            <h4>Competency Assessment Prerequisites:</h4>
-            <ul bulletFontSize="5">
-            {% for p in item.prerequisites.all %}
-            <li><para>{{p}}</para></li>
-            {% endfor %}
-            </ul>
-        {% endif %}
-        <spacer length="8" />
-    {% endfor %}
-{% endfor %}
-<namedString id="lastPage"><pageNumber/></namedString>
-{% endblock %}

training/templates/level_detail.html

@@ -44,7 +44,7 @@
 {% endblock %}
 
 {% block content %}
-{% if request.user.is_supervisor %}
+{% if request.user.is_supervisor or perms.training.add_traininglevelrequirement %}
 <div class="col-sm-12 text-right pr-0">
 <a type="button" class="btn btn-success mb-3" href="{% url 'add_requirement' pk=object.pk %}" id="requirement_button">
 	<span class="fas fa-plus"></span> Add New Requirement
@@ -79,9 +79,9 @@
             {% endfor %}
             <tr><th colspan="3" class="text-center">{{object}}</th></tr>
             <tr>
-              <td><ul class="list-unstyled">{% for req in object.started_requirements %}<li>{{ req.item }} {% user_has_qualification u req.item 0 %} {% if request.user.is_supervisor %}<a type="button" class="btn btn-link tn-sm p-0 align-baseline" href="{% url 'remove_requirement' pk=req.pk %}"><span class="fas fa-trash-alt text-danger"></span></a>{%endif%}</li>{% endfor %}</ul></td>
-              <td><ul class="list-unstyled">{% for req in object.complete_requirements %}<li>{{ req.item }} {% user_has_qualification u req.item 1 %} {% if request.user.is_supervisor %}<a type="button" class="btn btn-link tn-sm p-0 align-baseline" href="{% url 'remove_requirement' pk=req.pk %}"><span class="fas fa-trash-alt text-danger"></span></a>{%endif%}</li>{% endfor %}</ul></td>
-              <td><ul class="list-unstyled">{% for req in object.passed_out_requirements %}<li>{{ req.item }} {% user_has_qualification u req.item 2 %} {% if request.user.is_supervisor %}<a type="button" class="btn btn-link tn-sm p-0 align-baseline"" href="{% url 'remove_requirement' pk=req.pk %}" title="Delete requirement"><span class="fas fa-trash-alt text-danger"></span></a>{%endif%}</li>{% endfor %}</ul></td>
+              <td><ul class="list-unstyled">{% for req in object.started_requirements %}<li>{{ req.item }} {% user_has_qualification u req.item 0 %} {% if request.user.is_supervisor or perms.training.delete_traininglevelrequirement %}<a type="button" class="btn btn-link tn-sm p-0 align-baseline" href="{% url 'remove_requirement' pk=req.pk %}"><span class="fas fa-trash-alt text-danger"></span></a>{%endif%}</li>{% endfor %}</ul></td>
+              <td><ul class="list-unstyled">{% for req in object.complete_requirements %}<li>{{ req.item }} {% user_has_qualification u req.item 1 %} {% if request.user.is_supervisor or perms.training.delete_traininglevelrequirement %}<a type="button" class="btn btn-link tn-sm p-0 align-baseline" href="{% url 'remove_requirement' pk=req.pk %}"><span class="fas fa-trash-alt text-danger"></span></a>{%endif%}</li>{% endfor %}</ul></td>
+              <td><ul class="list-unstyled">{% for req in object.passed_out_requirements %}<li>{{ req.item }} {% user_has_qualification u req.item 2 %} {% if request.user.is_supervisor or perms.training.delete_traininglevelrequirement %}<a type="button" class="btn btn-link tn-sm p-0 align-baseline"" href="{% url 'remove_requirement' pk=req.pk %}" title="Delete requirement"><span class="fas fa-trash-alt text-danger"></span></a>{%endif%}</li>{% endfor %}</ul></td>
             </tr>
           </tbody>
         </table>

training/templates/partials/add_qualification.html

@@ -1,4 +1,4 @@
-{% if request.user.is_supervisor %}
+{% if request.user.is_supervisor or perms.training.add_trainingitemqualification %}
 <a type="button" class="btn btn-success" href="{% url 'add_qualification' object.pk %}" id="add_record">
     <span class="fas fa-plus"></span> Add New Training Record
 </a>

training/templates/partials/supervisor_field.html

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

training/templates/session_log_form.html

@@ -28,26 +28,25 @@
             {% include 'form_errors.html' %}
             {% csrf_token %}
             <h3>People</h3>
-            <div class="form-group row" id="supervisor_group">
+            <div class="form-group row">
               {% include 'partials/supervisor_field.html' %}
             </div>
-            <div class="form-group row" id="trainees_group">
+            <div class="form-group row">
               <label for="trainees_id" class="col-sm-2">Select Attendees</label>
-              <select multiple name="trainees" id="trainees_id" class="selectpicker col-sm-10" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials" data-noclear="true">
+              <select multiple name="trainees" id="trainees_id" class="selectpicker col-sm-10" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials">
               </select>
             </div>
             <h3>Training Items</h3>
             {% for depth in depths %}
-            <div class="form-group row" id="{{depth.0}}">
+            <div class="form-group row">
               <label for="selectpicker" class="col-sm-2 text-{% colour_from_depth depth.0 %} py-1">{{ depth.1 }} Items</label>
-              <select multiple name="items_{{depth.0}}" id="items_{{depth.0}}_id" class="selectpicker col-sm-10 px-0" data-live-search="true" data-sourceurl="{% url 'api_secure' model='training_item' %}?fields=display_id,description&filters=active" data-noclear="true">
+              <select multiple name="items_{{depth.0}}" id="items_{{depth.0}}_id" class="selectpicker col-sm-10 px-0" data-live-search="true" data-sourceurl="{% url 'api_secure' model='training_item' %}?fields=display_id,description&filters=active">
               </select>
             </div>
             {% endfor %}
             <h3>Session Information</h3>
-            <div class="form-group row">
-                {% include 'partials/form_field.html' with field=form.date col='col-sm-6' %}
-                {% button 'today' id='id_date' %}
+            <div class="form-group">
+                {% include 'partials/form_field.html' with field=form.date %}
             </div>
             <div class="form-group">
               {% include 'partials/form_field.html' with field=form.notes %}

training/templates/trainee_item_list.html

@@ -54,7 +54,7 @@
                         <th>Date</th>
                         <th>Supervisor</th>
                         <th>Notes</th>
-                        {% if request.user.is_supervisor %}
+                        {% if request.user.is_supervisor or perms.training.change_trainingitemqualification %}
                         <th></th>
                         {% endif %}
                     </tr>
@@ -67,7 +67,7 @@
                         <td>{{ object.date }}</td>
                         <td><a href="{{ object.supervisor.get_absolute_url}}">{{ object.supervisor }}</a></td>
                         <td>{{ object.notes }}</td>
-                        {% if request.user.is_supervisor %}
+                        {% if request.user.is_supervisor or perms.training.change_trainingitemqualification %}
                         <td>{% button 'edit' 'edit_qualification' object.pk id="edit" %}</td>
                         {% endif %}
                     </tr>

training/tests/conftest.py

@@ -30,15 +30,6 @@ def training_item(db):
     training_item.delete()
 
 
-@pytest.fixture
-def training_item_2(db):
-    training_category = models.TrainingCategory.objects.create(reference_number=2, name="Sound")
-    training_item = models.TrainingItem.objects.create(category=training_category, reference_number=1, description="Fundamentals of Audio")
-    yield training_item
-    training_category.delete()
-    training_item.delete()
-
-
 @pytest.fixture
 def level(db):
     level = models.TrainingLevel.objects.create(description="There is no description.", level=models.TrainingLevel.TECHNICIAN)

training/tests/pages.py

@@ -40,42 +40,3 @@ class AddQualification(FormPage):
     @property
     def success(self):
         return 'add' not in self.driver.current_url
-
-
-class SessionLog(FormPage):
-    URL_TEMPLATE = 'training/session_log'
-
-    _supervisor_selector = (By.CSS_SELECTOR, 'div#supervisor_group>div.bootstrap-select')
-    _trainees_selector = (By.CSS_SELECTOR, 'div#trainees_group>div.bootstrap-select')
-    _training_started_selector = (By.XPATH, '//div[1]/div/div/form/div[4]/div')
-    _training_complete_selector = (By.XPATH, '//div[1]/div/div/form/div[4]/div')
-    _competency_assessed_selector = (By.XPATH, '//div[1]/div/div/form/div[5]/div')
-
-    form_items = {
-        'date': (regions.DatePicker, (By.ID, 'id_date')),
-        'notes': (regions.TextBox, (By.ID, 'id_notes')),
-    }
-
-    @property
-    def supervisor_selector(self):
-        return regions.BootstrapSelectElement(self, self.find_element(*self._supervisor_selector))
-
-    @property
-    def trainees_selector(self):
-        return regions.BootstrapSelectElement(self, self.find_element(*self._trainees_selector))
-
-    @property
-    def training_started_selector(self):
-        return regions.BootstrapSelectElement(self, self.find_element(*self._training_started_selector))
-
-    @property
-    def training_complete_selector(self):
-        return regions.BootstrapSelectElement(self, self.find_element(*self._training_complete_selector))
-
-    @property
-    def competency_assessed_selector(self):
-        return regions.BootstrapSelectElement(self, self.find_element(*self._competency_assessed_selector))
-
-    @property
-    def success(self):
-        return 'log' not in self.driver.current_url

training/tests/test_interaction.py

@@ -12,15 +12,6 @@ from training import models
 from training.tests import pages
 
 
-def select_super(page, supervisor):
-    page.supervisor_selector.toggle()
-    assert page.supervisor_selector.is_open
-    page.supervisor_selector.search(supervisor.name[:-6])
-    time.sleep(2)  # Slow down for javascript
-    assert page.supervisor_selector.options[0].selected
-    page.supervisor_selector.toggle()
-
-
 def test_add_qualification(logged_in_browser, live_server, trainee, supervisor, training_item):
     page = pages.AddQualification(logged_in_browser.driver, live_server.url, pk=trainee.pk).open()
     # assert page.name in str(trainee)
@@ -39,7 +30,12 @@ def test_add_qualification(logged_in_browser, live_server, trainee, supervisor,
     assert page.item_selector.options[0].selected
     page.item_selector.toggle()
 
-    select_super(page, supervisor)
+    page.supervisor_selector.toggle()
+    assert page.supervisor_selector.is_open
+    page.supervisor_selector.search(supervisor.name[:-6])
+    time.sleep(2)  # Slow down for javascript
+    assert page.supervisor_selector.options[0].selected
+    page.supervisor_selector.toggle()
 
     page.submit()
     assert page.success
@@ -48,32 +44,3 @@ def test_add_qualification(logged_in_browser, live_server, trainee, supervisor,
     assert qualification.date == date
     assert qualification.notes == "A note"
     assert qualification.depth == models.TrainingItemQualification.STARTED
-
-
-def test_session_log(logged_in_browser, live_server, trainee, supervisor, training_item, training_item_2):
-    page = pages.SessionLog(logged_in_browser.driver, live_server.url).open()
-
-    page.date = date = datetime.date(2001, 1, 10)
-    page.notes = note = "A general note"
-
-    time.sleep(2)  # Slow down for javascript
-
-    select_super(page, supervisor)
-
-    page.trainees_selector.toggle()
-    assert page.trainees_selector.is_open
-    page.trainees_selector.search(trainee.first_name)
-    time.sleep(2)  # Slow down for javascript
-    page.trainees_selector.set_option(trainee.name, True)
-    # assert page.trainees_selector.options[0].selected
-    page.trainees_selector.toggle()
-
-    page.training_started_selector.toggle()
-    assert page.training_started_selector.is_open
-    page.training_started_selector.search(training_item.description[:-2])
-    time.sleep(2)  # Slow down for javascript
-    # assert page.training_started_selector.options[0].selected
-    page.training_started_selector.toggle()
-
-    page.submit()
-    assert page.success

training/tests/test_unit.py

@@ -16,7 +16,7 @@ def test_add_qualification(admin_client, trainee, admin_user, training_item):
     response = admin_client.post(url, {'date': date, 'trainee': trainee.pk, 'supervisor': trainee.pk, 'item': training_item.pk})
     assertFormError(response, 'form', 'date', 'Qualification date may not be in the future')
     assertFormError(response, 'form', 'supervisor', 'One may not supervise oneself...')
-    response = admin_client.post(url, {'date': date, 'trainee': admin_user.pk, 'supervisor': trainee.pk, 'item': training_item.pk})
+    response = admin_client.post(url, {'date': date, 'trainee': trainee.pk, 'supervisor': admin_user.pk, 'item': training_item.pk})
     print(response.content)
     assertFormError(response, 'form', 'supervisor', 'Selected supervisor must actually *be* a supervisor...')
 

training/urls.py

@@ -1,33 +1,33 @@
 from django.urls import path
 
 from django.contrib.auth.decorators import login_required
-from training.decorators import is_supervisor
+from training.decorators import has_perm_or_supervisor
 
 from training import views, models
 from versioning.views import VersionHistory
 
 urlpatterns = [
     path('items/', login_required(views.ItemList.as_view()), name='item_list'),
-    path('items/export/', login_required(views.ItemListExport.as_view()), name='item_list_export'),
     path('item/<int:pk>/qualified_users/', login_required(views.ItemQualifications.as_view()), name='item_qualification'),
 
     path('trainee/list/', login_required(views.TraineeList.as_view()), name='trainee_list'),
-    path('trainee/<int:pk>/', login_required(views.TraineeDetail.as_view()),
+    path('trainee/<int:pk>/',
+         has_perm_or_supervisor('RIGS.view_profile')(views.TraineeDetail.as_view()),
          name='trainee_detail'),
-    path('trainee/<int:pk>/history', login_required(VersionHistory.as_view()), name='trainee_history', kwargs={'model': models.Trainee, 'app': 'training'}),  # Not picked up automatically because proxy model (I think)
-    path('trainee/<int:pk>/add_qualification/', is_supervisor()(views.AddQualification.as_view()),
+    path('trainee/<int:pk>/history', has_perm_or_supervisor('RIGS.view_profile')(VersionHistory.as_view()), name='trainee_history', kwargs={'model': models.Trainee, 'app': 'training'}),  # Not picked up automatically because proxy model (I think)
+    path('trainee/<int:pk>/add_qualification/', has_perm_or_supervisor('training.add_trainingitemqualification')(views.AddQualification.as_view()),
          name='add_qualification'),
-    path('trainee/edit_qualification/<int:pk>/', is_supervisor()(views.EditQualification.as_view()),
+    path('trainee/edit_qualification/<int:pk>/', has_perm_or_supervisor('training.change_trainingitemqualification')(views.EditQualification.as_view()),
          name='edit_qualification'),
 
     path('levels/', login_required(views.LevelList.as_view()), name='level_list'),
     path('level/<int:pk>/', login_required(views.LevelDetail.as_view()), name='level_detail'),
     path('level/<int:pk>/user/<int:u>/', login_required(views.LevelDetail.as_view()), name='level_detail'),
-    path('level/<int:pk>/add_requirement/', is_supervisor()(views.AddLevelRequirement.as_view()), name='add_requirement'),
-    path('level/remove_requirement/<int:pk>/', is_supervisor()(views.RemoveRequirement.as_view()), name='remove_requirement'),
+    path('level/<int:pk>/add_requirement/', login_required(views.AddLevelRequirement.as_view()), name='add_requirement'),
+    path('level/remove_requirement/<int:pk>/', login_required(views.RemoveRequirement.as_view()), name='remove_requirement'),
 
-    path('trainee/<int:pk>/level/<int:level_pk>/confirm', is_supervisor()(views.ConfirmLevel.as_view()), name='confirm_level'),
+    path('trainee/<int:pk>/level/<int:level_pk>/confirm', login_required(views.ConfirmLevel.as_view()), name='confirm_level'),
     path('trainee/<int:pk>/item_record', login_required(views.TraineeItemDetail.as_view()), name='trainee_item_detail'),
 
-    path('session_log', is_supervisor()(views.SessionLog.as_view()), name='session_log'),
+    path('session_log', has_perm_or_supervisor('training.add_trainingitemqualification')(views.SessionLog.as_view()), name='session_log'),
 ]

training/views.py

@@ -7,7 +7,7 @@ from django.db import transaction
 from django.db.models import Q, Count
 from django.db.utils import IntegrityError
 
-from PyRIGS.views import is_ajax, ModalURLMixin, get_related, PrintListView
+from PyRIGS.views import is_ajax, ModalURLMixin, get_related
 from training import models, forms
 from users import views
 from reversion.views import RevisionMixin
@@ -24,20 +24,6 @@ class ItemList(generic.ListView):
         return context
 
 
-class ItemListExport(PrintListView):
-    model = models.TrainingItem
-    template_name = 'item_list.xml'
-
-    def get_queryset(self):
-        return self.model.objects.filter(active=True)
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        context['filename'] = "TrainingItemList.pdf"
-        context["categories"] = models.TrainingCategory.objects.all()
-        return context
-
-
 class TraineeDetail(views.ProfileDetail):
     template_name = "trainee_detail.html"
     model = models.Trainee

users/management/commands/usercleanup.py

@@ -1,26 +0,0 @@
-from datetime import datetime, timedelta
-from django.core.management.base import BaseCommand, CommandError
-from django.utils import timezone
-
-from RIGS.models import Profile
-from training.models import TrainingLevel
-
-
-# This is triggered nightly by Heroku Scheduler
-class Command(BaseCommand):
-    help = 'Performs perodic user maintenance tasks'
-
-    def handle(self, *args, **options):
-        for person in Profile.objects.all():
-            # Inactivate users that have not logged in for a year (or have never logged in)
-            if person.last_login is None or (timezone.now() - person.last_login).days > 365:
-                person.is_active = False
-                person.is_approved = False
-                person.save()
-            # Ensure everyone with a supervisor level has the flag correctly set in the database
-            if person.level_qualifications.exclude(confirmed_on=None).select_related('level') \
-                    .filter(level__level__gte=TrainingLevel.SUPERVISOR) \
-                    .exclude(level__department=TrainingLevel.HAULAGE) \
-                    .exclude(level__department__isnull=True).exists():
-                person.is_supervisor = True
-                person.save()

versioning/versioning.py

@@ -183,7 +183,7 @@ class ModelComparison:
     def name(self):
         obj = self.new if self.new else self.old
 
-        if (hasattr(obj, 'activity_feed_string')):
+        if(hasattr(obj, 'activity_feed_string')):
             return obj.activity_feed_string
         else:
             return str(obj)