Fix typo in nonevent display

(cherry picked from commit b3939d8426)

# Conflicts:
#	pipeline/source_assets/scss/dark_screen.scss

Pipfile

@@ -34,7 +34,7 @@ idna = "~=2.10"
 Markdown = "~=3.3.3"
 msgpack = "~=1.0.2"
 pep517 = "~=0.9.1"
-Pillow = "~=9.3.0"
+Pillow = "~=10.0.1"
 premailer = "~=3.7.0"
 progress = "~=1.5"
 psutil = "~=5.8.0"
@@ -57,7 +57,7 @@ static3 = "~=0.7.0"
 svg2rlg = "~=0.3"
 tini = "~=3.0.1"
 tornado = "~=6.3"
-urllib3 = "~=1.26.5"
+urllib3 = "~=1.26.18"
 whitenoise = "~=5.2.0"
 yolk = "~=0.4.3"
 zipp = "~=3.4.0"

PyRIGS/decorators.py

@@ -121,7 +121,3 @@ def nottinghamtec_address_required(function):
         return function(request, *args, **kwargs)
 
     return wrap
-
-
-def not_estates():
-    return user_passes_test_with_403(lambda u: not u.email.endswith('@nottingham.ac.uk'))

PyRIGS/settings.py

@@ -35,9 +35,8 @@ if DEBUG:
     ALLOWED_HOSTS.append('localhost')
     ALLOWED_HOSTS.append('example.com')
     ALLOWED_HOSTS.append('127.0.0.1')
-    ALLOWED_HOSTS.append('.github.dev')
+    ALLOWED_HOSTS.append('.app.github.dev')
-
+    CSRF_TRUSTED_ORIGINS = ALLOWED_HOSTS
-CSRF_TRUSTED_ORIGINS = ALLOWED_HOSTS
 
 SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
 if not DEBUG:

PyRIGS/urls.py

@@ -6,8 +6,6 @@ from django.contrib.staticfiles.urls import staticfiles_urlpatterns
 from django.urls import path
 from django.views.generic import TemplateView
 
