From 742836486ef1120b713dbec675059e1de26cb8ef Mon Sep 17 00:00:00 2001 From: FreneticScribbler Date: Mon, 8 May 2023 19:59:58 +0100 Subject: [PATCH] Revamp H&S overview, remove individual lists. They were not a good thing. --- RIGS/templates/base_rigs.html | 11 +---- RIGS/templates/hs/hs_list.html | 9 ++++ RIGS/templates/hs/hs_object_list.html | 59 --------------------------- RIGS/urls.py | 4 -- RIGS/views/hs.py | 36 ---------------- 5 files changed, 10 insertions(+), 109 deletions(-) delete mode 100644 RIGS/templates/hs/hs_object_list.html diff --git a/RIGS/templates/base_rigs.html b/RIGS/templates/base_rigs.html index 0ae1a62f..16d06ba9 100644 --- a/RIGS/templates/base_rigs.html +++ b/RIGS/templates/base_rigs.html @@ -34,16 +34,7 @@ {% if perms.RIGS.view_riskassessment %} -
  • - -
    - Overview - Risk Assessments - Event Checklists -
    -
    • +
  • H&S
    • {% endif %} {% if perms.RIGS.view_invoice %}
  • diff --git a/RIGS/templates/hs/hs_list.html b/RIGS/templates/hs/hs_list.html index 221eecd2..f57f6e29 100644 --- a/RIGS/templates/hs/hs_list.html +++ b/RIGS/templates/hs/hs_list.html @@ -12,6 +12,7 @@ Dates RA Checklists + Power Records @@ -35,6 +36,14 @@ Create + + {% for record in event.power_tests.all %} + {% include 'partials/hs_status.html' with event=event object=record view='pt_detail' edit='pt_edit' create='event_pt' review='pt_review' perm=perms.RIGS.review_power %} +
    + {% endfor %} + + {% empty %} diff --git a/RIGS/templates/hs/hs_object_list.html b/RIGS/templates/hs/hs_object_list.html deleted file mode 100644 index c3ebaf4d..00000000 --- a/RIGS/templates/hs/hs_object_list.html +++ /dev/null @@ -1,59 +0,0 @@ -{% extends 'base_rigs.html' %} -{% load paginator from filters %} -{% load help_text from filters %} -{% load verbose_name from filters %} -{% load get_field from filters %} - -{% block title %}{{ title }} List{% endblock %} - -{% block content %} -
    -
    -

    {{title}} List

    -
    -
    -
    -
    -
    - - - - - {# mmm hax #} - {% if object_list.0 != None %} - {% for field in object_list.0.fieldz %} - - {% endfor %} - {% endif %} - - - - - {% for object in object_list %} - - {# General #} - - {% for field in object_list.0.fieldz %} - - {% endfor %} - {# Buttons #} - - - {% empty %} - - - - {% endfor %} - -
    Event{{ object_list.0|verbose_name:field|title }}
    {{ object.event }}
    {{ object.event.get_status_display }}    		{{ object|get_field:field }} - {% include 'partials/hs_status.html' %} -
    Nothing found
    -
    -
    -
    - {% if is_paginated %} -
    - {% paginator %} -
    - {% endif %} -{% endblock %} diff --git a/RIGS/urls.py b/RIGS/urls.py index b614f750..1da01f81 100644 --- a/RIGS/urls.py +++ b/RIGS/urls.py @@ -79,8 +79,6 @@ urlpatterns = [ name='ra_detail'), path('event/ra//edit/', permission_required_with_403('RIGS.change_riskassessment')(views.EventRiskAssessmentEdit.as_view()), name='ra_edit'), - path('event/ra/list', permission_required_with_403('RIGS.view_riskassessment')(views.EventRiskAssessmentList.as_view()), - name='ra_list'), path('event/ra//review/', permission_required_with_403('RIGS.review_riskassessment')(views.MarkReviewed.as_view()), name='ra_review', kwargs={'model': 'RiskAssessment'}), path('event/ra//print/', permission_required_with_403('RIGS.view_riskassessment')(views.RAPrint.as_view()), name='ra_print'), @@ -91,8 +89,6 @@ urlpatterns = [ name='ec_detail'), path('event/checklist//edit/', permission_required_with_403('RIGS.change_eventchecklist')(views.EventChecklistEdit.as_view()), name='ec_edit'), - path('event/checklist/list', permission_required_with_403('RIGS.view_eventchecklist')(views.EventChecklistList.as_view()), - name='ec_list'), path('event/checklist//review/', permission_required_with_403('RIGS.review_eventchecklist')(views.MarkReviewed.as_view()), name='ec_review', kwargs={'model': 'EventChecklist'}), diff --git a/RIGS/views/hs.py b/RIGS/views/hs.py index 6a095091..57f3b014 100644 --- a/RIGS/views/hs.py +++ b/RIGS/views/hs.py @@ -93,24 +93,6 @@ class EventRiskAssessmentDetail(generic.DetailView): return context -class EventRiskAssessmentList(generic.ListView): - paginate_by = 20 - model = models.RiskAssessment - template_name = 'hs/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(EventRiskAssessmentList, self).get_context_data(**kwargs) - context['title'] = 'Risk Assessment' - context['view'] = 'ra_detail' - context['edit'] = 'ra_edit' - context['review'] = 'ra_review' - context['perm'] = 'perms.RIGS.review_riskassessment' - return context - - class EventChecklistDetail(generic.DetailView): model = models.EventChecklist template_name = 'hs/event_checklist_detail.html' @@ -167,24 +149,6 @@ class EventChecklistCreate(HSCreateView): return reverse_lazy('ec_detail', kwargs={'pk': self.object.pk}) -class EventChecklistList(generic.ListView): - paginate_by = 20 - model = models.EventChecklist - template_name = 'hs/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' - context['view'] = 'ec_detail' - context['edit'] = 'ec_edit' - context['review'] = 'ec_review' - context['perm'] = 'perms.RIGS.review_eventchecklist' - return context - - class PowerTestDetail(generic.DetailView): model = models.PowerTestRecord template_name = 'hs/power_detail.html'