Add missing endif

VSCode auto-format and DTL do not play nicely

.github/workflows/django.yml

@@ -15,10 +15,13 @@ jobs:
       PYTHONDONTWRITEBYTECODE: 1
     steps:
       - uses: actions/checkout@v4
+      - name: Install build dependencies
+        run: |
+          sudo apt-get install libcairo2-dev
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-            python-version: 3.9
+            python-version: "3.10"
             cache: 'pipenv'
       - name: Install Dependencies
         run: |

Pipfile

@@ -47,7 +47,7 @@ python-dateutil = "~=2.8.1"
 pytoml = "~=0.1.21"
 pytz = "~=2020.5"
 reportlab = "*"
-requests = "~=2.32.0"
+requests = "~=2.32.3"
 retrying = "~=1.3.3"
 simplejson = "~=3.17.2"
 six = "~=1.15.0"

PyRIGS/settings.py

@@ -224,6 +224,8 @@ USE_L10N = True
 
 USE_TZ = True
 
+USE_THOUSAND_SEPARATOR = False
+
 # Need to allow seconds as datetime-local input type spits out a time that has seconds
 DATETIME_INPUT_FORMATS = ('%Y-%m-%dT%H:%M', '%Y-%m-%dT%H:%M:%S')
 

RIGS/admin.py

@@ -154,9 +154,9 @@ class AssociateAdmin(VersionAdmin):
 
 @admin.register(models.Profile)
 class ProfileAdmin(UserAdmin, AssociateAdmin):
-    list_display = ('username', 'name', 'is_approved', 'is_superuser', 'is_supervisor', 'number_of_events', 'last_login')
+    list_display = ('username', 'name', 'is_approved', 'is_superuser', 'is_supervisor', 'number_of_events', 'last_login', 'date_joined')
     list_display_links = ['username']
-    list_filter = UserAdmin.list_filter + ('is_approved',)
+    list_filter = UserAdmin.list_filter + ('is_approved', 'date_joined')
     fieldsets = (
         (None, {'fields': ('username', 'password')}),
         (_('Personal info'), {

RIGS/forms.py

@@ -1,10 +1,11 @@
-from datetime import datetime
+from datetime import datetime, timedelta
 
 import simplejson
 from django import forms
 from django.conf import settings
 from django.core import serializers
 from django.utils import timezone
+from django.utils.html import format_html
 from reversion import revisions as reversion
 
 from RIGS import models
@@ -21,6 +22,7 @@ class EventForm(forms.ModelForm):
     datetime_input_formats = list(settings.DATETIME_INPUT_FORMATS)
     meet_at = forms.DateTimeField(input_formats=datetime_input_formats, required=False)
     access_at = forms.DateTimeField(input_formats=datetime_input_formats, required=False)
+    parking_and_access = forms.BooleanField(label="Additional parking or access requirements (i.e. campus parking permits, wristbands)?", required=False)
 
     items_json = forms.CharField()
 
@@ -97,6 +99,9 @@ class EventForm(forms.ModelForm):
             raise forms.ValidationError(
                 'You haven\'t provided any client contact details. Please add a person or organisation.',
                 code='contact')
+        access = self.cleaned_data.get("access_at")
+        if 'warn-access' not in self.data and access is not None and access.date() < (self.cleaned_data.get("start_date") - timedelta(days=7)):
+            raise forms.ValidationError(format_html("Are you sure about that? Your access time seems a bit optimistic. If you're sure, save again. <input type='hidden' id='warn-access' name='warn-access' value='0'/>"), code='access_sanity')
         return super().clean()
 
     def save(self, commit=True):
@@ -121,7 +126,7 @@ class EventForm(forms.ModelForm):
         fields = ['is_rig', 'name', 'venue', 'start_time', 'end_date', 'start_date',
                   'end_time', 'meet_at', 'access_at', 'description', 'notes', 'mic',
                   'person', 'organisation', 'dry_hire', 'checked_in_by', 'status',
-                  'purchase_order', 'collector', 'forum_url']
+                  'purchase_order', 'collector', 'forum_url', 'parking_and_access']
 
 
 class BaseClientEventAuthorisationForm(forms.ModelForm):

RIGS/management/commands/generateSampleRIGSData.py

@@ -254,7 +254,7 @@ class Command(BaseCommand):
                             new_invoice.void = True
                         elif random.randint(0, 2) > 1:  # 1 in 3 have been paid
                             models.Payment.objects.create(invoice=new_invoice, amount=new_invoice.balance,
-                                                          date=datetime.date.today())
+                                                          date=datetime.date.today(), method=random.choice(models.Payment.METHODS)[0])
             if i == 1 or random.randint(0, 5) > 0:  # Event 1 and 1 in 5 have a RA
                 models.RiskAssessment.objects.create(event=new_event, supervisor_consulted=bool(random.getrandbits(1)),
                                                      nonstandard_equipment=bool(random.getrandbits(1)),
@@ -276,6 +276,7 @@ class Command(BaseCommand):
                                                      nonstandard_emergency_procedure=bool(random.getrandbits(1)),
                                                      special_structures=bool(random.getrandbits(1)),
                                                      suspended_structures=bool(random.getrandbits(1)),
+                                                     parking_and_access=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,

RIGS/migrations/0052_event_parking_and_access.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.25 on 2024-11-20 20:17
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('RIGS', '0051_alter_payment_method'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='event',
+            name='parking_and_access',
+            field=models.BooleanField(default=False),
+        ),
+    ]

RIGS/migrations/0053_riskassessment_parking_and_access.py

@@ -0,0 +1,19 @@
+# Generated by Django 3.2.25 on 2024-11-20 21:18
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('RIGS', '0052_event_parking_and_access'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='riskassessment',
+            name='parking_and_access',
+            field=models.BooleanField(default=False, help_text='Are there additional requirements for parking and access to the venue? (i.e. campus parking permits, event access wristbands)'),
+            preserve_default=False,
+        ),
+    ]

RIGS/models.py