-from PyRIGS.decorators import not_estates
-
 from PyRIGS import views
 
 urlpatterns = [
@@ -16,17 +14,17 @@ urlpatterns = [
     path('assets/', include('assets.urls')),
     path('training/', include('training.urls')),
 
-    path('', not_estates()(views.Index.as_view()), name='index'),
+    path('', login_required(views.Index.as_view()), name='index'),
 
     # API
-    path('api/<str:model>/', not_estates()(views.SecureAPIRequest.as_view()),
+    path('api/<str:model>/', login_required(views.SecureAPIRequest.as_view()),
          name="api_secure"),
-    path('api/<str:model>/<int:pk>/', not_estates()(views.SecureAPIRequest.as_view()),
+    path('api/<str:model>/<int:pk>/', login_required(views.SecureAPIRequest.as_view()),
          name="api_secure"),
 
     path('closemodal/', views.CloseModal.as_view(), name='closemodal'),
-    path('search/', not_estates()(views.Search.as_view()), name='search'),
+    path('search/', login_required(views.Search.as_view()), name='search'),
-    path('search_help/', not_estates()(views.SearchHelp.as_view()), name='search_help'),
+    path('search_help/', login_required(views.SearchHelp.as_view()), name='search_help'),
 
     path('', include('users.urls')),
 

RIGS/migrations/0052_venue_on_campus.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.2.21 on 2023-09-05 22:39
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('RIGS', '0051_alter_payment_method'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='venue',
-            name='on_campus',
-            field=models.BooleanField(default=False, verbose_name='Is this venue on a UoN campus?'),
-        ),
-    ]

RIGS/models.py

@@ -77,7 +77,7 @@ class Profile(AbstractUser):
     @classmethod
     def users_awaiting_approval_count(cls):
         # last_login = None ensures we only pick up genuinely new users, not those that have been deactivated for inactivity
-        return Profile.objects.filter(is_approved=False, last_login=None).count()
+        return Profile.objects.filter(is_approved=False, last_login=None, date_joined_date=timezone.now().date()).count()
 
     def __str__(self):
         return self.name
@@ -213,7 +213,6 @@ class Venue(models.Model, RevisionMixin):
     phone = models.CharField(max_length=15, blank=True, default='')
     email = models.EmailField(blank=True, default='')
     three_phase_available = models.BooleanField(default=False)
-    on_campus = models.BooleanField(default=False, verbose_name="Is this venue on a UoN campus?")
     notes = models.TextField(blank=True, default='')
     address = models.TextField(blank=True, default='')
 

RIGS/signals.py

@@ -3,6 +3,7 @@ import urllib.error
 import urllib.parse
 import urllib.request
 from io import BytesIO
+import datetime
 
 from PyPDF2 import PdfFileReader, PdfFileMerger
 from django.conf import settings
@@ -110,7 +111,7 @@ def send_admin_awaiting_approval_email(user, request, **kwargs):
         if admin.last_emailed is None or admin.last_emailed + settings.EMAIL_COOLDOWN <= timezone.now():
             context = {
                 'request': request,
-                'link_suffix': reverse("admin:RIGS_profile_changelist") + '?is_approved__exact=0',
+                'link_suffix': reverse("admin:RIGS_profile_changelist") + f'?is_approved__exact=0&date_joined__date={timezone.now().date()}',
                 'number_of_users': models.Profile.users_awaiting_approval_count(),
                 'to_name': admin.first_name
             }

RIGS/templates/calendar.html

@@ -26,6 +26,7 @@
             var calendarEl = document.getElementById('calendar');
 
             calendar = new FullCalendar.Calendar(calendarEl, {
+	          firstDay: 1,
               themeSystem: 'bootstrap',
               aspectRatio: 1.5,
               eventTimeFormat: {

RIGS/templates/estates/estates_event_list.html

@@ -1,5 +0,0 @@
-{% extends 'base_client.html' %}
-
-{% block content %}
-{% include 'estates/estates_event_table.html' %}
-{% endblock %}

RIGS/templates/estates/estates_event_table.html

@@ -1,78 +0,0 @@
-{% load namewithnotes from filters %}
-{% load markdown_tags %}
-<div class="table-responsive">
-    <table class="table mb-0" id="event_table">
-        <thead>
-            <tr>
-                <th scope="col">#</th>
-                <th scope="col">Dates & Times</th>
-                <th scope="col">Event Details</th>
-                <th scope="col">Status</th>
-                <th scope="col">Member In Charge</th>
-                <th scope="col">Power Plan</th>
-            </tr>
-        </thead>
-        <tbody>
-        {% for event in events %}
-        <tr {% if event.cancelled %}style="opacity: 50% !important;"{% endif %} id="event_row">
-            <!---Number-->
-            <th scope="row" id="event_number">{{ event.display_id }}</th>
-            <!--Dates & Times-->
-            <td id="event_dates" style="text-align: justify;">
-                <span class="text-nowrap">Start: <strong>{{ event.start_date|date:"D d/m/Y" }}
-                {% if event.has_start_time %}
-                    {{ event.start_time|date:"H:i" }}
-                {% endif %}</strong>
-                </span>
-                {% if event.end_date %}
-                    <br>
-                    <span class="text-nowrap">End: {% if event.end_date != event.start_date %}<strong>{{ event.end_date|date:"D d/m/Y"  }}{% endif %}
-                    {% if event.has_end_time %}
-                       {{ event.end_time|date:"H:i" }}
-                    {% endif %}</strong>
-                    </span>
-                {% endif %}
-            </td>
-            <!---Details-->
-            <td id="event_details" class="w-100">
-                <h4>
-                    {{ event.name }}
-                    {% if event.venue %}
-                        <small>at {{ event.venue }}</small>
-                    {% endif %}
-                </h4>
-                {% if event.is_rig and not event.cancelled %}
-                    <h5>
-                        {{ event.person.name }}
-                        {% if event.organisation %}
-                            for {{ event.organisation.name }}
-                        {% endif %}
-                    </h5>
-                {% endif %}
-                {% if not event.cancelled and event.description %}
-                    <p>{{ event.description|markdown }}</p>
-                {% endif %}
-            </td>
-            <td>
-                {{ event.get_status_display }}
-            </td>
-            <!---MIC-->
-            <td id="event_mic" class="text-nowrap">
-                {% if event.mic %}
-                        {{ event.mic }}
-                {% elif event.is_rig %}
-                    <span class="fas fa-user-slash"></span>
-                {% endif %}
-            </td>
-            <td>
-                {{ event.riskassessment.power_plan|default:"Pending" }}
-            </td>
-        </tr>
-        {% empty %}
-        <tr class="bg-warning">
-            <td colspan="4">No events found</td>
-        </tr>
-        {% endfor %}
-        </tbody>
-    </table>
-</div>

RIGS/templates/partials/event_status.html

@@ -1,4 +1,4 @@
-<div>
+<div id="event_status">
 <span class="badge badge-{% if event.confirmed %}success{% elif event.cancelled %}dark{% else %}warning{% endif %}">Status: {{ event.get_status_display }}</span>
 {% if event.is_rig %}
     {% if event.sum_total > 0 %}

RIGS/templates/partials/event_table.html

@@ -1,105 +1,183 @@
 {% load namewithnotes from filters %}
 {% load markdown_tags %}
-<div class="table-responsive">
+<style>
-    <table class="table mb-0" id="event_table">
+#event_table {
-        <thead>
+    display: grid;
-            <tr>
+    grid-template-columns: max-content auto;
-                <th scope="col">#</th>
+    column-gap: 1em;
-                <th scope="col">Dates & Times</th>
+}
-                <th scope="col">Event Details</th>
+.eventgrid {
-                <th scope="col">MIC</th>
+    display: inherit;
-            </tr>
+    grid-column: 1/5;
-        </thead>
+    grid-template-columns: subgrid;
-        <tbody>
+    padding: 1em;
-        {% for event in events %}
+}
-        <tr class="{% if event.cancelled %}
+.grid-header {
-                    table-secondary
+    border-bottom: 1px solid grey;
-                    {% elif not event.is_rig %}
+    border-top: 1px solid grey;
-                    table-info
+}
-                    {% elif not event.mic %}
+#event_status {
-                    table-danger
+    grid-column-start: 3;
-                    {% elif event.confirmed and event.authorised %}
+}
-                        {% if event.dry_hire or event.riskassessment %}
+#event_mic {
-                            table-success
+    grid-row-start: 1;
-                        {% else %}
+    grid-column-start: 4;
-                            table-warning
+}
-                        {% endif %}
+@media (max-width: 600px) {
-                    {% else %}
+  #event_table {
-                    table-warning
+    grid-template-columns: 1fr !important;
-                    {% endif %}" {% if event.cancelled %}style="opacity: 50% !important;"{% endif %} id="event_row">
+  }
-            <!---Number-->
+  .eventgrid {
-            <th scope="row" id="event_number">{{ event.display_id }}</th>
+    grid-column: 1/1 !important;
-            <!--Dates & Times-->
+    padding: 0.5em;
-            <td id="event_dates" style="text-align: justify;">
+  }
-                {% if not event.cancelled %}
+  .grid-header {
-                    {% if event.meet_at %}
+    display: none;
-                        <span class="text-nowrap">Meet: <strong>{{ event.meet_at|date:"D d/m/Y H:i" }}</strong></span>
+  }
-                    {% endif %}
+  #event_dates {
-                    {% if event.access_at %}
+    order: 2;
-                        <br><span class="text-nowrap">Access: <strong>{{ event.access_at|date:"D d/m/Y H:i" }}</strong></span>
+  }
-                    {% endif %}
+  #event_status {
-                {% endif %}
+    order: 3;
-                <span class="text-nowrap">Start: <strong>{{ event.start_date|date:"D d/m/Y" }}
+  }
-                {% if event.has_start_time %}
+  #event_mic {
-                    {{ event.start_time|date:"H:i" }}
+    grid-row-start: auto;
-                {% endif %}</strong>
+    grid-column-start: 4;
-                </span>
+}
-                {% if event.end_date %}
+}
-                    <br>
+@media (max-width: 900px) {
-                    <span class="text-nowrap">End: {% if event.end_date != event.start_date %}<strong>{{ event.end_date|date:"D d/m/Y"  }}{% endif %}
+  #event_table {
-                    {% if event.has_end_time %}
+    grid-template-columns: max-content;
-                       {{ event.end_time|date:"H:i" }}
+    column-gap: 0.5em;
-                    {% endif %}</strong>
+  }
-                    </span>
+  .eventgrid {
-                {% endif %}
+    grid-column: 1/3;
-            </td>
+    border: 1px solid grey;
-            <!---Details-->
+  }
-            <td id="event_details" class="w-100">
+  #event_dates {
-                <h4>
+    grid-row: 2;
-                    <a href="{% url 'event_detail' event.pk %}">
+    grid-column: 1;
-                        {{ event.name }}
+  }
-                    </a>
+  #event_number {
-                    {% if event.venue %}
+    grid-row: 1;
-                        <small>at {{ event.venue|namewithnotes:'venue_detail' }}</small>
+    grid-column: 1;
-                    {% endif %}
+  }
-                    {% if event.dry_hire %}
+  #event_mic {
-                        <span class="badge badge-secondary">Dry Hire</span>
+    grid-column: 2;
-                    {% endif %}
+  }
-                </h4>
+  #event_status {
-                {% if event.is_rig and not event.cancelled %}
+    grid-column: span 2;
-                    <h5>
+  }
-                        <a href="{{ event.person.get_absolute_url }}">{{ event.person.name }}</a>
+  .grid-header {
-                        {% if event.organisation %}
+    display: none;
-                            for <a href="{{ event.organisation.get_absolute_url }}">{{ event.organisation.name }}</a>
+  }
-                        {% endif %}
+}
-                    </h5>
+dt {
-                {% endif %}
+  float: left;
-                {% if not event.cancelled and event.description %}
+  clear: left;
-                    <p>{{ event.description|markdown }}</p>
+  margin-right: 10px;
-                {% endif %}
+}
-                {% include 'partials/event_status.html' %}
+dd {
-            </td>
+  margin-left: 0px;
-            <!---MIC-->
+}
-            <td id="event_mic" class="text-nowrap">
+</style>
-                {% if event.mic %}
+<div id="event_table">
-                    {% if perms.RIGS.view_profile %}
+    <div class="eventgrid grid-header font-weight-bold">
-                        <a href="{% url 'profile_detail' event.mic.pk %}" class="modal-href">
+        <div id="event_number">#</div>
-                    {% endif %}
+        <div id="event_dates">Dates & Times</div>
-                        <img src="{{ event.mic.profile_picture }}" class="event-mic-photo"/>
+        <div>Event Details</div>
-                        {{ event.mic }}
+        <div id="event_mic">MIC</div>
-                    {% if perms.RIGS.view_profile %}
+    </div>
-                        </a>
+    {% for event in events %}
-                    {% endif %}
+    <div class="eventgrid {% if event.cancelled %}
-                {% elif event.is_rig %}
+    table-secondary
-                    <span class="fas fa-user-slash"></span>
+    {% elif not event.is_rig %}
-                {% endif %}
+    table-info
-            </td>
+    {% elif not event.mic %}
-        </tr>
+    table-danger
-        {% empty %}
+    {% elif event.confirmed and event.authorised %}
-        <tr class="bg-warning">
+    {% if event.dry_hire or event.riskassessment %}
-            <td colspan="4">No events found</td>
+    table-success
-        </tr>
+    {% else %}
-        {% endfor %}
+    table-warning
-        </tbody>
+    {% endif %}
-    </table>
+    {% else %}
+    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>
+    <!--Dates & Times-->
+    <div id="event_dates" style="min-width: 180px;">
+        <dl>
+          {% if not event.cancelled %}
+            {% if event.meet_at %}
+            <dt class="font-weight-normal">Meet:</dt>
+            <dd class="text-nowrap font-weight-bold text-lg-right">{{ event.meet_at|date:"D d/m/Y H:i" }}</dd>
+            {% endif %}
+            {% if event.access_at %}
+            <dt class="font-weight-normal">Access:</dt>
+            <dd class="text-nowrap font-weight-bold text-lg-right">{{ event.access_at|date:"D d/m/Y H:i" }}</dd>
+            {% endif %}
+          {% endif %}
+          <dt class="font-weight-normal">Start:</dt>
+          <dd class="text-nowrap font-weight-bold text-lg-right">{{ event.start_date|date:"D d/m/Y" }}
+            {% if event.has_start_time %}
+              {{ event.start_time|date:"H:i" }}
+            {% endif %}
+          </dd>
+          {% if event.end_date %}
+          <dt class="font-weight-normal">End:</dt>
+          <dd class="text-nowrap font-weight-bold text-lg-right">{{ event.end_date|date:"D d/m/Y" }}
+            {% if event.has_end_time %}
+            {{ event.end_time|date:"H:i" }}
+            {% endif %}
+          </dd>
+          {% endif %}
+        </dl>
+    </div>
+    <!---Details-->
+    <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>
+            </a>
+            {% if event.dry_hire %}
+            <span class="badge badge-secondary">Dry Hire</span>
+            {% endif %}
+            <br class="d-none d-lg-inline">
+            {% if event.venue %}
+            <small>at {{ event.venue|namewithnotes:'venue_detail' }}</small>
+            {% endif %}
+        </h4>
+        {% if event.is_rig and not event.cancelled %}
+        <h5>
+            <a href="{{ event.person.get_absolute_url }}">{{ event.person.name }}</a>
+            {% if event.organisation %}
+            for <a href="{{ event.organisation.get_absolute_url }}">{{ event.organisation.name }}</a>
+            {% endif %}
+        </h5>
+        {% endif %}
+        {% if not event.cancelled and event.description %}
+        <p>{{ event.description|markdown }}</p>
+        {% endif %}
+    </div>
+    {% include 'partials/event_status.html' %}
+    <!---MIC-->
+    <div id="event_mic" class="text-nowrap">
+        <span class="d-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">
+            {% endif %}
+            <img src="{{ event.mic.profile_picture }}" class="event-mic-photo"/>
+            {{ event.mic }}
+            {% if perms.RIGS.view_profile %}
+        </a>
+        {% endif %}
+        {% elif event.is_rig %}
+        <span class="fas fa-exclamation"></span>
+        {% endif %}
+    </div>
+</div>
+{% endfor %}
 </div>

