From 020d43d5f8d9a6a7b961363e2a968fdd43aaeb54 Mon Sep 17 00:00:00 2001
From: FreneticScribbler <aj@aronajones.com>
Date: Sat, 20 May 2023 16:39:21 +0100
Subject: [PATCH] Do not set power plan field to required on RA

"This might be a problem if the risk assessment is being done by one person and the power plan by another."
---
 RIGS/templates/hs/risk_assessment_form.html | 2 +-
 RIGS/templates/partials/event_status.html   | 2 +-
 RIGS/views/hs.py                            | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/RIGS/templates/hs/risk_assessment_form.html b/RIGS/templates/hs/risk_assessment_form.html
index 28184cd3..0fcef1be 100644
--- a/RIGS/templates/hs/risk_assessment_form.html
+++ b/RIGS/templates/hs/risk_assessment_form.html
@@ -25,7 +25,7 @@
         });
         $('input[type=radio][name=outside], input[type=radio][name=generators], input[type=radio][name=other_companies_power], input[type=radio][name=nonstandard_equipment_power], input[type=radio][name=multiple_electrical_environments]').change(function() {
             $('#{{ form.power_notes.id_for_label }}').prop('required', parseBool(this.value));
-            $('#{{ form.power_plan.id_for_label }}').prop('required', parseBool(this.value));
+            //$('#{{ form.power_plan.id_for_label }}').prop('required', parseBool(this.value));
         });
         $('input[type=radio][name=special_structures]').change(function() {
             $('#{{ form.persons_responsible_structures.id_for_label }}').prop('hidden', !parseBool(this.value)).prop('required', parseBool(this.value));
diff --git a/RIGS/templates/partials/event_status.html b/RIGS/templates/partials/event_status.html
index e4f1ad53..7c521de1 100644
--- a/RIGS/templates/partials/event_status.html
+++ b/RIGS/templates/partials/event_status.html
@@ -15,7 +15,7 @@
         {% endif %}
     {% endif %}
     {% if not event.dry_hire %}
-        {% if event.has_checklist %}
+        {% if event.riskassessment %}
             <a href="{{ event.riskassessment.get_absolute_url }}"><span class="badge badge-success">RA: <span class="fas fa-check{% if event.riskassessment.reviewed_by %}-double{%endif%}"></span></a>
         {% else %}
             <span class="badge badge-danger">RA: <span class="fas fa-times"></span></span>
diff --git a/RIGS/views/hs.py b/RIGS/views/hs.py
index 16672780..0594b7de 100644
--- a/RIGS/views/hs.py
+++ b/RIGS/views/hs.py
@@ -36,6 +36,7 @@ class MarkReviewed(generic.RedirectView):
 class EventRiskAssessmentCreate(HSCreateView):
     model = models.RiskAssessment
     template_name = 'hs/risk_assessment_form.html'
+    form_class = forms.EventRiskAssessmentForm
 
     def get(self, *args, **kwargs):
         epk = kwargs.get('pk')
@@ -49,7 +50,7 @@ class EventRiskAssessmentCreate(HSCreateView):
 
         form = forms.EventRiskAssessmentForm(initial={'venue': "66"})
 
-        return super(EventRiskAssessmentCreate, self).get(self)
+        return super().get(self)
 
     def get_success_url(self):
         return reverse('ra_detail', kwargs={'pk': self.object.pk})