@@ -351,6 +351,9 @@ class Event(models.Model, RevisionMixin):
     access_at = models.DateTimeField(blank=True, null=True)
     meet_at = models.DateTimeField(blank=True, null=True)
 
+    # Venue requirements
+    parking_and_access = models.BooleanField(default=False)
+
     # Crew management
     checked_in_by = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='event_checked_in', blank=True, null=True,
                                       on_delete=models.CASCADE)
@@ -779,6 +782,9 @@ class RiskAssessment(ReviewableModel, RevisionMixin):
     persons_responsible_structures = models.TextField(blank=True, default='', help_text="Who are the persons on site responsible for their use?")
     rigging_plan = models.URLField(blank=True, default='', help_text="Upload your rigging plan to the <a href='https://nottinghamtec.sharepoint.com/'>Sharepoint</a> and submit a link", validators=[validate_url])
 
+    # Venue Access
+    parking_and_access = models.BooleanField(help_text="Are there additional requirements for parking and access to the venue? (i.e. campus parking permits, event access wristbands)")
+
     # Blimey that was a lot of options
 
     supervisor_consulted = models.BooleanField(null=True)
@@ -803,6 +809,7 @@ class RiskAssessment(ReviewableModel, RevisionMixin):
         'nonstandard_emergency_procedure': False,
         'special_structures': False,
         'suspended_structures': False,
+        'parking_and_access': False
     }
     inverted_fields = {key: value for (key, value) in expected_values.items() if not value}.keys()
 
@@ -943,6 +950,10 @@ class PowerTestRecord(ReviewableModel, RevisionMixin):
     def activity_feed_string(self):
         return str(self.event)
 
+    @property
+    def name(self):
+        return f"Power Test Record - {self.event}"
+
 
 class EventCheckIn(models.Model):
     event = models.ForeignKey('Event', related_name='crew', on_delete=models.CASCADE)

RIGS/templates/base_print.xml

@@ -22,6 +22,9 @@
         <paraStyle name="center" alignment="center"/>
         <paraStyle name="page-head" alignment="center" fontName="OpenSans-Bold" fontSize="16" leading="18" spaceAfter="0"/>
 
+        {% block extrastyles %}
+        {% endblock %}
+
         <paraStyle name="style.event_description" fontName="OpenSans" textColor="DarkGray" />
         <paraStyle name="style.item_description" fontName="OpenSans" textColor="DarkGray" leftIndent="10" />
         <paraStyle name="style.specific_description" fontName="OpenSans" textColor="DarkGray" fontSize="10" />
@@ -137,6 +140,7 @@
         <nextFrame/>
         {% block content %}
         {% endblock %}
+        <namedString id="lastPage"><pageNumber/></namedString>
     </story>
 
 </document>

RIGS/templates/base_rigs.html

@@ -45,6 +45,7 @@
         Invoices <span class="badge {% if todo == 0 %}badge-success{% else %}badge-danger{% endif %} badge-pill">{{ todo }}</span>
       </a>
       <div class="dropdown-menu" aria-labelledby="navbarDropdownInvoices">
+        <a class="dropdown-item" href="{% url 'invoice_dashboard' %}"><span class="fas fa-chart-line"></span> Dashboard</a>
         {% if perms.RIGS.add_invoice %}
         <a class="dropdown-item text-nowrap" href="{% url 'invoice_waiting' %}"><span class="fas fa-briefcase text-danger"></span> Waiting <span class="badge {% if waiting == 0 %}badge-success{% else %}badge-danger{% endif %} badge-pill">{{ waiting }}</span></a>
         {% endif %}

RIGS/templates/event_detail.html

@@ -1,7 +1,6 @@
 {% extends request.is_ajax|yesno:"base_ajax.html,base_rigs.html" %}
 
 {% load markdown_tags %}
-{% load button from filters %}
 {% load static %}
 
 {% block content %}
