Add warning when creating event with access time more than a week before start.

Yes. I know it's a dirty solution. >:D

Closes #593

.github/workflows/django.yml

@@ -14,11 +14,14 @@ jobs:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       PYTHONDONTWRITEBYTECODE: 1
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+      - name: Install build dependencies
+        run: |
+          sudo apt-get install libcairo2-dev
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
-            python-version: 3.9
+            python-version: "3.10"
             cache: 'pipenv'
       - name: Install Dependencies
         run: |
@@ -27,7 +30,7 @@ jobs:
         # if: steps.pcache.outputs.cache-hit != 'true'
       - name: Cache Static Files
         id: static-cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
             path: 'pipeline/built_assets'
             key: ${{ hashFiles('package-lock.json') }}-${{ hashFiles('pipeline/source_assets') }}
@@ -43,7 +46,7 @@ jobs:
               pipenv run python3 manage.py collectstatic --noinput
       - name: Run Tests
         run: pipenv run pytest -n auto --cov
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
             name: failure-screenshots ${{ matrix.test-group }}

Pipfile

@@ -28,9 +28,9 @@ django-reversion = "~=3.0.9"
 django-widget-tweaks = "~=1.4.8"
 django-htmlmin = "~=0.11.0"
 envparse = "*"
-gunicorn = "~=20.0.4"
+gunicorn = "~=22.0.0"
 icalendar = "~=4.0.7"
-idna = "~=2.10"
+idna = "~=3.7"
 Markdown = "~=3.3.3"
 msgpack = "~=1.0.2"
 pep517 = "~=0.9.1"
@@ -47,17 +47,17 @@ python-dateutil = "~=2.8.1"
 pytoml = "~=0.1.21"
 pytz = "~=2020.5"
 reportlab = "*"
-requests = "~=2.31.0"
+requests = "~=2.32.3"
 retrying = "~=1.3.3"
 simplejson = "~=3.17.2"
 six = "~=1.15.0"
 soupsieve = "~=2.1"
-sqlparse = "~=0.4.2"
+sqlparse = "~=0.5.0"
 static3 = "~=0.7.0"
 svg2rlg = "~=0.3"
 tini = "~=3.0.1"
 tornado = "~=6.3"
-urllib3 = "~=1.26.18"
+urllib3 = "~=1.26.19"
 whitenoise = "~=5.2.0"
 yolk = "~=0.4.3"
 zipp = "~=3.4.0"

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
@@ -97,6 +98,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):

RIGS/models.py

@@ -943,6 +943,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/event_archive.html

@@ -46,7 +46,7 @@
     </div>
 </div>
 <div class="row">
-    <div class="col-sm-12">
+    <div class="col-sm-12" style="container-type: inline-size;">
         {% with object_list as events %}
             {% include 'partials/event_table.html' %}
         {% endwith %}

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,170 @@
+{% 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="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/ec_power_info.html

@@ -33,8 +33,8 @@
             <thead>
                 <tr>
                     <th scope="row">Distro</th>
-                    <th scope="row">Max PSSC with Single Phase Supply (kA)</th>
-                    <th scope="row">Max PSSC with Three Phase Supply (kA)</th>
+                    <th scope="row">Max PSCC with Single Phase Supply (kA)</th>
+                    <th scope="row">Max PSCC with Three Phase Supply (kA)</th>
                 </tr>
             </thead>
             <tbody>

RIGS/templates/partials/event_table.html

@@ -3,7 +3,7 @@
 <style>
 #event_table {
     display: grid;
-    grid-template-columns: max-content auto;
+    grid-template-columns: max-content min-content minmax(max-content, 1fr) max-content;
     column-gap: 1em;
 }
 .eventgrid {
@@ -11,6 +11,9 @@
     grid-column: 1/5;
     grid-template-columns: subgrid;
     padding: 1em;
+    dt, dd { display: block; float: left; }
+    dt { clear: both; }
+    dd { float: right; }
 }
 .grid-header {
     border-bottom: 1px solid grey;
@@ -23,7 +26,13 @@
     grid-row-start: 1;
     grid-column-start: 4;
 }
-@media (max-width: 600px) {
+.c-none {
+    display: none;
+}
+.c-inline {
+    display: inline;
+}
+@container (width <= 500px) {
   #event_table {
     grid-template-columns: 1fr !important;
   }
@@ -45,7 +54,7 @@
     grid-column-start: 4;
   }
 }
