diff --git a/RIGS/migrations/0044_auto_20201024_2031.py b/RIGS/migrations/0044_auto_20201024_2031.py new file mode 100644 index 00000000..6403953b --- /dev/null +++ b/RIGS/migrations/0044_auto_20201024_2031.py @@ -0,0 +1,28 @@ +# Generated by Django 3.1.2 on 2020-10-24 19:31 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('RIGS', '0043_auto_20201010_1320'), + ] + + operations = [ + migrations.AlterField( + model_name='riskassessment', + name='known_venue', + field=models.BooleanField(help_text='Is this venue new to you (the MIC) or new to TEC?'), + ), + migrations.AlterField( + model_name='riskassessment', + name='safe_loading', + field=models.BooleanField(help_text='Are there any issues preventing a safe load in or out? (e.g. sufficient lighting, flat, not in a crowded area etc.)'), + ), + migrations.AlterField( + model_name='riskassessment', + name='safe_storage', + field=models.BooleanField(help_text='Are there any problems with safe and secure equipment storage?'), + ), + ] diff --git a/RIGS/models.py b/RIGS/models.py index b1917159..c5d61d02 100644 --- a/RIGS/models.py +++ b/RIGS/models.py @@ -636,9 +636,9 @@ class RiskAssessment(models.Model, RevisionMixin): sound_notes = models.TextField(blank=True, null=True, help_text="Did you have to consult a supervisor about any of the above? If so who did you consult and what was the outcome?") # Site - known_venue = models.BooleanField(help_text="Is the event in a venue that you and/or TEC have experience working in?") - safe_loading = models.BooleanField(help_text="Is there a safe load in/out?
e.g. sufficient lighting, flat, not in a crowded area etc.") - safe_storage = models.BooleanField(help_text="Are there areas to safely store equipment?") + known_venue = models.BooleanField(help_text="Is this venue new to you (the MIC) or new to TEC?") + safe_loading = models.BooleanField(help_text="Are there any issues preventing a safe load in or out? (e.g. sufficient lighting, flat, not in a crowded area etc.)") + safe_storage = models.BooleanField(help_text="Are there any problems with safe and secure equipment storage?") area_outside_of_control = models.BooleanField(help_text="Is any part of the work area out of TEC's direct control or openly accessible during the build or breakdown period?") barrier_required = models.BooleanField(help_text="Is there a requirement for TEC to provide any barrier for security or protection of persons/equipment?") nonstandard_emergency_procedure = models.BooleanField(help_text="Does the emergency procedure for the event differ from TEC's standard procedures?") @@ -668,9 +668,9 @@ class RiskAssessment(models.Model, RevisionMixin): 'nonstandard_equipment_power': False, 'multiple_electrical_environments': False, 'noise_monitoring': False, - 'known_venue': True, - 'safe_loading': True, - 'safe_storage': True, + 'known_venue': False, + 'safe_loading': False, + 'safe_storage': False, 'area_outside_of_control': False, 'barrier_required': False, 'nonstandard_emergency_procedure': False, diff --git a/RIGS/templates/event_checklist_form.html b/RIGS/templates/event_checklist_form.html index 09ea241d..aab7acae 100644 --- a/RIGS/templates/event_checklist_form.html +++ b/RIGS/templates/event_checklist_form.html @@ -388,7 +388,7 @@
Electrical Checks for ‘Large’ TEC Events
-

Outside the scope of this assessment. Carry on.

+

Outside the scope of this assessment. I really hope you checked with a supervisor...

diff --git a/RIGS/templates/risk_assessment_form.html b/RIGS/templates/risk_assessment_form.html index d7f163b1..6d8301be 100644 --- a/RIGS/templates/risk_assessment_form.html +++ b/RIGS/templates/risk_assessment_form.html @@ -121,7 +121,7 @@
Site Details
-

If no to any of the below, a site visit normally should be conducted and an assessment of the venue completed and added to TEC's records

+

If YES to any of the below, a site visit must be conducted, and an assessment of the venue completed and added to TEC’s records

{% include 'partials/yes_no_radio.html' with formitem=form.known_venue %} {% include 'partials/yes_no_radio.html' with formitem=form.safe_loading %} {% include 'partials/yes_no_radio.html' with formitem=form.safe_storage %}