diff --git a/RIGS/migrations/0039_auto_20200915_0937.py b/RIGS/migrations/0039_auto_20210123_1910.py
similarity index 76%
rename from RIGS/migrations/0039_auto_20200915_0937.py
rename to RIGS/migrations/0039_auto_20210123_1910.py
index 2a0c5c1a3..0b995e307 100644
--- a/RIGS/migrations/0039_auto_20200915_0937.py
+++ b/RIGS/migrations/0039_auto_20210123_1910.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.1 on 2020-09-15 08:37
+# Generated by Django 3.1.2 on 2021-01-23 19:10
import RIGS.models
from django.conf import settings
@@ -17,19 +17,19 @@ class Migration(migrations.Migration):
name='EventChecklist',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('safe_parking', models.BooleanField(help_text='Vehicles parked safely?
(does not obstruct venue access)')),
- ('safe_packing', models.BooleanField(help_text='Equipment packed away safely?
(including flightcases)')),
- ('exits', models.BooleanField(help_text='Emergency exits clear?')),
- ('trip_hazard', models.BooleanField(help_text='Appropriate barriers around kit and cabling secured?')),
- ('warning_signs', models.BooleanField(help_text='Warning signs in place?
(strobe, smoke, power etc.)')),
- ('ear_plugs', models.BooleanField(help_text='Ear plugs issued to crew where needed?')),
- ('hs_location', models.CharField(help_text='Location of Safety Bag/Box', max_length=255)),
- ('extinguishers_location', models.CharField(help_text='Location of fire extinguishers', max_length=255)),
+ ('date', models.DateField()),
+ ('safe_parking', models.BooleanField(blank=True, help_text='Vehicles parked safely?
(does not obstruct venue access)', null=True)),
+ ('safe_packing', models.BooleanField(blank=True, help_text='Equipment packed away safely?
(including flightcases)', null=True)),
+ ('exits', models.BooleanField(blank=True, help_text='Emergency exits clear?', null=True)),
+ ('trip_hazard', models.BooleanField(blank=True, help_text='Appropriate barriers around kit and cabling secured?', null=True)),
+ ('warning_signs', models.BooleanField(blank=True, help_text='Warning signs in place?
(strobe, smoke, power etc.)')),
+ ('ear_plugs', models.BooleanField(blank=True, help_text='Ear plugs issued to crew where needed?', null=True)),
+ ('hs_location', models.CharField(blank=True, help_text='Location of Safety Bag/Box', max_length=255, null=True)),
+ ('extinguishers_location', models.CharField(blank=True, help_text='Location of fire extinguishers', max_length=255, null=True)),
('rcds', models.BooleanField(blank=True, help_text='RCDs installed where needed and tested?', null=True)),
('supply_test', models.BooleanField(blank=True, help_text='Electrical supplies tested?
(using socket tester)', null=True)),
- ('earthing', models.BooleanField(help_text='Equipment appropriately earthed?
(truss, stage, generators etc)')),
- ('pat', models.BooleanField(help_text='All equipment in PAT period?')),
- ('medium_event', models.BooleanField()),
+ ('earthing', models.BooleanField(blank=True, help_text='Equipment appropriately earthed?
(truss, stage, generators etc)', null=True)),
+ ('pat', models.BooleanField(blank=True, help_text='All equipment in PAT period?', null=True)),
('source_rcd', models.BooleanField(blank=True, help_text='Source RCD protected?
(if cable is more than 3m long) ', null=True)),
('labelling', models.BooleanField(blank=True, help_text='Appropriate and clear labelling on distribution and cabling?', null=True)),
('fd_voltage_l1', models.IntegerField(blank=True, help_text='L1 - N', null=True, verbose_name='First Distro Voltage L1-N')),
@@ -84,30 +84,34 @@ class Migration(migrations.Migration):
name='RiskAssessment',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('nonstandard_equipment', models.BooleanField(help_text="Does the event require any hired in equipment or use of equipment that is not covered by TEC's standard risk assessments and method statements?")),
+ ('nonstandard_equipment', models.BooleanField(help_text="Does the event require any hired in equipment or use of equipment that is not covered by TEC's standard risk assessments and method statements?")),
('nonstandard_use', models.BooleanField(help_text='Are TEC using their equipment in a way that is abnormal?
i.e. Not covered by TECs standard health and safety documentation')),
- ('contractors', models.BooleanField(help_text='Are you using any external contractors?')),
- ('other_companies', models.BooleanField(help_text='Are TEC working with any other companies on site?')),
+ ('contractors', models.BooleanField(help_text='Are you using any external contractors?
i.e. Freelancers/Crewing Companies')),
+ ('other_companies', models.BooleanField(help_text='Are TEC working with any other companies on site?
e.g. TEC is providing the lighting while another company does sound')),
('crew_fatigue', models.BooleanField(help_text='Is crew fatigue likely to be a risk at any point during this event?')),
('general_notes', models.TextField(blank=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?', null=True)),
('big_power', models.BooleanField(help_text='Does the event require larger power supplies than 13A or 16A single phase wall sockets, or draw more than 20A total current?')),
+ ('outside', models.BooleanField(help_text='Is the event outdoors?')),
('generators', models.BooleanField(help_text='Will generators be used?')),
('other_companies_power', models.BooleanField(help_text='Will TEC be supplying power to any other companies?')),
('nonstandard_equipment_power', models.BooleanField(help_text='Does the power plan require the use of any power equipment (distros, dimmers, motor controllers, etc.) that does not belong to TEC?')),
('multiple_electrical_environments', models.BooleanField(help_text='Will the electrical installation occupy more than one electrical environment?')),
('power_notes', models.TextField(blank=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?', null=True)),
+ ('power_plan', models.URLField(blank=True, help_text="Upload your power plan to the Sharepoint and submit a link", null=True, validators=[RIGS.models.validate_url])),
('noise_monitoring', models.BooleanField(help_text='Does the event require noise monitoring or any non-standard procedures in order to comply with health and safety legislation or site rules?')),
('sound_notes', models.TextField(blank=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?', null=True)),
- ('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?")),
('special_structures', models.BooleanField(help_text='Does the event require use of winch stands, motors, MPT Towers, or staging?')),
- ('persons_responsible_structures', models.TextField(blank=True, help_text='Who are the persons on site responsible for their use?', null=True)),
('suspended_structures', models.BooleanField(help_text="Are any structures (excluding projector screens and IWBs) being suspended from TEC's structures?")),
+ ('persons_responsible_structures', models.TextField(blank=True, help_text='Who are the persons on site responsible for their use?', null=True)),
+ ('rigging_plan', models.URLField(blank=True, help_text="Upload your rigging plan to the Sharepoint and submit a link", null=True, validators=[RIGS.models.validate_url])),
('reviewed_at', models.DateTimeField(null=True)),
+ ('supervisor_consulted', models.BooleanField(null=True)),
],
options={
'ordering': ['event'],
@@ -146,7 +150,7 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='riskassessment',
name='power_mic',
- field=models.ForeignKey(blank=True, help_text='Who is the Power MIC?', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='power_mic', to=settings.AUTH_USER_MODEL, verbose_name='Power MIC'),
+ field=models.ForeignKey(blank=True, help_text='Who is the Power MIC? (if yes to the above question, this person must be a Power Technician or Power Supervisor)', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='power_mic', to=settings.AUTH_USER_MODEL, verbose_name='Power MIC'),
),
migrations.AddField(
model_name='riskassessment',
@@ -166,16 +170,21 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='eventchecklist',
name='event',
- field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='RIGS.event'),
+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='checklists', to='RIGS.event'),
),
migrations.AddField(
model_name='eventchecklist',
name='power_mic',
- field=models.ForeignKey(help_text='Who is the Power MIC?', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='checklists', to=settings.AUTH_USER_MODEL, verbose_name='Power MIC'),
+ field=models.ForeignKey(blank=True, help_text='Who is the Power MIC?', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='checklists', to=settings.AUTH_USER_MODEL, verbose_name='Power MIC'),
),
migrations.AddField(
model_name='eventchecklist',
name='reviewed_by',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Reviewer'),
),
+ migrations.AddField(
+ model_name='eventchecklist',
+ name='venue',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='RIGS.venue'),
+ ),
]
diff --git a/RIGS/migrations/0040_auto_20200925_2141.py b/RIGS/migrations/0040_auto_20200925_2141.py
deleted file mode 100644
index a3c0b3a40..000000000
--- a/RIGS/migrations/0040_auto_20200925_2141.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# Generated by Django 3.1 on 2020-09-25 20:41
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('RIGS', '0039_auto_20200915_0937'),
- ]
-
- operations = [
- migrations.RemoveField(
- model_name='eventchecklist',
- name='medium_event',
- ),
- migrations.AddField(
- model_name='eventchecklist',
- name='event_size',
- field=models.IntegerField(choices=[(0, 'Small'), (1, 'Medium'), (2, 'Large')], default=0),
- preserve_default=False,
- ),
- ]
diff --git a/RIGS/migrations/0041_auto_20200929_1749.py b/RIGS/migrations/0041_auto_20200929_1749.py
deleted file mode 100644
index acdc90da3..000000000
--- a/RIGS/migrations/0041_auto_20200929_1749.py
+++ /dev/null
@@ -1,80 +0,0 @@
-# Generated by Django 3.1 on 2020-09-29 16:49
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('RIGS', '0040_auto_20200925_2141'),
- ]
-
- operations = [
- migrations.AlterField(
- model_name='eventchecklist',
- name='ear_plugs',
- field=models.BooleanField(blank=True, help_text='Ear plugs issued to crew where needed?', null=True),
- ),
- migrations.AlterField(
- model_name='eventchecklist',
- name='earthing',
- field=models.BooleanField(blank=True, help_text='Equipment appropriately earthed?
(truss, stage, generators etc)', null=True),
- ),
- migrations.AlterField(
- model_name='eventchecklist',
- name='event',
- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='checklists', to='RIGS.event'),
- ),
- migrations.AlterField(
- model_name='eventchecklist',
- name='event_size',
- field=models.IntegerField(blank=True, choices=[(0, 'Small'), (1, 'Medium'), (2, 'Large')], null=True),
- ),
- migrations.AlterField(
- model_name='eventchecklist',
- name='exits',
- field=models.BooleanField(blank=True, help_text='Emergency exits clear?', null=True),
- ),
- migrations.AlterField(
- model_name='eventchecklist',
- name='extinguishers_location',
- field=models.CharField(blank=True, help_text='Location of fire extinguishers', max_length=255, null=True),
- ),
- migrations.AlterField(
- model_name='eventchecklist',
- name='hs_location',
- field=models.CharField(blank=True, help_text='Location of Safety Bag/Box', max_length=255, null=True),
- ),
- migrations.AlterField(
- model_name='eventchecklist',
- name='pat',
- field=models.BooleanField(blank=True, help_text='All equipment in PAT period?', null=True),
- ),
- migrations.AlterField(
- model_name='eventchecklist',
- name='power_mic',
- field=models.ForeignKey(blank=True, help_text='Who is the Power MIC?', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='checklists', to=settings.AUTH_USER_MODEL, verbose_name='Power MIC'),
- ),
- migrations.AlterField(
- model_name='eventchecklist',
- name='safe_packing',
- field=models.BooleanField(blank=True, help_text='Equipment packed away safely?
(including flightcases)', null=True),
- ),
- migrations.AlterField(
- model_name='eventchecklist',
- name='safe_parking',
- field=models.BooleanField(blank=True, help_text='Vehicles parked safely?
(does not obstruct venue access)', null=True),
- ),
- migrations.AlterField(
- model_name='eventchecklist',
- name='trip_hazard',
- field=models.BooleanField(blank=True, help_text='Appropriate barriers around kit and cabling secured?', null=True),
- ),
- migrations.AlterField(
- model_name='eventchecklist',
- name='warning_signs',
- field=models.BooleanField(blank=True, help_text='Warning signs in place?
(strobe, smoke, power etc.)'),
- ),
- ]
diff --git a/RIGS/migrations/0042_riskassessment_supervisor_consulted.py b/RIGS/migrations/0042_riskassessment_supervisor_consulted.py
deleted file mode 100644
index ad4b758fa..000000000
--- a/RIGS/migrations/0042_riskassessment_supervisor_consulted.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 3.1.2 on 2020-10-10 11:39
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('RIGS', '0041_auto_20200929_1749'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='riskassessment',
- name='supervisor_consulted',
- field=models.BooleanField(null=True),
- ),
- ]
diff --git a/RIGS/migrations/0043_auto_20201010_1320.py b/RIGS/migrations/0043_auto_20201010_1320.py
deleted file mode 100644
index 74aaab871..000000000
--- a/RIGS/migrations/0043_auto_20201010_1320.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# Generated by Django 3.1.2 on 2020-10-10 12:20
-
-from django.db import migrations, models
-import django.db.models.deletion
-import django.utils.timezone
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('RIGS', '0042_riskassessment_supervisor_consulted'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='eventchecklist',
- name='date',
- field=models.DateField(default=django.utils.timezone.now),
- preserve_default=False,
- ),
- migrations.AddField(
- model_name='eventchecklist',
- name='venue',
- field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='RIGS.venue'),
- preserve_default=False,
- ),
- ]
diff --git a/RIGS/migrations/0044_auto_20201024_2031.py b/RIGS/migrations/0044_auto_20201024_2031.py
deleted file mode 100644
index 6403953ba..000000000
--- a/RIGS/migrations/0044_auto_20201024_2031.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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/migrations/0045_auto_20201116_1808.py b/RIGS/migrations/0045_auto_20201116_1808.py
deleted file mode 100644
index 52d243e13..000000000
--- a/RIGS/migrations/0045_auto_20201116_1808.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# Generated by Django 3.1.2 on 2020-11-16 18:08
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('RIGS', '0044_auto_20201024_2031'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='riskassessment',
- name='outside',
- field=models.BooleanField(default=False, help_text='Is the event outdoors?'),
- preserve_default=False,
- ),
- migrations.AlterField(
- model_name='riskassessment',
- name='contractors',
- field=models.BooleanField(help_text='Are you using any external contractors?i.e. Freelancers/Crewing Companies'),
- ),
- migrations.AlterField(
- model_name='riskassessment',
- name='nonstandard_equipment',
- field=models.BooleanField(help_text="Does the event require any hired in equipment or use of equipment that is not covered by TEC's standard risk assessments and method statements?"),
- ),
- migrations.AlterField(
- model_name='riskassessment',
- name='other_companies',
- field=models.BooleanField(help_text='Are TEC working with any other companies on site?e.g. TEC is providing the lighting while another company does sound'),
- ),
- ]
diff --git a/RIGS/migrations/0046_auto_20201213_1625.py b/RIGS/migrations/0046_auto_20201213_1625.py
deleted file mode 100644
index 738d452ef..000000000
--- a/RIGS/migrations/0046_auto_20201213_1625.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# Generated by Django 3.1.2 on 2020-12-13 16:25
-
-import RIGS.models
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('RIGS', '0045_auto_20201116_1808'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='riskassessment',
- name='power_plan',
- field=models.URLField(blank=True, help_text="Upload your power plan to the Sharepoint and submit a link", null=True, validators=[RIGS.models.validate_url]),
- ),
- migrations.AddField(
- model_name='riskassessment',
- name='rigging_plan',
- field=models.URLField(blank=True, help_text="Upload your rigging plan to the Sharepoint and submit a link", null=True, validators=[RIGS.models.validate_url]),
- ),
- migrations.AlterField(
- model_name='riskassessment',
- name='contractors',
- field=models.BooleanField(help_text='Are you using any external contractors?
i.e. Freelancers/Crewing Companies'),
- ),
- migrations.AlterField(
- model_name='riskassessment',
- name='other_companies',
- field=models.BooleanField(help_text='Are TEC working with any other companies on site?
e.g. TEC is providing the lighting while another company does sound'),
- ),
- ]
diff --git a/RIGS/migrations/0047_auto_20201213_1642.py b/RIGS/migrations/0047_auto_20201213_1642.py
deleted file mode 100644
index dcbbfc7fd..000000000
--- a/RIGS/migrations/0047_auto_20201213_1642.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Generated by Django 3.1.2 on 2020-12-13 16:42
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('RIGS', '0046_auto_20201213_1625'),
- ]
-
- operations = [
- migrations.RemoveField(
- model_name='eventchecklist',
- name='event_size',
- ),
- migrations.AddField(
- model_name='riskassessment',
- name='event_size',
- field=models.IntegerField(blank=True, choices=[(0, 'Small'), (1, 'Medium'), (2, 'Large')], null=True),
- ),
- ]
diff --git a/RIGS/migrations/0048_auto_20201227_1749.py b/RIGS/migrations/0048_auto_20201227_1749.py
deleted file mode 100644
index 60703743c..000000000
--- a/RIGS/migrations/0048_auto_20201227_1749.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# Generated by Django 3.1.2 on 2020-12-27 17:49
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('RIGS', '0047_auto_20201213_1642'),
- ]
-
- operations = [
- migrations.RemoveField(
- model_name='riskassessment',
- name='event_size',
- ),
- migrations.AlterField(
- model_name='riskassessment',
- name='power_mic',
- field=models.ForeignKey(blank=True, help_text='Who is the Power MIC? (if yes to the above question, this person must be a Power Technician or Power Supervisor)', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='power_mic', to=settings.AUTH_USER_MODEL, verbose_name='Power MIC'),
- ),
- ]