RIGS/templates/rigboard.html

@@ -3,8 +3,8 @@
 
 {% block content %}
 <div class="row align-items-center justify-content-between py-2 align-middle">
-    <div class="col-sm-12 col-md align-middle">
+    <div class="col-sm-12 col-md align-middle d-flex flex-wrap">
-        Key: <span class="table-success mr-1 px-2 rounded">Ready</span><span class="table-warning mr-1 px-2 rounded">Action Required</span><span class="table-danger mr-1 px-2 rounded">Needs MIC</span><span class="table-secondary mr-1 px-2 rounded">Cancelled</span><span class="table-info px-2 rounded">Non-Rig</span>
+        Key: <span class="table-success mr-1 px-2 rounded">Ready</span><span class="table-warning mr-1 px-2 rounded text-nowrap">Action Required</span><span class="table-danger mr-1 px-2 rounded text-nowrap">Needs MIC</span><span class="table-secondary mr-1 px-2 rounded">Cancelled</span><span class="table-info px-2 rounded text-nowrap">Non-Rig</span>
     </div>
     {% if perms.RIGS.add_event %}
     <div class="col text-right">

RIGS/urls.py

@@ -4,7 +4,7 @@ from django.views.decorators.clickjacking import xframe_options_exempt
 from django.views.generic import RedirectView
 
 from PyRIGS.decorators import (api_key_required, has_oembed,
-                               permission_required_with_403, not_estates)
+                               permission_required_with_403)
 from . import views
 
 urlpatterns = [
@@ -42,22 +42,21 @@ urlpatterns = [
          name='venue_update'),
 
     # Rigboard
-    path('rigboard/', not_estates()(views.RigboardIndex.as_view()), name='rigboard'),
+    path('rigboard/', login_required(views.RigboardIndex.as_view()), name='rigboard'),
-    path('rigboard/calendar/', not_estates()(views.WebCalendar.as_view()),
+    path('rigboard/calendar/', login_required()(views.WebCalendar.as_view()),
          name='web_calendar'),
     re_path(r'^rigboard/calendar/(?P<view>(month|week|day))/$',
-            not_estates()(views.WebCalendar.as_view()), name='web_calendar'),
+            login_required()(views.WebCalendar.as_view()), name='web_calendar'),
     re_path(r'^rigboard/calendar/(?P<view>(month|week|day))/(?P<date>(\d{4}-\d{2}-\d{2}))/$',
-            not_estates()(views.WebCalendar.as_view()), name='web_calendar'),
+            login_required()(views.WebCalendar.as_view()), name='web_calendar'),
     path('rigboard/archive/', RedirectView.as_view(permanent=True, pattern_name='event_archive')),
 
