From f8c52803a5ee501a7f3cfcad1b12384fae649de1 Mon Sep 17 00:00:00 2001
From: FreneticScribbler <aj@aronajones.com>
Date: Tue, 19 Oct 2021 13:53:49 +0100
Subject: [PATCH] CHANGE: Ignore cancelled events in HS lists

---
 RIGS/hs.py                         | 7 +++++--
 RIGS/templates/hs_list.html        | 6 ++++--
 RIGS/templates/hs_object_list.html | 4 ++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/RIGS/hs.py b/RIGS/hs.py
index 72719ec7..33fa5d80 100644
--- a/RIGS/hs.py
+++ b/RIGS/hs.py
@@ -82,7 +82,7 @@ class EventRiskAssessmentList(generic.ListView):
     template_name = 'hs_object_list.html'
 
     def get_queryset(self):
-        return self.model.objects.order_by('reviewed_at').select_related('event')
+        return self.model.objects.exclude(event__status=models.Event.CANCELLED).order_by('reviewed_at').select_related('event')
 
     def get_context_data(self, **kwargs):
         context = super(EventRiskAssessmentList, self).get_context_data(**kwargs)
@@ -187,6 +187,9 @@ class EventChecklistList(generic.ListView):
     model = models.EventChecklist
     template_name = 'hs_object_list.html'
 
+    def get_queryset(self):
+        return self.model.objects.exclude(event__status=models.Event.CANCELLED).order_by('reviewed_at').select_related('event')
+
     def get_context_data(self, **kwargs):
         context = super(EventChecklistList, self).get_context_data(**kwargs)
         context['title'] = 'Event Checklist'
@@ -215,7 +218,7 @@ class HSList(generic.ListView):
     template_name = 'hs_list.html'
 
     def get_queryset(self):
-        return models.Event.objects.all().order_by('-start_date').select_related('riskassessment').prefetch_related('checklists')
+        return models.Event.objects.all().exclude(status=models.Event.CANCELLED).order_by('-start_date').select_related('riskassessment').prefetch_related('checklists')
 
     def get_context_data(self, **kwargs):
         context = super(HSList, self).get_context_data(**kwargs)
diff --git a/RIGS/templates/hs_list.html b/RIGS/templates/hs_list.html
index 0a11b99b..221eecd2 100644
--- a/RIGS/templates/hs_list.html
+++ b/RIGS/templates/hs_list.html
@@ -4,10 +4,11 @@
 
 {% block content %}
 <div class="table-responsive">
-    <table class="table mb-0">
+    <table class="table mb-0 table-sm">
         <thead>
             <tr>
                 <th scope="col">Event</th>
+                <th scope="col">MIC</th>
                 <th scope="col">Dates</th>
                 <th scope="col">RA</th>
                 <th scope="col">Checklists</th>
@@ -16,7 +17,8 @@
         <tbody>
         {% for event in object_list %}
         <tr id="event_row">
-            <th scope="row" id="event_number"><a href="{% url 'event_detail' event.pk %}">{{ event }}</a></th>
+            <th scope="row" id="event_number"><a href="{% url 'event_detail' event.pk %}">{{ event }}</a><br><small>{{ event.get_status_display }}</small></th>
+            <td>{% if event.mic is not None %}<a href="{% url 'profile_detail' event.mic.pk %}">{% else %}<span class="text-danger">{% endif %}{{ event.mic }}{% if event.mic is not None %}</a>{% else %}</span>{%endif%}</td>
             <!--Dates-->
             <td id="event_dates">
                 <span><strong>{{ event.start_date|date:"D d/m/Y" }}</strong></span>
diff --git a/RIGS/templates/hs_object_list.html b/RIGS/templates/hs_object_list.html
index c9029a02..c3ebaf4d 100644
--- a/RIGS/templates/hs_object_list.html
+++ b/RIGS/templates/hs_object_list.html
@@ -15,7 +15,7 @@
     <div class="row">
         <div class="col-12">
             <div class="table-responsive">
-                <table class="table mb-0">
+                <table class="table mb-0 table-sm">
                     <thead>
                         <tr>
                             <th scope="col">Event</th>
@@ -32,7 +32,7 @@
                     {% for object in object_list %}
                     <tr class="{% if object.reviewed_by %}table-success{%endif%}">
                         {# General #}
-                        <th scope="row"><a href="{% url 'event_detail' object.event.pk %}">{{ object.event }}</a></th>
+                        <th scope="row"><a href="{% url 'event_detail' object.event.pk %}">{{ object.event }}</a><br><small>{{ object.event.get_status_display }}</small></th>
                         {% for field in object_list.0.fieldz %}
                             <td>{{ object|get_field:field }}</td>
                         {% endfor %}