@@ -15,8 +14,11 @@
     {% endif %}
     {% if object.is_rig and perms.RIGS.view_event %}
         {# only need contact details for a rig #}
-        <div class="col-md-6">
+        <div class="col-md-6 mb-3">
             {% include 'partials/contact_details.html' %}
+            {% if object.parking_and_access or object.riskassessment.parking_and_access %}
+                {% include 'partials/parking_and_access.html' %}
+            {% endif %}
         </div>
     {% endif %}
     <div class="col-md-6">
@@ -54,43 +56,9 @@
                 </div>
             </div>
         </div>
-        {% if event.can_check_in %}
-        <div class="col-sm-12">
-            <div class="card mt-3">
-                <div class="card-header">Crew Record</div>
-                <div class="table-responsive">
-                    <table class="table table-sm">
-                        <thead>
-                            <tr>
-                                <th scope="col">Name</th>
-                                <th scope="col">Vehicle</th>
-                                <th scope="col">Start Time</th>
-                                <th scope="col">Role</th>
-                                <th scope="col">End Time</th>
-                                <th scope="col">{% if request.user.pk is event.mic.pk %}<a href="{% url 'event_checkin_override' event.pk %}" class="btn btn-sm btn-success"><span class="fas fa-plus"></span> Add</a>{% endif %}</th>
-                            </tr>
-                        </thead>
-                        <tbody id="crewmembers">
-                            {% for crew in object.crew.all %}
-                            <tr>
-                                <td>{{crew.person}}</td>
-                                <td>{{crew.vehicle|default:"None"}}</td>
-                                <td>{{crew.time}}</td>
-                                <td>{{crew.role}}</td>
-                                <td>{% if crew.end_time %}{{crew.end_time}}{% else %}<span class="text-success fas fa-clock" data-toggle="tooltip" title="This person is currently checked into this event"></span>{% endif %}</td>
-                                <td>{% if crew.end_time %}{% if crew.person.pk == request.user.pk or event.mic.pk == request.user.pk %}{% button 'edit' 'edit_checkin' crew.pk clazz='btn-sm modal-href' %}{% endif %}{%endif%}</td>
-                            </tr>
-                            {% empty %}
-                            <tr>
-                                <td colspan="6" class="text-center bg-warning">Apparently this event happened by magic...</td>
-                            </tr>
-                            {% endfor %}
-                        </tbody>
-                    </table>
-                    </div>
-            </div>
-            {% endif %}
-        </div>
+        
+        {% include 'partials/crew_list.html' %}
+
         {% if not request.is_ajax and perms.RIGS.view_event %}
         <div class="col-sm-12 text-right">
             {% include 'partials/event_detail_buttons.html' %}

RIGS/templates/event_form.html

@@ -281,8 +281,15 @@
                                         {{ form.dry_hire.label }} {% render_field form.dry_hire %}
                                     </div>
                                 </div>
+                            <div class="form-group">
+                                <div class="col-sm-offset-4 col-sm-8">
+                                    <label data-toggle="tooltip" title="Do we need to secure campus parking permits, wristbands for backstage access or other non-standard requirements?">
+                                        {{ form.parking_and_access.label }} {% render_field form.parking_and_access %}
+                                    </label>
+                                </div>
                             </div>
                         </div>
+                        </div>
 
                         {# Status is needed on all events types and it looks good here in the form #}
                         <div class="form-group" data-toggle="tooltip" title="The current status of the event. Only mark as booked once paperwork is received">

RIGS/templates/hs/event_checklist_detail.html

@@ -69,8 +69,11 @@
             </div>
         </div>
     </div>
+
+    {% include 'partials/crew_list.html' with event=object.event %}
 </div>
-<div class="col-12 text-right">
+
+<div class="col-12 text-right mt-4">
 {% button 'edit' url='ec_edit' pk=object.pk %}
 {% button 'view' url='event_detail' pk=object.pk text="Event" %}
 <a href="{% url 'event_pt' object.event.pk %}" class="btn btn-info"><span class="fas fa-paperclip"></span> <span

RIGS/templates/hs/power_detail.html

@@ -165,6 +165,7 @@
     </div>
 </div>
 <div class="col-12 text-right">
+{% button 'print' 'pt_print' object.pk %}
 {% 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' %}

RIGS/templates/hs/power_print.xml

@@ -0,0 +1,235 @@
+{% extends 'base_print.xml' %}
+{% load filters %}
+
+{% block extrastyles %}
+<paraStyle name="style.powerReviewed" borderPadding="3" alignment="center" backColor="green" textColor="white"/>
+<paraStyle name="style.powerUnreviewed" borderPadding="3" alignment="center" backColor="red" textColor="white"/>
+<paraStyle name="style.smallText" fontSize="8"/>
+
+<paraStyle leftIndent="2in" rightIndent="2in" name="style.smallEvent" fontSize="10" alignment="center" backColor="green" textColor="white" borderPadding="4" borderColor="black"/>
+<paraStyle leftIndent="2in" rightIndent="2in" name="style.mediumEvent" fontSize="10" alignment="center" backColor="orange" textColor="white" borderPadding="4" borderColor="black"/>
+<paraStyle leftIndent="2in" rightIndent="2in" name="style.largeEvent" fontSize="10" alignment="center" backColor="red" textColor="white" borderPadding="4" borderColor="black"/>
+
+<blockTableStyle id="powerTable">
+    <blockValign value="middle"/>
+    <lineStyle kind="LINEABOVE" colorName="black" thickness="1"/>
+    <lineStyle kind="LINEBELOW" colorName="black" thickness="1"/>
+    <lineStyle kind="LINEAFTER" colorName="black" thickness="1"/>
+    <lineStyle kind="LINEBEFORE" colorName="black" thickness="1"/>
+</blockTableStyle>
+
+<blockTableStyle id="voltageTable">
+    <blockValign value="middle"/>
+</blockTableStyle>
+{% endblock %}
+
+{% block content %}
+<spacer length="15"/>
+<h1>Power Test Record for <strong>{{ object.event }}</strong></h1>
+<spacer length="15"/>
+<h2>Client: {{ object.event.person|default:object.event.organisation }} | Venue: {{ object.event.venue }} | MIC: {{ object.event.mic }}</h2>
+<spacer length="15"/>
+<hr/>
+<spacer length="15"/>
+{% if object.reviewed_by %}
+    <para style="style.powerReviewed"><strong>Reviewed by: {{ object.reviewed_by }} at {{ object.reviewed_at|date:"D d/m/Y" }}</strong></para>
+{% else %}
+    <para style="style.powerUnreviewed"><strong>Power test results not yet reviewed</strong></para>
+{% endif %}
+<spacer length="15"/>
+<hr/>
+<spacer length="15"/>
+
+<h2 fontSize="16">Power Plan Information</h2>
+<spacer length="15"/>
+
+{% if object.event.riskassessment.event_size == 0 %}
+    <para style="style.smallEvent"><strong>Small Event</strong></para>
+{% elif object.event.riskassessment.event_size == 1 %}
+    <para style="style.mediumEvent"><strong>Medium Event</strong></para>
+{% elif object.event.riskassessment.event_size == 2 %}
+    <para style="style.largeEvent"><strong>Large Event</strong></para>
+{% endif %}
+    
+<spacer length="15"/>
+
+<blockTable colWidths="250,250">
+    <tr>
+        <td><para><strong>Power MIC:</strong> {{ object.power_mic }}</para></td>
+        <td><para><strong>Venue:</strong> {{ object.event.venue }}</para></td>
+
+    </tr>
+    <tr>
+        <td><para><strong>Event Date:</strong> {{ object.event.start_date |date:"D d/m/Y" }}</para></td>
+        <td><para><strong>Generators:</strong> {{ object.event.riskassessment.generators|yesno|capfirst }}</para></td>
+    </tr>
+    <tr>
+        <td><para><strong>Power Test taken at:</strong> {{ object.date_created|date:"D d/m/Y H:i" }}</para></td>
+        <td><para><strong>Other Companies Power:</strong> {{ object.event.riskassessment.other_companies_power|yesno|capfirst }}</para></td>
+    </tr>
+</blockTable>
+
+<spacer length="15"/>
+
+{% if object.notes %}
+<hr/>
+<spacer length="15"/>
+<para><strong>Additional Notes:</strong></para>
+<spacer length="15"/>
+<para>{{ object.notes }}</para>
+<spacer length="15"/>
+{% endif %}
+
+<hr/>
+<spacer length="15"/>
+
+{% comment %}
+0 - Small event
+1 - Medium event (extra power records)
+2 - Large event (extra power records)
+{% endcomment %}
+
+{% if object.event.riskassessment.event_size >= 1 %}
+
+<para alignment="center"><strong>Power Test results enclosed on next page</strong></para>
+
+<condPageBreak height="10in"/>
+
+<h2 fontSize="16">Event Power Checklist</h2>
+<spacer length="15"/>
+
+<blockTable colWidths="250,270" style="powerTable">
+    <tr>
+        <td><para><strong>All circuit RCDs tested?</strong></para><para style="style.smallText">(using test button)</para></td>
+        <td><para>{{ object.all_rcds_tested|yesno|capfirst }}</para></td>
+    </tr>
+    <tr>
+        <td><para><strong>Public/performer accessible circuits tested?</strong></para><para style="style.smallText">(using socket tester)</para></td>
+        <td><para>{{ object.public_sockets_tested|yesno|capfirst }}</para></td>
+    </tr>
+    <tr>
+        <td><para><strong>Source RCD protected?</strong></para><para style="style.smallText">(if cable is more than 3m long)</para></td>
+        <td><para>{{ object.source_rcd|yesno|capfirst }}</para></td>
+    </tr>
+    <tr>
+        <td><para><strong>Appropriate and clear labelling on distribution and cabling?</strong></para></td>
+        <td><para>{{ object.labelling|yesno|capfirst }}</para></td>
+    </tr>
+    <tr>
+        <td><para><strong>Equipment appropriately earthed?</strong></para><para style="style.smallText">(truss, stage, generators, etc.)</para></td>
+        <td><para>{{ object.earthing|yesno|capfirst }}</para></td>
+    </tr>
+    <tr>
+        <td><para><strong>All equipment in PAT period?</strong><br/><br/></para></td>
+        <td><para>{{ object.pat|yesno|capfirst }}</para></td>
+    </tr>
+</blockTable>
+
+<spacer length="15"/>
+
+<h2 fontSize="14">Power tests (First Distro)</h2>
+<spacer length="5"/>
+
+<blockTable colWidths="100,410" style="voltageTable">
+<tr>
+<td><para><strong>Voltage</strong></para><para style="style.smallText">(cube meter) / V</para></td>
+<td>
+    <blockTable colWidths="100,100,100" style="powerTable">
+        <tr>
+            <td><para><strong>L1 - N</strong></para></td>
+            <td><para><strong>L2 - N</strong></para></td>
+            <td><para><strong>L3 - N</strong></para></td>
+        </tr>
+        <tr>
+            <td>{{ object.fd_voltage_l1}}</td>
+            <td>{{ object.fd_voltage_l2}}</td>
+            <td>{{ object.fd_voltage_l3}}</td>
+        </tr>
+    </blockTable>
+</td>
+</tr>
+</blockTable>
+
+<spacer length="10"/>
+
+<blockTable colWidths="100,100,190,120" style="voltageTable">
+    <tr>
+        <td><para><strong>Phase Rotation</strong></para><para style="style.smallText">(if required)</para></td>
+        <td><para>{{ object.fd_phase_rotation|yesno|capfirst }}</para></td>
+                <td><para><strong>Earth Fault Loop Impedance (Z<sub>s</sub>) / Ω</strong></para></td>
+        <td><para>{{ object.fd_earth_fault }}</para></td>
+    </tr>
+</blockTable>
+
+<spacer length="15"/>
+
+<para><strong>Prospective Short Circuit Current (PSCC)</strong> {{ object.fd_pssc }} A</para>
+
+<spacer length="15"/>
+
+<h2 fontSize="14">Power Tests (Worst Case Points)</h2>
+<spacer length="15"/>
+
+<blockTable colWidths="100,100,190,120" style="powerTable">
+    <tr>
+        <td><para><strong>Description</strong></para></td>
+        <td><para><strong>Polarity checked?</strong></para></td>
+        <td><para><strong>Voltage / V</strong></para></td>
+        <td><para><strong>Earth Fault Loop Impedance (Z<sub>s</sub>) / Ω</strong></para></td>
+    </tr>
+    {% if object.w1_description %}
+    <tr>
+        <td><para><strong>{{ object.w1_description }}</strong></para></td>
+        <td><para>{{ object.w1_polarity|yesno|capfirst }}</para></td>
+        <td><para>{{ object.w1_voltage }} V</para></td>
+        <td><para>{{ object.w1_earth_fault }}</para></td>
+    </tr>
+    {% endif %}
+    {% if object.w2_description %}
+    <tr>
+        <td><para><strong>{{ object.w2_description }}</strong></para></td>
+        <td><para>{{ object.w2_polarity|yesno|capfirst }}</para></td>
+        <td><para>{{ object.w2_voltage }} V</para></td>
+        <td><para>{{ object.w2_earth_fault }}</para></td>
+    </tr>
+    {% endif %}
+    {% if object.w3_description %}
+    <tr>
+        <td><para><strong>{{ object.w3_description }}</strong></para></td>
+        <td><para>{{ object.w3_polarity|yesno|capfirst }}</para></td>
+        <td><para>{{ object.w3_voltage }} V</para></td>
+        <td><para>{{ object.w3_earth_fault }}</para></td>
+    </tr>
+    {% endif %}
+</blockTable>
+
+{% else %}
+
+{% comment %}
+Small power test
+{% endcomment %}
+
+<h2 fontSize="16">Power Checklist</h2>
+<spacer length="15"/>
+
+<blockTable colWidths="250,270" style="powerTable">
+    <tr>
+        <td><para><strong>RCDs installed where needed and tested?</strong><br/><br/></para></td>
+        <td><para>{{ object.rcds|yesno|capfirst }}</para></td>
+    </tr>
+    <tr>
+        <td><para><strong>Electrical supplies tested?</strong><br/><br/></para></td>
+        <td><para>{{ object.supply_test|yesno|capfirst }}</para></td>
+    </tr>
+    <tr>
+        <td><para><strong>Equipment appropriately earthed?</strong></para><para style="style.smallText">(truss, stage, generators, etc.)</para></td>
+        <td><para>{{ object.earthing|yesno|capfirst }}</para></td>
+    </tr>
+    <tr>
+        <td><para><strong>All equipment in PAT period?</strong><br/><br/></para></td>
+        <td><para>{{ object.pat|yesno|capfirst }}</para></td>
+    </tr>
+</blockTable>
+{% endif %}
+
+{% endblock %}

RIGS/templates/hs/ra_print.xml

@@ -124,6 +124,13 @@
         <td><para>{{ object|help_text:'persons_responsible_structures'|striptags }}</para></td>
         <td><para>{{ object.persons_responsible_structures|default:'N/A' }}</para></td>
     </tr>
+        <tr>
+        <td colspan="2"><h3><strong>Venue Access</strong></h3></td>
+    </tr>
+    <tr>
+        <td><para>{{ object|help_text:'parking_and_access'|striptags }}</para></td>
+        <td><para>{{ object.parking_and_access|yesno|capfirst }}</para></td>
+    </tr>
 </blockTable>
 <spacer length="15"/>\
 <hr/>

RIGS/templates/hs/risk_assessment_detail.html

@@ -151,8 +151,19 @@
                             </dl>
                         </div>
                     </div>
+                    <div class="card card-default mb-3">
+                        <div class="card-header">Venue Access</div>
+                        <div class="card-body">
+                            <dl class="row">
+                                <dt class="col-10">{{ object|help_text:'parking_and_access' }}</dt>
+                                <dd class="col-2">
+                                    {{ object.parking_and_access|yesnoi:'invert' }}
+                                </dd>
+                            </dl>
+                        </div>
+                    </div>
+                    </div>
                 </div>
-            </div>
         </div>
         <div class="col-12 text-right">
             {% button 'print' 'ra_print' object.pk %}

RIGS/templates/hs/risk_assessment_form.html

@@ -162,6 +162,17 @@
                     </div>
                 </div>
             </div>
+            <div class="row my-3">
+                <div class="col-12">
+                    <div class="card">
+                        <div class="card-header">Venue Access</div>
+                        <div class="card-body">
+                            <p><strong>If yes to the below, ensure you have communicated with the client and secured all necessary access prior to the event commencing.</strong></p>
+                            {% include 'partials/yes_no_radio.html' with formitem=form.parking_and_access %}
+                        </div>
+                    </div>
+                </div>
+            </div>
             <div class="row mt-3">
                 <div class="col-sm-12 text-right">
                     <div class="btn-group">

RIGS/templates/invoice_dashboard.html

@@ -0,0 +1,106 @@
+{% extends 'base_rigs.html' %}
+
+{% load humanize %}
+{% block content %}
+
+<form method="GET" action="{% url 'invoice_dashboard' %}">
+    <div class="form-row">
+        <div class="form-group col-md-4">
+            <label for="time_filter">Time Filter</label>
+            <select id="time_filter" name="time_filter" class="form-control">
+                <option value="week" {% if time_filter == 'week' %}selected{% endif %}>Last Week (7 days)</option>
+                <option value="month" {% if time_filter == 'month' %}selected{% endif %}>Last Month (30 days)</option>
+                <option value="year" {% if time_filter == 'year' %}selected{% endif %}>Last Year</option>
+                <option value="all" {% if time_filter == 'all' %}selected{% endif %}>All Time</option>
+            </select>
+        </div>
+    </div>
+</form>
+
+<script>
+    $('#time_filter').change(function () {
+        $(this).closest('form').submit();
+    });
+</script>
+
+<h3>Overview</h3>
+
+<!-- big cards in 2x2 grid with total_outstanding, total_events, total_invoices and total_payments, different backgrounds -->
+
+<div class="card-deck">
+    <div class="card">
+        <a href="{% url 'invoice_waiting' %}" class="text-decoration-none text-white">
+            <div class="card-body bg-primary">
+                <h5 class="card-title text-center">Total Waiting</h5>
+                <p class="card-text text-center h3"><strong>£{{ total_waiting|floatformat:"2g" }}</strong></p>
+            </div>
+        </a>
+    </div>
+    <div class="card">
+        <a href="{% url 'invoice_list' %}" class="text-decoration-none text-dark">
+            <div class="card-body bg-info">
+                <h5 class="card-title text-center">Total Outstanding</h5>
+                <p class="card-text text-center h3"><strong>£{{ total_outstanding|floatformat:"2g" }}</strong></p>
+            </div>
+        </a>
+    </div>
+    <div class="card">
+        <div class="card-body bg-danger">
+            <h5 class="card-title text-center">Total Events</h5>
+            <p class="card-text text-center h3"><strong>{{ total_events }}</strong></p>
+        </div>
+    </div>
+    <div class="card">
+        <div class="card-body bg-success">
+            <h5 class="card-title text-center">Total Invoices</h5>
+            <p class="card-text text-center h3"><strong>{{ total_invoices }}</strong></p>
+        </div>
+    </div>
+</div>
+
+<br />
+
+<h3>Payments</h3>
+
+<br/>
+
+<h4>Sources</h4>
+
+<br/>
+
+{% for source in payment_methods %}
+<div class="card">
+    <div class="card-body">
+        <h5 class="card-title"><strong>{{ source.method }}</strong></h5>
+        <p class="card-text h3">£{{ source.total|floatformat:"2g" }}</p>
+    </div>
+</div>
+{% endfor %}
+
+<br/>
+
+<h4>Total</h4>
+
+<br/>
+
+<div class="card">
+    <div class="card-body">
+        <h5 class="card-title text-center">Total Income</h5>
+        <p class="card-text text-center h3"><strong>£{{ total_income|floatformat:"2g" }}</strong></p>
+    </div>
+</div>
+
+<br/>
+
+<h4>Invoice Payment Time</h4>
+
+<br/>
+
+<div class="card">
+    <div class="card-body">
+        <h5 class="card-title text-center">Average Time to Pay</h5>
+        <p class="card-text text-center h3"><strong>{{ mean_invoice_to_payment|floatformat:"2g" }} days</strong></p>
+    </div>
+</div>
+
+{% endblock %}

RIGS/templates/invoice_list_waiting.html

@@ -31,7 +31,7 @@
                 {% for event in object_list %}
                     <tr class="{{event.status_color}}">
                         <th scope="row"><a href="{% url 'event_detail' event.pk %}">{{ event.display_id }}</a><br>
-                            <span class="text-muted">{{ event.get_status_display }}</span></th>
+                            <span class="{% if event.get_status_display == 'Cancelled' %}text-danger{% endif %}">{{ event.get_status_display }}</span></th>
                         <td>{{ event.start_date }}</td>
                         <td>
                             {{ event.name }}

RIGS/templates/partials/contact_details.html

@@ -23,7 +23,7 @@
 </div>
 {% endif %}
 {% if object.organisation %}
-    <div class="card card-default">
+    <div class="card card-default mb-3">
         <div class="card-header">Organisation Details</div>
         <div class="card-body">
             <dl class="row">
@@ -44,4 +44,4 @@
             </dl>
         </div>
     </div>
-{% endif %}
+{% endif %}

RIGS/templates/partials/crew_list.html

@@ -0,0 +1,50 @@
+{% load button from filters %}
+
+{% if event.can_check_in %}
+<div class="col-sm-12">
+    <div class="card mt-3">
+        <div class="card-header">Crew Record</div>
+        <div class="table-responsive">
+            <table class="table table-sm">
+                <thead>
+                    <tr>
+                        <th scope="col">Name</th>
+                        <th scope="col">Vehicle</th>
+                        <th scope="col">Start Time</th>
+                        <th scope="col">Role</th>
+                        <th scope="col">End Time</th>
+                        <th scope="col">{% if request.user.pk is event.mic.pk %}<a
+                                href="{% url 'event_checkin_override' event.pk %}" class="btn btn-sm btn-success"><span
+                                    class="fas fa-plus"></span> Add</a>{% endif %}</th>
+                    </tr>
+                </thead>
+                <tbody id="crewmembers">
+                    {% for crew in event.crew.all %}
+                    <tr>
+                        <td>{{crew.person}}</td>
+                        <td>{{crew.vehicle|default:"None"}}</td>
+                        <td>{{crew.time}}</td>
+                        <td>{{crew.role}}</td>
+                        <td>{% if crew.end_time %}
+                            {{crew.end_time}}
+                            {% else %}
+                            <span class="text-success fas fa-clock" data-toggle="tooltip"
+                                title="This person is currently checked into this event"></span>{% endif %}
+                        </td>
+                        <td>{% if crew.end_time %}
+                                {% if crew.person.pk == request.user.pk or event.mic.pk == request.user.pk %}
+                                    {% button 'edit' 'edit_checkin' crew.pk clazz='btn-sm modal-href' %}
+                                {% endif %}
+                            {% endif %}</td>
+                    </tr>
+                    {% empty %}
+                    <tr>
+                        <td colspan="6" class="text-center bg-warning">Apparently this event happened by magic...</td>
+                    </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
+        </div>
+    </div>
+</div>
+{% endif %}

RIGS/templates/partials/event_details.html

@@ -11,6 +11,7 @@
                         {{ object.venue|namewithnotes:'venue_detail' }}
                     </a>
                 {% endif %}
+                {% if object.parking_and_access or object.riskassessment.parking_and_access %}<span class="badge badge-warning">Additional Access Requirements</span>{% endif %}
             </dd>
             {% if object.venue %}
             <dt class="col-sm-6">Venue Notes</dt>

RIGS/templates/partials/event_status.html

@@ -44,5 +44,8 @@
         <span class="badge badge-info">Invoice: Not Generated</span>
         {% endif %}
     {% endif %}
+    {% if event.parking_and_access %}
+        <span class="badge badge-warning">Addititional Access Requirements</span>
+    {% endif %}
 {% endif %}
 </div>

RIGS/templates/partials/parking_and_access.html

@@ -0,0 +1,22 @@
+<div class="card card-default">
+    <div class="card-header">Parking and Access</div>
+    <div class="card-body">
+        <p>This venue has additional parking and/or access requirements.</p>
+
+        <p>Ensure the MIC has:</p>
+        <ul>
+            <li>Details of where to park</li>
+            <li>Details of how to access the venue</li>
+            <li>Details of any access restrictions</li>
+            <li>If on campus, sorted parking permits</li>
+        </ul>
+
+        {% if object.parking_and_access and object.riskassessment.parking_and_access %}
+            <small>Additional parking marked on both rig details and risk assessment.</small>
+        {% elif object.parking_and_access %}
+            <small>Additional parking marked on rig details.</small>
+        {% elif object.riskassessment.parking_and_access %}
+            <small>Additional parking marked on risk assessment.</small>
+        {% endif %}
+    </div>
+</div>

RIGS/tests/conftest.py

@@ -20,7 +20,7 @@ def ra(basic_event, admin_user):
                                               known_venue=True, safe_loading=True, safe_storage=True,
                                               area_outside_of_control=True, barrier_required=True,
                                               nonstandard_emergency_procedure=True, special_structures=False,
-                                              suspended_structures=False, outside=False)
+                                              suspended_structures=False, outside=False, parking_and_access=False)
     yield ra
     ra.delete()
 

RIGS/tests/pages.py

@@ -207,6 +207,7 @@ class CreateRiskAssessment(FormPage):
         'suspended_structures': (regions.RadioSelect, (By.ID, 'id_suspended_structures')),
         'supervisor_consulted': (regions.CheckBox, (By.ID, 'id_supervisor_consulted')),
         'rigging_plan': (regions.TextBox, (By.ID, 'id_rigging_plan')),
+        'parking_and_access': (regions.RadioSelect, (By.ID, 'id_parking_and_access')),
     }
 
     @property

