diff --git a/RIGS/forms.py b/RIGS/forms.py
index 914a804f..5a136de1 100644
--- a/RIGS/forms.py
+++ b/RIGS/forms.py
@@ -153,6 +153,10 @@ class EventAuthorisationRequestForm(forms.Form):
class EventRiskAssessmentForm(forms.ModelForm):
+ related_models = {
+ 'power_mic': models.Profile,
+ }
+
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
for name, field in self.fields.items():
diff --git a/RIGS/models.py b/RIGS/models.py
index a84093a1..ac9d9e70 100644
--- a/RIGS/models.py
+++ b/RIGS/models.py
@@ -750,7 +750,7 @@ class RiskAssessment(models.Model, RevisionMixin):
'contractors': False,
'other_companies': False,
'crew_fatigue': False,
- 'big_power': False,
+ # 'big_power': False Doesn't require checking with a super either way
'generators': False,
'other_companies_power': False,
'nonstandard_equipment_power': False,
diff --git a/RIGS/templates/risk_assessment_form.html b/RIGS/templates/risk_assessment_form.html
index 6e8171d9..28184cd3 100644
--- a/RIGS/templates/risk_assessment_form.html
+++ b/RIGS/templates/risk_assessment_form.html
@@ -98,9 +98,9 @@
-
diff --git a/RIGS/views/hs.py b/RIGS/views/hs.py
index 515ccf73..c9b69bda 100644
--- a/RIGS/views/hs.py
+++ b/RIGS/views/hs.py
@@ -6,6 +6,8 @@ from django.views import generic
from reversion import revisions as reversion
from RIGS import models, forms
+from RIGS.views.rigboard import get_related
+from PyRIGS.views import PrintView
class EventRiskAssessmentCreate(generic.CreateView):
@@ -38,6 +40,7 @@ class EventRiskAssessmentCreate(generic.CreateView):
event = models.Event.objects.get(pk=epk)
context['event'] = event
context['page_title'] = f'Create Risk Assessment for Event {event.display_id}'
+ get_related(context['form'], context)
return context
def get_success_url(self):
@@ -63,6 +66,7 @@ class EventRiskAssessmentEdit(generic.UpdateView):
context['event'] = ra.event
context['edit'] = True
context['page_title'] = f'Edit Risk Assessment for Event {ra.event.display_id}'
+ get_related(context['form'], context)
return context
@@ -135,12 +139,7 @@ class EventChecklistEdit(generic.UpdateView):
context['event'] = ec.event
context['edit'] = True
context['page_title'] = f'Edit Event Checklist for Event {ec.event.display_id}'
- form = context['form']
- # Get some other objects to include in the form. Used when there are errors but also nice and quick.
- for field, model in form.related_models.items():
- value = form[field].value()
- if value is not None and value != '':
- context[field] = model.objects.get(pk=value)
+ get_related(context['form'], context)
return context
@@ -224,3 +223,7 @@ class HSList(generic.ListView):
context = super(HSList, self).get_context_data(**kwargs)
context['page_title'] = 'H&S Overview'
return context
+
+
+class RAPrint(PrintView):
+ model = models.RiskAssessment