-    path('estates/', login_required()(views.EstatesEventList.as_view()), name='estates'),
 
     path('event/<int:pk>/', has_oembed(oembed_view="event_oembed")(views.EventDetail.as_view()),
          name='event_detail'),
     path('event/create/', permission_required_with_403('RIGS.add_event')(views.EventCreate.as_view()),
          name='event_create'),
-    path('event/archive/', not_estates()(views.EventArchive.as_view()),
+    path('event/archive/', login_required()(views.EventArchive.as_view()),
          name='event_archive'),
     path('event/<int:pk>/embed/',
          xframe_options_exempt(login_required(login_url='/user/login/embed/')(views.EventEmbed.as_view())),
@@ -76,7 +75,7 @@ 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>/', not_estates()(views.EventRiskAssessmentDetail.as_view()),
+    path('event/ra/<int:pk>/', login_required(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'),
@@ -86,7 +85,7 @@ urlpatterns = [
 
     path('event/<int:pk>/checklist/', permission_required_with_403('RIGS.add_eventchecklist')(views.EventChecklistCreate.as_view()),
          name='event_ec'),
-    path('event/checklist/<int:pk>/', not_estates()(views.EventChecklistDetail.as_view()),
+    path('event/checklist/<int:pk>/', login_required(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'),
@@ -95,20 +94,20 @@ urlpatterns = [
 
     path('event/<int:pk>/power/', permission_required_with_403('RIGS.add_powertestrecord')(views.PowerTestCreate.as_view()),
          name='event_pt'),
-    path('event/power/<int:pk>/', not_estates()(views.PowerTestDetail.as_view()),
+    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/', not_estates()(views.EventCheckIn.as_view()),
+    path('event/<int:pk>/checkin/', login_required(views.EventCheckIn.as_view()),
          name='event_checkin'),
-    path('event/checkout/', not_estates()(views.EventCheckOut.as_view()),
+    path('event/checkout/', login_required(views.EventCheckOut.as_view()),
          name='event_checkout'),
-    path('event/<int:pk>/checkin/edit/', not_estates()(views.EventCheckInEdit.as_view()),
+    path('event/<int:pk>/checkin/edit/', login_required(views.EventCheckInEdit.as_view()),
          name='edit_checkin'),
-    path('event/<int:pk>/checkin/add/', not_estates()(views.EventCheckInOverride.as_view()),
+    path('event/<int:pk>/checkin/add/', login_required(views.EventCheckInOverride.as_view()),
          name='event_checkin_override'),
 
     path('event/<int:pk>/thread/', permission_required_with_403('RIGS.change_event')(views.CreateForumThread.as_view()), name='event_thread'),

RIGS/views/crud.py

@@ -115,7 +115,7 @@ class VenueDetail(GenericDetailView):
 
 class VenueCreate(GenericCreateView, ModalURLMixin):
     model = models.Venue
-    fields = ['name', 'phone', 'email', 'address', 'notes', 'three_phase_available', 'on_campus']
+    fields = ['name', 'phone', 'email', 'address', 'notes', 'three_phase_available']
 
     def get_success_url(self):
         return self.get_close_url('venue_update', 'venue_detail')
@@ -123,7 +123,7 @@ class VenueCreate(GenericCreateView, ModalURLMixin):
 
 class VenueUpdate(GenericUpdateView, ModalURLMixin):
     model = models.Venue
-    fields = ['name', 'phone', 'email', 'address', 'notes', 'three_phase_available', 'on_campus']
+    fields = ['name', 'phone', 'email', 'address', 'notes', 'three_phase_available']
 
     def get_success_url(self):
         return self.get_close_url('venue_update', 'venue_detail')

RIGS/views/rigboard.py

@@ -26,7 +26,6 @@ from django.utils import timezone
 from django.utils.decorators import method_decorator
 from django.views import generic
 from django.views.decorators.csrf import csrf_exempt
-from django.contrib.auth.mixins import UserPassesTestMixin
 
 from PyRIGS import decorators
 from PyRIGS.views import OEmbedView, is_ajax, ModalURLMixin, PrintView, get_related
@@ -423,17 +422,3 @@ class RecieveForumWebhook(generic.View):
                 event.save()
                 return HttpResponse(status=202)
         return HttpResponse(status=204)
-
-class EstatesEventList(UserPassesTestMixin, generic.TemplateView):
-    template_name = 'estates/estates_event_list.html'
-
-    def get_context_data(self, **kwargs):
-        # get super context
-        context = super().get_context_data(**kwargs)
-        # call out method to get current events
-        context['events'] = models.Event.objects.current_events().filter(venue__on_campus=True, dry_hire=False, is_rig=True)
-        context['page_title'] = "Upcoming Campus Events"
-        return context
-    
-    def test_func(self):
-        return self.request.user.email.endswith('@nottingham.ac.uk')

app.json

@@ -4,7 +4,7 @@
   "scripts": {
     "postdeploy": "python manage.py migrate && python manage.py generateSampleData"
   },
-  "stack": "heroku-20",
+  "stack": "heroku-22",
   "env": {
     "DEBUG": {
       "required": true
@@ -51,7 +51,7 @@
       "url": "heroku/nodejs"
     },
     {
-      "url": "https://github.com/nottinghamtec/heroku-buildpack-python"
+      "url": "heroku/python"
     }
   ]
 }

assets/urls.py

@@ -2,7 +2,7 @@ from django.contrib.auth.decorators import login_required
 from django.urls import path, register_converter
 from django.views.decorators.clickjacking import xframe_options_exempt
 
-from PyRIGS.decorators import has_oembed, permission_required_with_403, not_estates
+from PyRIGS.decorators import has_oembed, permission_required_with_403
 from PyRIGS.views import OEmbedView
 from . import views, converters
 
@@ -10,8 +10,8 @@ register_converter(converters.AssetIDConverter, 'asset')
 register_converter(converters.ListConverter, 'list')
 
 urlpatterns = [
-    path('', not_estates()(views.AssetList.as_view()), name='asset_index'),
+    path('', login_required(views.AssetList.as_view()), name='asset_index'),
-    path('asset/list/', not_estates()(views.AssetList.as_view()), name='asset_list'),
+    path('asset/list/', login_required(views.AssetList.as_view()), name='asset_list'),
     path('asset/id/<asset:pk>/', has_oembed(oembed_view="asset_oembed")(views.AssetDetail.as_view()), name='asset_detail'),
     path('asset/create/', permission_required_with_403('assets.add_asset')
          (views.AssetCreate.as_view()), name='asset_create'),
@@ -19,26 +19,26 @@ urlpatterns = [
          (views.AssetEdit.as_view()), name='asset_update'),
     path('asset/id/<asset:pk>/duplicate/', permission_required_with_403('assets.add_asset')
          (views.AssetDuplicate.as_view()), name='asset_duplicate'),
-    path('asset/id/<asset:pk>/label', not_estates()(views.GenerateLabel.as_view()), name='generate_label'),
+    path('asset/id/<asset:pk>/label', login_required(views.GenerateLabel.as_view()), name='generate_label'),
     path('asset/<list:ids>/list/label', views.GenerateLabels.as_view(), name='generate_labels'),
 
-    path('cables/list/', not_estates()(views.CableList.as_view()), name='cable_list'),
+    path('cables/list/', login_required(views.CableList.as_view()), name='cable_list'),
-    path('cabletype/list/', not_estates()(views.CableTypeList.as_view()), name='cable_type_list'),
+    path('cabletype/list/', login_required(views.CableTypeList.as_view()), name='cable_type_list'),
     path('cabletype/create/', permission_required_with_403('assets.add_cable_type')(views.CableTypeCreate.as_view()), name='cable_type_create'),
     path('cabletype/<int:pk>/update/', permission_required_with_403('assets.change_cable_type')(views.CableTypeUpdate.as_view()), name='cable_type_update'),
-    path('cabletype/<int:pk>/detail/', not_estates()(views.CableTypeDetail.as_view()), name='cable_type_detail'),
+    path('cabletype/<int:pk>/detail/', login_required(views.CableTypeDetail.as_view()), name='cable_type_detail'),
 
     path('asset/id/<str:pk>/embed/',
          xframe_options_exempt(
-           login_required(login_url='/user/login/embed/')(views.AssetEmbed.as_view())),
+             login_required(login_url='/user/login/embed/')(views.AssetEmbed.as_view())),
          name='asset_embed'),
     path('asset/id/<str:pk>/oembed_json/', views.AssetOEmbed.as_view(), name='asset_oembed'),
 
     path('asset/audit/', permission_required_with_403('assets.change_asset')(views.AssetAuditList.as_view()), name='asset_audit_list'),
     path('asset/id/<str:pk>/audit/', permission_required_with_403('assets.change_asset')(views.AssetAudit.as_view()), name='asset_audit'),
 
-    path('supplier/list/', not_estates()(views.SupplierList.as_view()), name='supplier_list'),
+    path('supplier/list/', login_required(views.SupplierList.as_view()), name='supplier_list'),
-    path('supplier/<int:pk>/', not_estates()(views.SupplierDetail.as_view()), name='supplier_detail'),
+    path('supplier/<int:pk>/', login_required(views.SupplierDetail.as_view()), name='supplier_detail'),
     path('supplier/create/', permission_required_with_403('assets.add_supplier')
          (views.SupplierCreate.as_view()), name='supplier_create'),
     path('supplier/<int:pk>/edit/', permission_required_with_403('assets.change_supplier')

gulpfile.js

@@ -79,7 +79,7 @@ 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: false,
+    notify: true,
     open: false,
     port: 8001,
     proxy: '127.0.0.1:8000'

package-lock.json

@@ -34,7 +34,7 @@
         "moment": "^2.29.4",
         "node-sass": "^9.0.0",
         "popper.js": "^1.16.1",
-        "postcss": "^8.4.5",
+        "postcss": "^8.4.31",
         "uglify-js": "^3.14.5"
       },
       "devDependencies": {
@@ -6318,9 +6318,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.23",
+      "version": "8.4.31",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.23.tgz",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
-      "integrity": "sha512-bQ3qMcpF6A/YjR55xtoTr0jGOlnPOKAIMdOWiv0EIT6HVPEaJiJB4NLljSbiHoC2RX7DN5Uvjtpbg1NPdwv1oA==",
+      "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
       "funding": [
         {
           "type": "opencollective",
@@ -13840,9 +13840,9 @@
       "integrity": "sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg=="
     },
     "postcss": {
-      "version": "8.4.23",
+      "version": "8.4.31",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.23.tgz",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
-      "integrity": "sha512-bQ3qMcpF6A/YjR55xtoTr0jGOlnPOKAIMdOWiv0EIT6HVPEaJiJB4NLljSbiHoC2RX7DN5Uvjtpbg1NPdwv1oA==",
+      "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
       "requires": {
         "nanoid": "^3.3.6",
         "picocolors": "^1.0.0",

package.json

@@ -30,7 +30,7 @@
     "moment": "^2.29.4",
     "node-sass": "^9.0.0",
     "popper.js": "^1.16.1",
-    "postcss": "^8.4.5",
+    "postcss": "^8.4.31",
     "uglify-js": "^3.14.5"
   },
   "devDependencies": {

pipeline/source_assets/scss/dark_screen.scss

@@ -77,17 +77,8 @@
         border-collapse: separate !important;
         border-spacing: 0;
     }
-    #event_table tr th {
-      border-right: 0 !important;
-    }
-    #event_table tr td {
-      border-left: 0 !important;
-    }
-    #event_table tr td:not(:last-child) {
-        border-right: 0 !important;
-    }
     @each $color, $value in $theme-colors {
-        .table-#{$color} {
+        table.table-#{$color} {
             > td,th {
                 border: 0.3em solid theme-color-level($color, -6) !important;
             }
@@ -96,6 +87,11 @@
                 background-color: #222 !important;
             }
         }
+        #event_row.table-#{$color} {
+            border: 0.3em solid theme-color-level($color, -6) !important;
+            background-color: #222 !important;
+            color: white !important;
+        }
     }
     del {
       color: black;
@@ -156,4 +152,7 @@
     .modal {
       overflow-y: auto !important; //Bootstrap Dark Theme overrides this to none for some insane reason so we need to change it back
     }
+    .text-muted {
+        color: #c9c9c9 !important;
+    }
 }

templates/generic_detail.html

@@ -1,7 +1,6 @@
 {% extends override|default:"base_rigs.html" %}
 {% load widget_tweaks %}
 {% load button from filters %}
-{% load verbose_name from filters %}
 {% load markdown_tags %}
 
 {% block content %}
@@ -31,11 +30,6 @@
                         <dd>{{ object.three_phase_available|yesno|capfirst }}</dd>
                         {% endif%}
 
-                        {% if object.on_campus is not None %}
-                        <dt>{{ object|verbose_name:"on_campus" }}</dt>
-                        <dd>{{ object.on_campus|yesno|capfirst }}</dd>
-                        {% endif%}
-
                         {% if object.union_account is not None %}
                         <dt>Union Account</dt>
                         <dd>{{ object.union_account|yesno|capfirst }}</dd>

templates/generic_form.html

@@ -78,20 +78,6 @@
                     </div>
                 </div>
                 {% endif %}
-                {% if form.on_campus is not None %}
-                <div class="form-group form-row">
-                    <div class="col-sm-10 col-sm-offset-2">
-                        <div class="checkbox">
-                            <label>
-                                {% render_field form.on_campus %} {{ form.on_campus.label }}
-                            </label>
-                        </div>
-                    </div>
-                    <div class="alert alert-danger">
-                        <span class="fas fa-exclamation"></span> Selecting this option will add <em>all</em> events at this venue to the calendar viewable by UoN Estates.  
-                    </div>
-                </div>
-                {% endif %}
                 {% if form.union_account is not None %}
                 <div class="form-group form-row">
                     <div class="col-sm-10 col-sm-offset-2">

training/templates/level_detail.html

@@ -78,6 +78,11 @@
             </tr>
             {% 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 %}</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 %}</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 %}</li>{% endfor %}</ul></td>
+            </tr>
           </tbody>
         </table>
     </div>

training/urls.py

@@ -1,34 +1,33 @@
 from django.urls import path
 
+from django.contrib.auth.decorators import login_required
 from training.decorators import is_supervisor
 
 from training import views, models
 from versioning.views import VersionHistory
 
-from PyRIGS.decorators import not_estates
-
 urlpatterns = [
-    path('items/', not_estates()(views.ItemList.as_view()), name='item_list'),
+    path('items/', login_required(views.ItemList.as_view()), name='item_list'),
-    path('items/export/', not_estates()(views.ItemListExport.as_view()), name='item_list_export'),
+    path('items/export/', login_required(views.ItemListExport.as_view()), name='item_list_export'),
-    path('item/<int:pk>/qualified_users/', not_estates()(views.ItemQualifications.as_view()), name='item_qualification'),
+    path('item/<int:pk>/qualified_users/', login_required(views.ItemQualifications.as_view()), name='item_qualification'),
 
-    path('trainee/list/', not_estates()(views.TraineeList.as_view()), name='trainee_list'),
+    path('trainee/list/', login_required(views.TraineeList.as_view()), name='trainee_list'),
-    path('trainee/<int:pk>/', not_estates()(views.TraineeDetail.as_view()),
+    path('trainee/<int:pk>/', login_required(views.TraineeDetail.as_view()),
          name='trainee_detail'),
-    path('trainee/<int:pk>/history', not_estates()(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>/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()),
          name='add_qualification'),
     path('trainee/edit_qualification/<int:pk>/', is_supervisor()(views.EditQualification.as_view()),
          name='edit_qualification'),
 
-    path('levels/', not_estates()(views.LevelList.as_view()), name='level_list'),
+    path('levels/', login_required(views.LevelList.as_view()), name='level_list'),
-    path('level/<int:pk>/', not_estates()(views.LevelDetail.as_view()), name='level_detail'),
+    path('level/<int:pk>/', login_required(views.LevelDetail.as_view()), name='level_detail'),
-    path('level/<int:pk>/user/<int:u>/', not_estates()(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('trainee/<int:pk>/level/<int:level_pk>/confirm', is_supervisor()(views.ConfirmLevel.as_view()), name='confirm_level'),
-    path('trainee/<int:pk>/item_record', not_estates()(views.TraineeItemDetail.as_view()), name='trainee_item_detail'),
+    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'),
 ]

users/management/commands/usercleanup.py

@@ -12,8 +12,8 @@ class Command(BaseCommand):
 
     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)
+            # Inactivate users that have not logged in for a year
-            if person.last_login is None or (timezone.now() - person.last_login).days > 365:
+            if person.last_login is not None and (timezone.now() - person.last_login).days > 365:
                 person.is_active = False
                 person.is_approved = False
                 person.save()

users/urls.py

@@ -5,7 +5,7 @@ from django.urls import path
 from django.views.decorators.clickjacking import xframe_options_exempt
 from registration.backends.default.views import RegistrationView
 
-from PyRIGS.decorators import permission_required_with_403, not_estates
+from PyRIGS.decorators import permission_required_with_403
 from users import forms, views
 
 urlpatterns = [
@@ -14,11 +14,11 @@ urlpatterns = [
     path('user/login/', LoginView.as_view(authentication_form=forms.CheckApprovedForm), name='login'),
     path('user/login/embed/', xframe_options_exempt(views.LoginEmbed.as_view()), name='login_embed'),
     # User editing
-    path('user/edit/', not_estates()(views.ProfileUpdateSelf.as_view()),
+    path('user/edit/', login_required(views.ProfileUpdateSelf.as_view()),
          name='profile_update_self'),
-    path('user/reset_api_key', not_estates()(views.ResetApiKey.as_view(permanent=False)),
+    path('user/reset_api_key', login_required(views.ResetApiKey.as_view(permanent=False)),
          name='reset_api_key'),
-    path('user/', not_estates()(views.ProfileDetail.as_view()), name='profile_detail'),
+    path('user/', login_required(views.ProfileDetail.as_view()), name='profile_detail'),
     path('user/<int:pk>/',
          permission_required_with_403('RIGS.view_profile')(views.ProfileDetail.as_view()),
          name='profile_detail'),