RIGS/tests/test_interaction.py

@@ -127,7 +127,7 @@ class TestEventCreate(BaseRigboardTest):
 
         # Fix it
         self.page.end_date = datetime.date(2020, 1, 11)
-        self.page.access_at = datetime.datetime(2020, 1, 1, 9)
+        self.page.access_at = datetime.datetime(2020, 1, 8, 9)
         self.page.dry_hire = True
         self.page.status = "Booked"
         self.page.collected_by = "Fred"
@@ -759,6 +759,7 @@ def test_ra_creation(logged_in_browser, live_server, admin_user, basic_event):
     page.barrier_required = False
     page.nonstandard_emergency_procedure = False
     page.special_structures = False
+    page.parking_and_access = False
     # self.page.persons_responsible_structures = "Nobody and her cat, She"
 
     page.suspended_structures = True

RIGS/urls.py

@@ -100,6 +100,7 @@ urlpatterns = [
          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/power/<int:pk>/print/', permission_required_with_403('RIGS.view_powertestrecord')(views.PowerPrint.as_view()), name='pt_print'),
 
     path('event/<int:pk>/checkin/', login_required(views.EventCheckIn.as_view()),
          name='event_checkin'),
@@ -114,7 +115,8 @@ urlpatterns = [
     path('event/webhook/', views.RecieveForumWebhook.as_view(), name='webhook_recieve'),
 
     # Finance
-    path('invoice/', permission_required_with_403('RIGS.view_invoice')(views.InvoiceIndex.as_view()),
+    path('invoice/', permission_required_with_403('RIGS.view_invoice')(views.InvoiceDashboard.as_view()), name='invoice_dashboard'),
+    path('invoice/outstanding', permission_required_with_403('RIGS.view_invoice')(views.InvoiceOutstanding.as_view()),
          name='invoice_list'),
     path('invoice/archive/', permission_required_with_403('RIGS.view_invoice')(views.InvoiceArchive.as_view()),
          name='invoice_archive'),

RIGS/views/finance.py

@@ -5,7 +5,7 @@ import reversion
 from django import forms
 from django.contrib import messages
 from django.db import transaction
-from django.db.models import Q
+from django.db.models import Sum
 from django.http import Http404, HttpResponseRedirect
 from django.http import HttpResponse
 from django.shortcuts import get_object_or_404
@@ -18,8 +18,76 @@ from RIGS import models
 
 forms.DateField.widget = forms.DateInput(attrs={'type': 'date'})
 
+TIME_FILTERS = ["all", "year", "month", "week"]
 
-class InvoiceIndex(generic.ListView):
+
+def days_between(d1, d2):
+    diff = d2 - d1
+    return diff.total_seconds() / datetime.timedelta(days=1).total_seconds()
+
+
+class InvoiceDashboard(generic.TemplateView):
+    template_name = 'invoice_dashboard.html'
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context['page_title'] = "Invoice Dashboard"
+        context['description'] = "Overview of financial status of TEC rigs."
+
+        time_filter = self.request.GET.get('time_filter', 'all')
+
+        if time_filter not in TIME_FILTERS:
+            time_filter = 'all'
+
+        if time_filter == 'all':
+            context['events'] = models.Event.objects.filter(is_rig=True)
+            context['invoices'] = models.Invoice.objects.all()
+            context['payments'] = models.Payment.objects.all()
+        elif time_filter == 'year':
+            context['events'] = models.Event.objects.filter(is_rig=True, start_date__gte=datetime.date.today() - datetime.timedelta(days=365))
+            context['invoices'] = models.Invoice.objects.filter(invoice_date__gte=datetime.date.today() - datetime.timedelta(days=365))
+            context['payments'] = models.Payment.objects.filter(date__gte=datetime.date.today() - datetime.timedelta(days=365))
+        elif time_filter == 'month':
+            context['events'] = models.Event.objects.filter(is_rig=True, start_date__gte=datetime.date.today() - datetime.timedelta(days=30))
+            context['invoices'] = models.Invoice.objects.filter(invoice_date__gte=datetime.date.today() - datetime.timedelta(days=30))
+            context['payments'] = models.Payment.objects.filter(date__gte=datetime.date.today() - datetime.timedelta(days=30))
+        elif time_filter == 'week':
+            context['events'] = models.Event.objects.filter(is_rig=True, start_date__gte=datetime.date.today() - datetime.timedelta(days=7))
+            context['invoices'] = models.Invoice.objects.filter(invoice_date__gte=datetime.date.today() - datetime.timedelta(days=7))
+            context['payments'] = models.Payment.objects.filter(date__gte=datetime.date.today() - datetime.timedelta(days=7))
+
+        context["time_filter"] = time_filter
+
+        context['total_outstanding'] = sum([i.balance for i in models.Invoice.objects.outstanding_invoices()])
+        context['total_waiting'] = sum([i.sum_total for i in models.Event.objects.waiting_invoices()])
+        context['total_events'] = len(context['events'])
+        context['total_invoices'] = len(context['invoices'])
+        context['total_payments'] = len(context['payments'])
+
+        payment_methods = dict(models.Payment.METHODS)
+
+        context['payment_methods'] = context["payments"].values('method').annotate(total=Sum('amount')).order_by('method')
+
+        for method in context['payment_methods']:
+            method['method'] = payment_methods.get(method['method'], f"Unknown method ({method['method']})")
+
+        context["total_income"] = sum([i['total'] for i in context['payment_methods']])
+
+        payments = context['payments']
+        mean_duration = 0
+
+        for payment in payments:
+            mean_duration += days_between(payment.invoice.invoice_date, payment.date)
+
+        if len(payments) > 0:
+            mean_duration /= len(payments)
+
+        context['mean_invoice_to_payment'] = mean_duration
+
+        return context
+
+
+class InvoiceOutstanding(generic.ListView):
     model = models.Invoice
     template_name = 'invoice_list.html'
 

RIGS/views/hs.py

@@ -232,6 +232,16 @@ class RAPrint(PrintView):
         return context
 
 
+class PowerPrint(PrintView):
+    model = models.PowerTestRecord
+    template_name = 'hs/power_print.xml'
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context['filename'] = f"PowerTestRecord_for_{context['object'].event.display_id}.pdf"
+        return context
+
+
 class EventCheckIn(generic.CreateView, ModalURLMixin):
     model = models.EventCheckIn
     template_name = 'hs/eventcheckin_form.html'

assets/views.py

@@ -374,7 +374,7 @@ def generate_label(pk):
     barcode = Code39(str(obj.asset_id), writer=ImageWriter())
 
     logo_size = (200, 200)
-    image.paste(logo.resize(logo_size, Image.ANTIALIAS), box=(5, 5))
+    image.paste(logo.resize(logo_size, Image.LANCZOS), box=(5, 5))
     barcode_image = barcode.render(writer_options={"quiet_zone": 0, "write_text": False})
     width, height = barcode_image.size
     image.paste(barcode_image.crop((0, 0, width, 100)), (int(((size[0] + logo_size[0]) - width) / 2), 40))

pipeline/source_assets/js/autocompleter.js

@@ -1,16 +1,11 @@
 function changeSelectedValue(obj,pk,text,update_url) { //Pass in JQuery object and new parameters
     //console.log('Changing selected value');
     obj.find('option').remove();  //Remove all the available options
-    obj.append(  //Add the new option
-    	$("<option></option>")
-	    .attr("value",pk)
-	    .text(text)
-	    .data('update_url',update_url)
-	    );
-    obj.selectpicker('render'); //Re-render the UI
-    obj.selectpicker('refresh'); //Re-render the UI
-    obj.selectpicker('val', pk); //Set the new value to be selected
+    obj[0].add(new Option(text, pk, true, true)); // Add new option
+    //obj.selectpicker('val', pk); //Set the new value to be selected
+    obj.selectpicker('refresh');
     obj.change(); //Trigger the change function manually
+    //console.log(obj);
 }
 
 function refreshUpdateHref(obj) {

pipeline/source_assets/scss/_custom-variables.scss

@@ -9,3 +9,4 @@ $theme-colors: (
   "primary": #3A52A2
 ) !default;
 $enable-shadows: true;
+$alert-color-level: 10;

templates/base.html

@@ -35,8 +35,8 @@
 {% endif %}
 <nav class="navbar navbar-expand-lg navbar-dark bg-dark" role="navigation">
   <div class="container">
-      <a class="navbar-brand" style="position: absolute; left:0.5em; top: 2px;" href="{% if request.user.is_authenticated %}https://rigs.nottinghamtec.co.uk{%else%}https://nottinghamtec.co.uk{%endif%}">
-        <img src="{% static 'imgs/logo.webp' %}" width="40" height="40" alt="TEC's Logo: Serif 'TEC' vertically next to a blue box with the words 'PA and Lighting', surrounded by graduated rings" id="logo">
+      <a class="navbar-brand" href="{% if request.user.is_authenticated %}https://rigs.nottinghamtec.co.uk{%else%}https://nottinghamtec.co.uk{%endif%}">
+        <img src="{% static 'imgs/logo.webp' %}" class="mr-auto" style="max-height: 40px;" alt="TEC's Logo: Serif 'TEC' vertically next to a blue box with the words 'PA and Lighting', surrounded by graduated rings" id="logo">
       </a>
       {% block titleheader %}
       {% endblock %}

templates/index.html

@@ -9,9 +9,11 @@
     <h1 class="col-sm-12 pb-3">R<small class="text-muted">ig</small> I<small class="text-muted">nformation</small> G<small class="text-muted">athering</small> S<small class="text-muted">ystem</small></h1>
     <h2 class="col-sm-12 pb-3">Welcome back {{ user.get_full_name }}, there {%if rig_count == 1 %}is one rig coming up{%else%}are {{ rig_count|apnumber }} rigs coming up.{%endif%}</h2>
     {% if now %}
-    <div class="col-sm-12 alert alert-primary rounded-0 mx-auto">
+    <div class="col-sm-12">
     {% for event in now %}
-    Event {{ event }} is happening today! <a href="{% url 'event_checkin' event.pk %}" class="btn btn-success btn-sm modal-href align-baseline {% if request.user.current_event %}disabled{%endif%}"><span class="fas fa-user-clock"></span> <span class="d-none d-sm-inline">Check In</span></a><br/>
+    <div class="alert alert-primary rounded-0">
+    Event <a href="{% url 'event_detail' event.pk %}" class="text-danger">{{ event }}</a> is happening today! <a href="{% url 'event_checkin' event.pk %}" class="btn btn-success btn-sm modal-href align-baseline {% if request.user.current_event %}disabled{%endif%}"><span class="fas fa-user-clock"></span> <span class="d-none d-sm-inline">Check In</span></a><br/>
+    </div>
     {% endfor %}
     </div>
     {% endif %}
@@ -54,6 +56,9 @@
                 <a class="list-group-item list-group-item-action" href="{% url 'trainee_list' %}"><span class="fas fa-users"></span><span class="align-middle"> Trainee List</span></a>
                 <a class="list-group-item list-group-item-action" href="{% url 'level_list' %}"><span class="fas fa-layer-group"></span> <span class="align-middle">Level List</span></a>
                 <a class="list-group-item list-group-item-action" href="{% url 'item_list' %}"><span class="fas fa-sitemap"></span> <span class="align-middle">Item List</span></a>
+                {% if request.user.is_supervisor %}
+                    <a class="list-group-item list-group-item-action" href="{% url 'session_log' %}"><span class="fas fa-users"></span> <span class="align-middle">Log Session</span></a>
+                {% endif %}
             </div>
         </div>
     </div>