Revert "Generate PDFs from Power Test Records (#594)"

This reverts commit 6c8eb380fd.

.github/workflows/django.yml

@@ -15,13 +15,10 @@ 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.10"
+            python-version: 3.9
             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.3"
+requests = "~=2.32.0"
 retrying = "~=1.3.3"
 simplejson = "~=3.17.2"
 six = "~=1.15.0"

RIGS/forms.py

@@ -1,11 +1,10 @@
-from datetime import datetime, timedelta
+from datetime import datetime
 
 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
@@ -98,9 +97,6 @@ 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):

RIGS/models.py

@@ -943,10 +943,6 @@ 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,9 +22,6 @@
         <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" />
@@ -140,7 +137,6 @@
         <nextFrame/>
         {% block content %}
         {% endblock %}
-        <namedString id="lastPage"><pageNumber/></namedString>
     </story>
 
 </document>

RIGS/templates/hs/power_detail.html

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

@@ -1,170 +0,0 @@
-{% extends 'base_print.xml' %}
-{% load filters %}
-
-{% block extrastyles %}
-<paraStyle name="style.powerReviewed" alignment="center" backColor="green" textColor="white"/>
-<paraStyle name="style.powerUnreviewed" alignment="center" backColor="red" textColor="white"/>
-
-<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>
-{% 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"/>
-
-<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"/>
-<hr/>
-<spacer length="15"/>
-
-<condPageBreak height="10in"/>
-
-<h2 fontSize="16">Power Test Results</h2>
-<spacer length="15"/>
-
-<para><strong>Source RCD protected?</strong> {{ object.source_rcd|yesno|capfirst }}</para>
-<para><sub>(If cable is more than 3 metres long)</sub></para>
-
-<spacer length="5"/>
-
-<para><strong>Appropriate and clear labelling on distribution and cabling?</strong> {{ object.labelling|yesno|capfirst }}</para>
-
-<spacer length="5"/>
-
-<para><strong>Equipment appropriately earthed?</strong> {{ object.source_rcd|yesno|capfirst }}</para>
-<para><sub>(truss, stage, generators etc.)</sub></para>
-
-<spacer length="5"/>
-
-<para><strong>All equipment in PAT period?</strong> {{ object.pat|yesno|capfirst }}</para>
-
-<spacer length="15"/>
-
-<h2 fontSize="14">Tests at first distro</h2>
-<spacer length="5"/>
-
-<blockTable colWidths="100,410">
-<tr>
-<td><para><strong>Voltage<br/><sub>(cube meter) / V</sub></strong></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="15"/>
-
-<blockTable colWidths="100,100,190,120">
-    <tr>
-        <td><para><strong>Phase Rotation<br/><sub>(if required)</sub></strong></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 / A</strong> {{ object.fd_pssc }}</para>
-
-<spacer length="15"/>
-
-<h2 fontSize="14">Tests 'Worst Case' points (at least 1 required)</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>
-
-<spacer length="15"/>
-<h2 fontSize="14">Generic Tests</h2>
-<spacer length="15"/>
-
-<blockTable colWidths="250,270" style="powerTable">
-    <tr>
-        <td><para><strong>All circuit RCDs tested?</strong><br/>(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><br/>(using socket tester)</para></td>
-        <td><para>{{ object.public_sockets_tested|yesno|capfirst }}</para></td>
-    </tr>
-</blockTable>
-{% 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="{% if event.get_status_display == 'Cancelled' %}text-danger{% endif %}">{{ event.get_status_display }}</span></th>
+                            <span class="text-muted">{{ event.get_status_display }}</span></th>
                         <td>{{ event.start_date }}</td>
                         <td>
                             {{ event.name }}

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, 8, 9)
+        self.page.access_at = datetime.datetime(2020, 1, 1, 9)
         self.page.dry_hire = True
         self.page.status = "Booked"
         self.page.collected_by = "Fred"

RIGS/urls.py

@@ -100,7 +100,6 @@ 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'),

RIGS/views/hs.py

@@ -232,16 +232,6 @@ 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'

pipeline/source_assets/scss/_custom-variables.scss

@@ -9,4 +9,3 @@ $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" 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; position: absolute; left: 0.5em; top: 0;" alt="TEC's Logo: Serif 'TEC' vertically next to a blue box with the words 'PA and Lighting', surrounded by graduated rings" id="logo">
+      <a 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>
       {% block titleheader %}
       {% endblock %}

templates/index.html

@@ -9,11 +9,9 @@
     <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">
+    <div class="col-sm-12 alert alert-primary rounded-0 mx-auto">
     {% for event in now %}
-    <div class="alert alert-primary rounded-0">
     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>
     {% endfor %}
     </div>
     {% endif %}