diff --git a/RIGS/management/commands/generateSampleRIGSData.py b/RIGS/management/commands/generateSampleRIGSData.py index df0258c6..0f89cc07 100644 --- a/RIGS/management/commands/generateSampleRIGSData.py +++ b/RIGS/management/commands/generateSampleRIGSData.py @@ -278,7 +278,7 @@ class Command(BaseCommand): suspended_structures=bool(random.getrandbits(1)), outside=bool(random.getrandbits(1))) if i == 0 or random.randint(0, 1) > 0: # Event 1 and 1 in 10 have a Checklist - models.EventChecklist.objects.create(event=new_event, power_mic=random.choice(self.profiles), + models.EventChecklist.objects.create(event=new_event, safe_parking=bool(random.getrandbits(1)), safe_packing=bool(random.getrandbits(1)), exits=bool(random.getrandbits(1)), @@ -287,6 +287,4 @@ class Command(BaseCommand): ear_plugs=bool(random.getrandbits(1)), hs_location="Locked away safely", extinguishers_location="Somewhere, I forgot", - earthing=bool(random.getrandbits(1)), - pat=bool(random.getrandbits(1)), date=timezone.now(), venue=random.choice(self.venues)) diff --git a/RIGS/migrations/0048_auto_20230509_2043.py b/RIGS/migrations/0048_auto_20230509_2043.py new file mode 100644 index 00000000..85803772 --- /dev/null +++ b/RIGS/migrations/0048_auto_20230509_2043.py @@ -0,0 +1,38 @@ +# Generated by Django 3.2.18 on 2023-05-09 19:43 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('RIGS', '0047_auto_20230508_1946'), + ] + + operations = [ + migrations.RemoveField( + model_name='eventchecklistvehicle', + name='checklist', + ), + migrations.RemoveField( + model_name='eventchecklistvehicle', + name='driver', + ), + migrations.RemoveField( + model_name='eventchecklist', + name='power_mic', + ), + migrations.AddField( + model_name='powertestrecord', + 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.DeleteModel( + name='EventChecklistCrew', + ), + migrations.DeleteModel( + name='EventChecklistVehicle', + ), + ] diff --git a/RIGS/models.py b/RIGS/models.py index 0b7720ea..ded93a4f 100644 --- a/RIGS/models.py +++ b/RIGS/models.py @@ -820,8 +820,6 @@ class EventChecklist(ReviewableModel, RevisionMixin): event = models.ForeignKey('Event', related_name='checklists', on_delete=models.CASCADE) # General - power_mic = models.ForeignKey(settings.AUTH_USER_MODEL, blank=True, null=True, related_name='checklists', - verbose_name="Power MIC", on_delete=models.CASCADE, help_text="Who is the Power MIC?") venue = models.ForeignKey('Venue', on_delete=models.CASCADE) date = models.DateField() @@ -857,6 +855,8 @@ class EventChecklist(ReviewableModel, RevisionMixin): @reversion.register class PowerTestRecord(ReviewableModel, RevisionMixin): event = models.ForeignKey('Event', related_name='power_tests', on_delete=models.CASCADE) + power_mic = models.ForeignKey(settings.AUTH_USER_MODEL, blank=True, null=True, related_name='checklists', + verbose_name="Power MIC", on_delete=models.CASCADE, help_text="Who is the Power MIC?") venue = models.ForeignKey('Venue', on_delete=models.CASCADE) notes = models.TextField(blank=True, default='') # Small Electrical Checks @@ -902,33 +902,3 @@ class PowerTestRecord(ReviewableModel, RevisionMixin): permissions = [ ('review_power', 'Can review Power Test Records') ] - - -@reversion.register -class EventChecklistVehicle(models.Model, RevisionMixin): - checklist = models.ForeignKey('EventChecklist', related_name='vehicles', blank=True, on_delete=models.CASCADE) - vehicle = models.CharField(max_length=255) - driver = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='vehicles', on_delete=models.CASCADE) - - reversion_hide = True - - def __str__(self): - return f"{self.vehicle} driven by {self.driver}" - - -@reversion.register -class EventChecklistCrew(models.Model, RevisionMixin): - checklist = models.ForeignKey('EventChecklist', related_name='crew', blank=True, on_delete=models.CASCADE) - crewmember = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='crewed', on_delete=models.CASCADE) - role = models.CharField(max_length=255) - start = models.DateTimeField() - end = models.DateTimeField() - - reversion_hide = True - - def clean(self): - if self.start > self.end: - raise ValidationError('Unless you\'ve invented time travel, crew can\'t finish before they have started.') - - def __str__(self): - return f"{self.crewmember} ({self.role})" diff --git a/RIGS/templates/hs/event_checklist_detail.html b/RIGS/templates/hs/event_checklist_detail.html index 98b1c815..b7403acd 100644 --- a/RIGS/templates/hs/event_checklist_detail.html +++ b/RIGS/templates/hs/event_checklist_detail.html @@ -30,14 +30,6 @@ {% endif %} -
{{ object|help_text:'power_mic' }}
-
- {% if object.power_mic %} - {{ object.power_mic.name }} - {% else %} - None - {% endif %} -

List vehicles and their drivers