-@media (max-width: 900px) {
+@container (width <= 700px) {
   #event_table {
     grid-template-columns: max-content;
     column-gap: 0.5em;
@@ -68,17 +77,20 @@
   #event_status {
     grid-column: span 2;
   }
-  .grid-header {
+  .grid-header, .c-md-none {
     display: none;
   }
 }
-dt {
-  float: left;
-  clear: left;
-  margin-right: 10px;
+@container (width > 700px) {
+    .c-lg-block {
+        display: block;
+    }
+    .c-lg-inline {
+        display: inline;
+    }
+    .c-lg-none, .c-md-none {
+        display: none;
     }
-dd {
-  margin-left: 0px;
 }
 </style>
 <div id="event_table">
@@ -105,7 +117,7 @@ dd {
     table-warning
     {% endif %}" {% if event.cancelled %}style="opacity: 50% !important;"{% endif %} id="event_row">
     <!---Number-->
-    <div class="font-weight-bold d-none d-lg-block" id="event_number">{{ event.display_id }}</div>
+    <div class="font-weight-bold c-none c-lg-block" id="event_number">{{ event.display_id }}</div>
     <!--Dates & Times-->
     <div id="event_dates" style="min-width: 180px;">
         <dl>
@@ -139,12 +151,12 @@ dd {
     <div id="event_details" class="w-100">
         <h4>
             <a href="{% url 'event_detail' event.pk %}">
-                <span class="d-inline d-lg-none">{{ event }}</span><span class="d-none d-lg-inline">{{ event.name }}</span>
+                <span class="c-inline c-lg-none">{{ event }}</span><span class="c-none c-lg-inline">{{ event.name }}</span>
             </a>
             {% if event.dry_hire %}
             <span class="badge badge-secondary">Dry Hire</span>
             {% endif %}
-            <br class="d-none d-lg-inline">
+            <br class="c-none c-lg-inline">
             {% if event.venue %}
             <small>at {{ event.venue|namewithnotes:'venue_detail' }}</small>
             {% endif %}
@@ -164,7 +176,7 @@ dd {
     {% include 'partials/event_status.html' %}
     <!---MIC-->
     <div id="event_mic" class="text-nowrap">
-        <span class="d-md-none align-middle">MIC:</span>
+        <span class="c-md-none align-middle">MIC:</span>
         {% if event.mic %}
         {% if perms.RIGS.view_profile %}
         <a href="{% url 'profile_detail' event.mic.pk %}" class="modal-href">

RIGS/templates/rigboard.html

@@ -12,7 +12,7 @@
     </div>
     {% endif %}
 </div>
-
+<div style="container-type: inline-size;">
 {% include 'partials/event_table.html' %}
-
+</div>
 {% endblock %}

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"

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'),

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'

gulpfile.js

@@ -16,7 +16,7 @@ const con = require('gulp-concat');
 const gulpif = require('gulp-if');
 
 function fonts(done) {
-    return gulp.src('node_modules/@fortawesome/fontawesome-free/webfonts/fa-solid-900.*')
+    return gulp.src('node_modules/@fortawesome/fontawesome-free/webfonts/fa-solid-900.*', { encoding: false })
         .pipe(gulp.dest('pipeline/built_assets/fonts'))
         .pipe(browsersync.stream());
 }
@@ -70,14 +70,14 @@ function scripts() {
     .pipe(gulpif(function(file) { return interaction.includes(file.relative);}, con('interaction.js')))
     .pipe(gulpif(function(file) { return jpop.includes(file.relative);}, con('jpop.js')))
     .pipe(flatten())
-    .pipe(terser())
+    // Only minify if filename does not already denote it as minified
+    .pipe(gulpif(function(file) { return file.path.indexOf("min") == -1;},terser()))
     .pipe(gulp.dest(dest))
     .pipe(browsersync.stream());
 }
 
 function browserSync(done) {
   spawn('python', ['manage.py', 'runserver'], {stdio: 'inherit'});
-  // TODO Wait for Django server to come up before browsersync, it seems inconsistent
   browsersync.init({
     notify: true,
     open: false,

package.json

@@ -16,7 +16,6 @@
     "cssnano": "^5.0.13",
     "easymde": "^2.16.1",
     "fullcalendar": "^5.10.1",
-    "gulp": "^4.0.2",
     "gulp-concat": "^2.6.1",
     "gulp-flatten": "^0.4.0",
     "gulp-if": "^3.0.0",
@@ -34,7 +33,8 @@
     "uglify-js": "^3.14.5"
   },
   "devDependencies": {
-    "browser-sync": "^3.0.2"
+    "browser-sync": "^3.0.2",
+    "gulp": "^5.0.0"
   },
   "scripts": {
     "gulp": "gulp",

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/js/src.js

@@ -17,14 +17,12 @@ jQuery(document).ready(function () {
             });
         }
     });
-    var easter_egg = new Konami();
-    easter_egg.code = function () {
+    var easter_egg = new Konami(function () {
         var s = document.createElement('script');
         s.type = 'text/javascript';
         document.body.appendChild(s);
-        s.src = '{% static "js/asteroids.min.js"%}';
-        ga('send', 'event', 'easter_egg', 'activated');
-    }
+        s.src = '/static/js/asteroids.min.js';
+    });
     easter_egg.load();
 });
 //CTRL-Enter form submission

pipeline/source_assets/scss/_custom-variables.scss

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

pipeline/source_assets/scss/screen.scss

@@ -281,3 +281,12 @@ html.embedded {
 .bootstrap-select, button.btn.dropdown-toggle.bs-placeholder.btn-light {
     padding-right: 1rem !important;
 }
+// New implementation of class dropped in Bootstrap 3
+.dl-horizontal {
+    display: grid;
+    grid-template-columns: auto 1fr;
+    gap: 0.7rem 0;
+}
+.dl-horizontal > dd, .dl-horizontal .markdown > p {
+    margin-bottom: 0 !important;
+}

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

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 %}
+    <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 %}

users/templates/profile_detail.html

@@ -167,10 +167,12 @@
         <div class="col-lg-6">
             <div class="card">
                 <div class="card-header">Events</div>
+                <div style="container-type: size; height: 30vh; overflow-y: scroll;">
                 {% with object.latest_events as events %}
                     {% include 'partials/event_table.html' %}
                 {% endwith %}
                 </div>
             </div>
         </div>
+    </div>
 {% endblock %}