From 01a0b8f831fa50821ce06f2e4eda93f1d61cce94 Mon Sep 17 00:00:00 2001 From: Arona Jones Date: Fri, 19 May 2023 10:28:51 +0000 Subject: [PATCH] Add event checkin functionality, seperate power tests into a different form (#536) * Split power related parts of event checklist into a seperate form * Revamp H&S overview, remove individual lists. They were not a good thing. * Remove old 'vehicle/crew' stuff * Very initial version of checkin form * Further work on checkin, add role field etc * Fix tests after form split * Add ability to edit checkins, more validation * Basic checkin/out logic complete * Add homepage checkin for events happening now * Minor improvement to homepage UI * Checkin button turns into checkout button where applicable * UI work * Clicking check out does not redirect the user * Register check in model with the admin site * Add power record status chip, checklist status chip displays number of checklists * Minor fixes * Implement codedoctor suggestions * pep8 * Add data migration for crew/vehicles * Checkin only requires login (no perms) and block users from editing other checkins at Django level --- PyRIGS/views.py | 1 + RIGS/admin.py | 6 + RIGS/forms.py | 111 +++----- .../commands/generateSampleRIGSData.py | 4 +- RIGS/migrations/0046_create_powertests.py | 71 +++++ RIGS/migrations/0047_auto_20230517_0944.py | 41 +++ RIGS/migrations/0048_auto_20230518_1256.py | 156 +++++++++++ RIGS/models.py | 152 ++++++---- RIGS/templates/base_rigs.html | 11 +- RIGS/templates/event_detail.html | 39 +++ RIGS/templates/hs/event_checklist_detail.html | 173 ------------ RIGS/templates/hs/event_checklist_form.html | 262 +----------------- RIGS/templates/hs/eventcheckin_form.html | 105 +++++++ RIGS/templates/hs/hs_list.html | 9 + RIGS/templates/hs/hs_object_list.html | 59 ---- RIGS/templates/hs/power_detail.html | 175 ++++++++++++ RIGS/templates/hs/power_form.html | 203 ++++++++++++++ RIGS/templates/partials/ec_power_info.html | 2 +- .../partials/event_detail_buttons.html | 8 + RIGS/templates/partials/event_status.html | 14 +- RIGS/templates/partials/hs_details.html | 18 +- RIGS/tests/conftest.py | 11 +- RIGS/tests/pages.py | 67 +---- RIGS/tests/test_interaction.py | 66 +---- RIGS/urls.py | 30 +- RIGS/views/hs.py | 237 ++++++++++------ pipeline/source_assets/js/autocompleter.js | 2 +- templates/base.html | 3 + templates/index.html | 8 +- .../commands/generateSampleUserData.py | 5 +- 30 files changed, 1179 insertions(+), 870 deletions(-) create mode 100644 RIGS/migrations/0046_create_powertests.py create mode 100644 RIGS/migrations/0047_auto_20230517_0944.py create mode 100644 RIGS/migrations/0048_auto_20230518_1256.py create mode 100644 RIGS/templates/hs/eventcheckin_form.html delete mode 100644 RIGS/templates/hs/hs_object_list.html create mode 100644 RIGS/templates/hs/power_detail.html create mode 100644 RIGS/templates/hs/power_form.html diff --git a/PyRIGS/views.py b/PyRIGS/views.py index fe7a44e0..372e1af0 100644 --- a/PyRIGS/views.py +++ b/PyRIGS/views.py @@ -48,6 +48,7 @@ class Index(generic.TemplateView): # Displays the current rig count along with def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) context['rig_count'] = models.Event.objects.rig_count() + context['now'] = models.Event.objects.events_in_bounds(timezone.now(), timezone.now()) return context diff --git a/RIGS/admin.py b/RIGS/admin.py index a46a0eee..9fff16ca 100644 --- a/RIGS/admin.py +++ b/RIGS/admin.py @@ -20,6 +20,7 @@ admin.site.register(models.VatRate, VersionAdmin) admin.site.register(models.Event, VersionAdmin) admin.site.register(models.EventItem, VersionAdmin) admin.site.register(models.Invoice, VersionAdmin) +admin.site.register(models.EventCheckIn) @transaction.atomic() # Copied from django-extensions. GenericForeignKey support removed as unnecessary. @@ -206,3 +207,8 @@ class RiskAssessmentAdmin(VersionAdmin): @admin.register(models.EventChecklist) class EventChecklistAdmin(VersionAdmin): list_display = ('id', 'event', 'reviewed_at', 'reviewed_by') + + +@admin.register(models.PowerTestRecord) +class EventChecklistAdmin(VersionAdmin): + list_display = ('id', 'event', 'reviewed_at', 'reviewed_by') diff --git a/RIGS/forms.py b/RIGS/forms.py index 0664875d..c5e5de66 100644 --- a/RIGS/forms.py +++ b/RIGS/forms.py @@ -44,7 +44,7 @@ class EventForm(forms.ModelForm): return simplejson.dumps(items) def __init__(self, *args, **kwargs): - super(EventForm, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) self.fields['items_json'].initial = self._get_items_json self.fields['start_date'].widget.format = '%Y-%m-%d' @@ -200,86 +200,41 @@ class EventChecklistForm(forms.ModelForm): related_models = { 'venue': models.Venue, - 'power_mic': models.Profile, } - # Two possible formats - def parsedatetime(self, date_string): - try: - return timezone.make_aware(datetime.strptime(date_string, '%Y-%m-%dT%H:%M:%S')) - except ValueError: - return timezone.make_aware(datetime.strptime(date_string, '%Y-%m-%dT%H:%M')) - - # There's probably a thousand better ways to do this, but this one is mine - def clean(self): - vehicles = {key: val for key, val in self.data.items() - if key.startswith('vehicle')} - for key in vehicles: - pk = int(key.split('_')[1]) - driver_key = 'driver_' + str(pk) - if (self.data[driver_key] == ''): - raise forms.ValidationError('Add a driver to vehicle ' + str(pk), code='vehicle_mismatch') - else: - try: - item = models.EventChecklistVehicle.objects.get(pk=pk) - except models.EventChecklistVehicle.DoesNotExist: - item = models.EventChecklistVehicle() - - item.vehicle = vehicles['vehicle_' + str(pk)] - item.driver = models.Profile.objects.get(pk=self.data[driver_key]) - item.full_clean('checklist') - - # item does not have a database pk yet as it isn't saved - self.items['v' + str(pk)] = item - - crewmembers = {key: val for key, val in self.data.items() - if key.startswith('crewmember')} - other_fields = ['start', 'role', 'end'] - for key in crewmembers: - pk = int(key.split('_')[1]) - - for field in other_fields: - value = self.data[f'{field}_{pk}'] - if value == '': - raise forms.ValidationError(f'Add a {field} to crewmember {pk}', code=f'{field}_mismatch') - - try: - item = models.EventChecklistCrew.objects.get(pk=pk) - except models.EventChecklistCrew.DoesNotExist: - item = models.EventChecklistCrew() - - item.crewmember = models.Profile.objects.get(pk=self.data['crewmember_' + str(pk)]) - item.start = self.parsedatetime(self.data['start_' + str(pk)]) - item.role = self.data['role_' + str(pk)] - item.end = self.parsedatetime(self.data['end_' + str(pk)]) - item.full_clean('checklist') - - # item does not have a database pk yet as it isn't saved - self.items['c' + str(pk)] = item - - return super(EventChecklistForm, self).clean() - - def save(self, commit=True): - checklist = super(EventChecklistForm, self).save(commit=False) - if (commit): - # Remove all existing, to be recreated from the form - checklist.vehicles.all().delete() - checklist.crew.all().delete() - checklist.save() - - for key in self.items: - item = self.items[key] - reversion.add_to_revision(item) - # finish and save new database items - item.checklist = checklist - item.full_clean() - item.save() - - self.items.clear() - - return checklist - class Meta: model = models.EventChecklist fields = '__all__' exclude = ['reviewed_at', 'reviewed_by'] + + +class PowerTestRecordForm(forms.ModelForm): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + for name, field in self.fields.items(): + if field.__class__ == forms.NullBooleanField: + # Only display yes/no to user, the 'none' is only ever set in the background + field.widget = forms.CheckboxInput() + + class Meta: + model = models.PowerTestRecord + fields = '__all__' + exclude = ['reviewed_at', 'reviewed_by'] + + +class EventCheckInForm(forms.ModelForm): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.fields['time'].initial = timezone.now() + self.fields['role'].initial = "Crew" + + class Meta: + model = models.EventCheckIn + fields = '__all__' + exclude = ['end_time'] + + +class EditCheckInForm(forms.ModelForm): + class Meta: + model = models.EventCheckIn + fields = '__all__' 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/0046_create_powertests.py b/RIGS/migrations/0046_create_powertests.py new file mode 100644 index 00000000..95f1c8e4 --- /dev/null +++ b/RIGS/migrations/0046_create_powertests.py @@ -0,0 +1,71 @@ +# Generated by Django 3.2.16 on 2023-05-08 15:58 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion +import versioning.versioning + +def migrate_old_data(apps, schema_editor): + EventChecklist = apps.get_model('RIGS', 'EventChecklist') + PowerTestRecord = apps.get_model('RIGS', 'PowerTestRecord') + for ec in EventChecklist.objects.all(): + # New highscore for the most pythonic BS I've ever written. + PowerTestRecord.objects.create(event=ec.event, **{i.name:getattr(ec, i.attname) for i in PowerTestRecord._meta.get_fields() if not (i.is_relation or i.auto_created)}) + + +def revert(apps, schema_editor): + apps.get_model('RIGS', 'PowerTestRecord').objects.all().delete() + + +class Migration(migrations.Migration): + + dependencies = [ + ('RIGS', '0045_alter_profile_is_approved'), + ] + + operations = [ + migrations.CreateModel( + name='PowerTestRecord', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('event', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='power_tests', to='RIGS.event')), + ('notes', models.TextField(blank=True, default='')), + ('venue', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='RIGS.venue')), + ('reviewed_at', models.DateTimeField(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(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')), + ('fd_voltage_l2', models.IntegerField(blank=True, help_text='L2 - N', null=True, verbose_name='First Distro Voltage L2-N')), + ('fd_voltage_l3', models.IntegerField(blank=True, help_text='L3 - N', null=True, verbose_name='First Distro Voltage L3-N')), + ('fd_phase_rotation', models.BooleanField(blank=True, help_text='Phase Rotation
(if required)', null=True, verbose_name='Phase Rotation')), + ('fd_earth_fault', models.DecimalField(blank=True, decimal_places=2, help_text='Earth Fault Loop Impedance (ZS)', max_digits=5, null=True, verbose_name='Earth Fault Loop Impedance')), + ('fd_pssc', models.IntegerField(blank=True, help_text='Prospective Short Circuit Current', null=True, verbose_name='PSCC')), + ('w1_description', models.CharField(blank=True, default='', help_text='Description', max_length=255)), + ('w1_polarity', models.BooleanField(blank=True, help_text='Polarity Checked?', null=True)), + ('w1_voltage', models.IntegerField(blank=True, help_text='Voltage', null=True)), + ('w1_earth_fault', models.DecimalField(blank=True, decimal_places=2, help_text='Earth Fault Loop Impedance (ZS)', max_digits=5, null=True, verbose_name='Earth Fault Loop Impedance')), + ('w2_description', models.CharField(blank=True, default='', help_text='Description', max_length=255)), + ('w2_polarity', models.BooleanField(blank=True, help_text='Polarity Checked?', null=True)), + ('w2_voltage', models.IntegerField(blank=True, help_text='Voltage', null=True)), + ('w2_earth_fault', models.DecimalField(blank=True, decimal_places=2, help_text='Earth Fault Loop Impedance (ZS)', max_digits=5, null=True, verbose_name='Earth Fault Loop Impedance')), + ('w3_description', models.CharField(blank=True, default='', help_text='Description', max_length=255)), + ('w3_polarity', models.BooleanField(blank=True, help_text='Polarity Checked?', null=True)), + ('w3_voltage', models.IntegerField(blank=True, help_text='Voltage', null=True)), + ('w3_earth_fault', models.DecimalField(blank=True, decimal_places=2, help_text='Earth Fault Loop Impedance (ZS)', max_digits=5, null=True, verbose_name='Earth Fault Loop Impedance')), + ('all_rcds_tested', models.BooleanField(blank=True, help_text='All circuit RCDs tested?
(using test button)', null=True)), + ('public_sockets_tested', models.BooleanField(blank=True, help_text='Public/Performer accessible circuits tested?
(using socket tester)', null=True)), + ('reviewed_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Reviewer')), + ], + options={ + 'abstract': False, + 'ordering': ['event'], + 'permissions': [('review_power', 'Can review Power Test Records')], + }, + bases=(models.Model, versioning.versioning.RevisionMixin), + ), + migrations.RunPython(migrate_old_data, reverse_code=revert), + ] diff --git a/RIGS/migrations/0047_auto_20230517_0944.py b/RIGS/migrations/0047_auto_20230517_0944.py new file mode 100644 index 00000000..ac02413d --- /dev/null +++ b/RIGS/migrations/0047_auto_20230517_0944.py @@ -0,0 +1,41 @@ +# Generated by Django 3.2.19 on 2023-05-17 08:44 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +def migrate_old_data(apps, schema_editor): + EventChecklist = apps.get_model('RIGS', 'EventChecklist') + EventCheckIn = apps.get_model('RIGS', 'EventCheckIn') + for ec in EventChecklist.objects.all(): + for crew in ec.crew.all(): + vehicle = ec.vehicles.get(driver=crew.crewmember) or None + EventCheckIn.objects.create(event=ec.event, person=crew.crewmember, role=crew.role, time=crew.start, end_time=crew.end, vehicle=vehicle.vehicle) + + +def revert(apps, schema_editor): + apps.get_model('RIGS', 'EventCheckIn').objects.all().delete() + + +class Migration(migrations.Migration): + + dependencies = [ + ('RIGS', '0046_create_powertests'), + ] + + operations = [ + migrations.CreateModel( + name='EventCheckIn', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('time', models.DateTimeField()), + ('role', models.CharField(blank=True, max_length=50)), + ('vehicle', models.CharField(blank=True, max_length=100)), + ('end_time', models.DateTimeField(blank=True, null=True)), + ('event', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='crew', to='RIGS.event')), + ('person', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='checkins', to=settings.AUTH_USER_MODEL)), + ], + ), + migrations.RunPython(migrate_old_data, reverse_code=revert), + ] diff --git a/RIGS/migrations/0048_auto_20230518_1256.py b/RIGS/migrations/0048_auto_20230518_1256.py new file mode 100644 index 00000000..ccd35a82 --- /dev/null +++ b/RIGS/migrations/0048_auto_20230518_1256.py @@ -0,0 +1,156 @@ +# Generated by Django 3.2.19 on 2023-05-18 11:56 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + +class Migration(migrations.Migration): + + dependencies = [ + ('RIGS', '0047_auto_20230517_0944'), + ] + + operations = [ + migrations.RemoveField( + model_name='eventchecklistvehicle', + name='checklist', + ), + migrations.RemoveField( + model_name='eventchecklistvehicle', + name='driver', + ), + migrations.RemoveField( + model_name='eventchecklist', + name='all_rcds_tested', + ), + migrations.RemoveField( + model_name='eventchecklist', + name='earthing', + ), + migrations.RemoveField( + model_name='eventchecklist', + name='fd_earth_fault', + ), + migrations.RemoveField( + model_name='eventchecklist', + name='fd_phase_rotation', + ), + migrations.RemoveField( + model_name='eventchecklist', + name='fd_pssc', + ), + migrations.RemoveField( + model_name='eventchecklist', + name='fd_voltage_l1', + ), + migrations.RemoveField( + model_name='eventchecklist', + name='fd_voltage_l2', + ), + migrations.RemoveField( + model_name='eventchecklist', + name='fd_voltage_l3', + ), + migrations.RemoveField( + model_name='eventchecklist', + name='labelling', + ), + migrations.RemoveField( + model_name='eventchecklist', + name='pat', + ), + migrations.RemoveField( + model_name='eventchecklist', + name='power_mic', + ), + migrations.RemoveField( + model_name='eventchecklist', + name='public_sockets_tested', + ), + migrations.RemoveField( + model_name='eventchecklist', + name='rcds', + ), + migrations.RemoveField( + model_name='eventchecklist', + name='source_rcd', + ), + migrations.RemoveField( + model_name='eventchecklist', + name='supply_test', + ), + migrations.RemoveField( + model_name='eventchecklist', + name='w1_description', + ), + migrations.RemoveField( + model_name='eventchecklist', + name='w1_earth_fault', + ), + migrations.RemoveField( + model_name='eventchecklist', + name='w1_polarity', + ), + migrations.RemoveField( + model_name='eventchecklist', + name='w1_voltage', + ), + migrations.RemoveField( + model_name='eventchecklist', + name='w2_description', + ), + migrations.RemoveField( + model_name='eventchecklist', + name='w2_earth_fault', + ), + migrations.RemoveField( + model_name='eventchecklist', + name='w2_polarity', + ), + migrations.RemoveField( + model_name='eventchecklist', + name='w2_voltage', + ), + migrations.RemoveField( + model_name='eventchecklist', + name='w3_description', + ), + migrations.RemoveField( + model_name='eventchecklist', + name='w3_earth_fault', + ), + migrations.RemoveField( + model_name='eventchecklist', + name='w3_polarity', + ), + migrations.RemoveField( + model_name='eventchecklist', + name='w3_voltage', + ), + 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.AlterField( + model_name='eventchecklist', + name='reviewed_at', + field=models.DateTimeField(blank=True, null=True), + ), + migrations.AlterField( + model_name='powertestrecord', + name='reviewed_at', + field=models.DateTimeField(blank=True, null=True), + ), + migrations.AlterField( + model_name='riskassessment', + name='reviewed_at', + field=models.DateTimeField(blank=True, null=True), + ), + migrations.DeleteModel( + name='EventChecklistCrew', + ), + migrations.DeleteModel( + name='EventChecklistVehicle', + ), + ] diff --git a/RIGS/models.py b/RIGS/models.py index 30fdecd8..550b4df5 100644 --- a/RIGS/models.py +++ b/RIGS/models.py @@ -81,6 +81,10 @@ class Profile(AbstractUser): def __str__(self): return self.name + def current_event(self): + q = EventCheckIn.objects.filter(person=self, end_time=None) + return q.latest('time') if q.exists() else None + class ContactableManager(models.Manager): def search(self, query=None): @@ -405,7 +409,15 @@ class Event(models.Model, RevisionMixin): @property def hs_done(self): - return self.riskassessment is not None and len(self.checklists.all()) > 0 + return self.riskassessment is not None and self.has_checklist and self.has_power + + @property + def has_checklist(self): + return self.checklists.exists() + + @property + def has_power(self): + return self.power_tests.exists() @property def has_start_time(self): @@ -478,6 +490,15 @@ class Event(models.Model, RevisionMixin): else: return bool(self.purchase_order) + @property + def can_check_in(self): + earliest = self.earliest_time + if isinstance(self.earliest_time, datetime.date): + earliest = datetime.datetime.combine(self.start_date, datetime.time(00, 00)) + tz = pytz.timezone(settings.TIME_ZONE) + earliest = tz.localize(earliest) + return not self.dry_hire and earliest <= timezone.now() + objects = EventManager() def get_absolute_url(self): @@ -689,8 +710,21 @@ def validate_url(value): raise ValidationError('URL must point to a location on the TEC Sharepoint') +class ReviewableModel(models.Model): + reviewed_at = models.DateTimeField(null=True, blank=True) + reviewed_by = models.ForeignKey(settings.AUTH_USER_MODEL, blank=True, null=True, + verbose_name="Reviewer", on_delete=models.CASCADE) + + class Meta: + abstract = True + + @cached_property + def fieldz(self): + return [n.name for n in list(self._meta.get_fields()) if n.name != 'reviewed_at' and n.name != 'reviewed_by' and not n.is_relation and not n.auto_created] + + @reversion.register -class RiskAssessment(models.Model, RevisionMixin): +class RiskAssessment(ReviewableModel, RevisionMixin): SMALL = (0, 'Small') MEDIUM = (1, 'Medium') LARGE = (2, 'Large') @@ -738,10 +772,6 @@ class RiskAssessment(models.Model, RevisionMixin): # Blimey that was a lot of options - reviewed_at = models.DateTimeField(null=True) - reviewed_by = models.ForeignKey(settings.AUTH_USER_MODEL, blank=True, null=True, - verbose_name="Reviewer", on_delete=models.CASCADE) - supervisor_consulted = models.BooleanField(null=True) expected_values = { @@ -778,10 +808,6 @@ class RiskAssessment(models.Model, RevisionMixin): ('review_riskassessment', 'Can review Risk Assessments') ] - @cached_property - def fieldz(self): - return [n.name for n in list(self._meta.get_fields()) if n.name != 'reviewed_at' and n.name != 'reviewed_by' and not n.is_relation and not n.auto_created] - @property def event_size(self): # Confirm event size. Check all except generators, since generators entails outside @@ -795,6 +821,12 @@ class RiskAssessment(models.Model, RevisionMixin): def get_event_size_display(self): return self.SIZES[self.event_size][1] + " Event" + def __str__(self): + return f"{self.pk} | {self.event}" + + def get_absolute_url(self): + return reverse('ra_detail', kwargs={'pk': self.pk}) + @property def activity_feed_string(self): return str(self.event) @@ -803,20 +835,12 @@ class RiskAssessment(models.Model, RevisionMixin): def name(self): return str(self) - def get_absolute_url(self): - return reverse('ra_detail', kwargs={'pk': self.pk}) - def __str__(self): - return f"{self.pk} | {self.event}" - - -@reversion.register(follow=['vehicles', 'crew']) -class EventChecklist(models.Model, RevisionMixin): +@reversion.register +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() @@ -830,6 +854,32 @@ class EventChecklist(models.Model, RevisionMixin): hs_location = models.CharField(blank=True, default='', max_length=255, help_text="Location of Safety Bag/Box") extinguishers_location = models.CharField(blank=True, default='', max_length=255, help_text="Location of fire extinguishers") + inverted_fields = [] + + class Meta: + ordering = ['event'] + permissions = [ + ('review_eventchecklist', 'Can review Event Checklists') + ] + + def __str__(self): + return f"{self.pk} - {self.event}" + + @property + def activity_feed_string(self): + return str(self.event) + + def get_absolute_url(self): + return reverse('ec_detail', kwargs={'pk': self.pk}) + + +@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 rcds = models.BooleanField(blank=True, null=True, help_text="RCDs installed where needed and tested?") supply_test = models.BooleanField(blank=True, null=True, help_text="Electrical supplies tested?
(using socket tester)") @@ -865,58 +915,40 @@ class EventChecklist(models.Model, RevisionMixin): all_rcds_tested = models.BooleanField(blank=True, null=True, help_text="All circuit RCDs tested?
(using test button)") public_sockets_tested = models.BooleanField(blank=True, null=True, help_text="Public/Performer accessible circuits tested?
(using socket tester)") - reviewed_at = models.DateTimeField(null=True) - reviewed_by = models.ForeignKey(settings.AUTH_USER_MODEL, blank=True, null=True, - verbose_name="Reviewer", on_delete=models.CASCADE) - - inverted_fields = [] - class Meta: ordering = ['event'] permissions = [ - ('review_eventchecklist', 'Can review Event Checklists') + ('review_power', 'Can review Power Test Records') ] - @cached_property - def fieldz(self): - return [n.name for n in list(self._meta.get_fields()) if n.name != 'reviewed_at' and n.name != 'reviewed_by' and not n.is_relation and not n.auto_created] + def __str__(self): + return f"{self.pk} - {self.event}" @property def activity_feed_string(self): return str(self.event) - def get_absolute_url(self): - return reverse('ec_detail', kwargs={'pk': self.pk}) + +class EventCheckIn(models.Model): + event = models.ForeignKey('Event', related_name='crew', on_delete=models.CASCADE) + person = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='checkins', on_delete=models.CASCADE) + time = models.DateTimeField() + role = models.CharField(max_length=50, blank=True) + vehicle = models.CharField(max_length=100, blank=True) + end_time = models.DateTimeField(null=True, blank=True) def __str__(self): - return f"{self.pk} - {self.event}" - - -@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 + return f"{self.person} on {self.event}" def clean(self): - if self.start > self.end: - raise ValidationError('Unless you\'ve invented time travel, crew can\'t finish before they have started.') + sass = " Please invent time travel and retry." + if self.time > timezone.now(): + raise ValidationError("May not check in in the future." + sass) + if self.end_time and self.end_time < self.time: + raise ValidationError("May not check out before you've checked in." + sass) - def __str__(self): - return f"{self.crewmember} ({self.role})" + def get_absolute_url(self): + return reverse('event_detail', kwargs={'pk': self.event_id}) + + def active(self): + return end_time is not None diff --git a/RIGS/templates/base_rigs.html b/RIGS/templates/base_rigs.html index 0ae1a62f..16d06ba9 100644 --- a/RIGS/templates/base_rigs.html +++ b/RIGS/templates/base_rigs.html @@ -34,16 +34,7 @@ {% if perms.RIGS.view_riskassessment %} -
  • - -
    - Overview - Risk Assessments - Event Checklists -
    -
    • +
  • H&S
    • {% endif %} {% if perms.RIGS.view_invoice %}
  • diff --git a/RIGS/templates/event_detail.html b/RIGS/templates/event_detail.html index b04089fb..a1de143d 100644 --- a/RIGS/templates/event_detail.html +++ b/RIGS/templates/event_detail.html @@ -1,6 +1,8 @@ {% extends request.is_ajax|yesno:"base_ajax.html,base_rigs.html" %} {% load markdown_tags %} +{% load button from filters %} +{% load static %} {% block content %}
    @@ -52,6 +54,43 @@
    + {% if event.can_check_in %} +
    +
    +
    Crew Record
    +
    + + + + + + + + + + + + + {% for crew in object.crew.all %} + + + + + + + + + {% empty %} + + + + {% endfor %} + +
    NameVehicleStart TimeRoleEnd Time{% if request.user.pk is event.mic.pk %} Add{% endif %}
    {{crew.person}}{{crew.vehicle|default:"None"}}{{crew.time}}{{crew.role}}{% if crew.end_time %}{{crew.end_time}}{% else %}{% endif %}{% if crew.end_time %}{% if crew.person.pk == request.user.pk or event.mic.pk == request.user.pk %}{% button 'edit' 'edit_checkin' crew.pk clazz='btn-sm modal-href' %}{% endif %}{%endif%}
    Apparently this event happened by magic...
    +
    +
    + {% endif %} +
    {% if not request.is_ajax and perms.RIGS.view_event %}
    {% include 'partials/event_detail_buttons.html' %} diff --git a/RIGS/templates/hs/event_checklist_detail.html b/RIGS/templates/hs/event_checklist_detail.html index 98b1c815..705e0209 100644 --- a/RIGS/templates/hs/event_checklist_detail.html +++ b/RIGS/templates/hs/event_checklist_detail.html @@ -30,21 +30,7 @@ {% endif %} -
    {{ object|help_text:'power_mic' }}
    -
    - {% if object.power_mic %} - {{ object.power_mic.name }} - {% else %} - None - {% endif %} -
    -

    List vehicles and their drivers

    -
      - {% for i in object.vehicles.all %} -
    • {{i}}
      • - {% endfor %} -
    @@ -82,165 +68,6 @@ -
    -
    Crew Record
    -
    - - - - - - - - - - - {% for crew in object.crew.all %} - - - - - - - {% empty %} - - - - {% endfor %} - -
    CrewmemberStart TimeRoleEnd Time
    {{crew.crewmember}}{{crew.start}}{{crew.role}}{{crew.end}}
    Apparently this event happened by magic...
    -
    -
    -
    -
    Power {% include 'partials/event_size.html' with object=object.event.riskassessment %}
    -
    - {% if object.event.riskassessment.event_size == 0 %} -
    -
    {{ object|help_text:'rcds'|safe }}
    -
    - {{ object.rcds|yesnoi }} -
    -
    {{ object|help_text:'supply_test'|safe }}
    -
    - {{ object.supply_test|yesnoi }} -
    -
    {{ object|help_text:'earthing'|safe }}
    -
    - {{ object.earthing|yesnoi }} -
    -
    {{ object|help_text:'pat'|safe }}
    -
    - {{ object.pat|yesnoi }} -
    -
    - {% else %} -
    -
    {{ object|help_text:'source_rcd'|safe }}
    -
    - {{ object.source_rcd|yesnoi }} -
    -
    {{ object|help_text:'labelling'|safe }}
    -
    - {{ object.labelling|yesnoi }} -
    -
    {{ object|help_text:'earthing'|safe }}
    -
    - {{ object.earthing|yesnoi }} -
    -
    {{ object|help_text:'pat'|safe }}
    -
    - {{ object.pat|yesnoi }} -
    -
    -
    -

    Tests at first distro

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    TestValue
    Voltage
    (cube meter)    		{{ object|help_text:'fd_voltage_l1' }}{{ object|help_text:'fd_voltage_l2' }}{{ object|help_text:'fd_voltage_l3' }}
    {{ object.fd_voltage_l1 }}{{ object.fd_voltage_l2 }}{{ object.fd_voltage_l3 }}
    {{ object|help_text:'fd_phase_rotation'|safe }}{{ object.fd_phase_rotation|yesnoi }}
    {{ object|help_text:'fd_earth_fault'|safe}}{{ object.fd_earth_fault }}
    {{ object|help_text:'fd_pssc'}}{{ object.fd_pssc }}
    -
    -

    Tests at 'Worst Case' points (at least 1 point required)

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    TestPoint 1Point 2Point 3
    {{ object|help_text:'w1_description'|safe}}{{ object.w1_description }}{{ object.w2_description|default:'' }}{{ object.w3_description|default:'' }}
    {{ object|help_text:'w1_polarity'|safe}}{{ object.w1_polarity|yesnoi }}{{ object.w2_polarity|default:''|yesnoi }}{{ object.w3_polarity|default:''|yesnoi }}
    {{ object|help_text:'w1_voltage'|safe}}{{ object.w1_voltage }}{{ object.w2_voltage|default:'' }}{{ object.w3_voltage|default:'' }}
    {{ object|help_text:'w1_earth_fault'|safe}}{{ object.w1_earth_fault }}{{ object.w2_earth_fault|default:'' }}{{ object.w3_earth_fault|default:'' }}
    -
    -
    -
    {{ object|help_text:'all_rcds_tested'|safe }}
    -
    - {{ object.all_rcds_tested|yesnoi }} -
    -
    {{ object|help_text:'public_sockets_tested'|safe }}
    -
    - {{ object.public_sockets_tested|yesnoi }} -
    -
    -
    - {% include 'partials/ec_power_info.html' %} - {% endif %} -
    -
    {% button 'edit' url='ec_edit' pk=object.pk %} {% button 'view' url='event_detail' pk=object.pk text="Event" %} diff --git a/RIGS/templates/hs/event_checklist_form.html b/RIGS/templates/hs/event_checklist_form.html index 6db9f398..ea8183a1 100644 --- a/RIGS/templates/hs/event_checklist_form.html +++ b/RIGS/templates/hs/event_checklist_form.html @@ -13,57 +13,19 @@ {% block preload_js %} {{ block.super }} + {% endblock %} {% block js %} {{ block.super }} - - - {% endblock %} {% block content %}
    {% include 'form_errors.html' %} - {% if edit %} -
    - {% else %} - - {% endif %} + + {% csrf_token %} @@ -94,7 +56,7 @@
    - {% if venue %} {% elif event.venue %} @@ -102,52 +64,6 @@ {% endif %}
    -
    - - -
    -

    List vehicles and their drivers

    -
    - - - - - - - - - - - - - - - {% for i in object.vehicles.all %} - - - - - - {% endfor %} - -
    VehicleDriver
    - -
    -
    -
    - -
    @@ -175,176 +91,6 @@ -
    -
    -
    -
    Crew Record
    -
    -
    - - - - - - - - - - - - - - - - - - - {% for crew in object.crew.all %} - - - - - - - - {% endfor %} - -
    PersonStart TimeRoleEnd Time
    - -
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    - {% if event.riskassessment.event_size == 0 %} -
    -
    -
    -
    Electrical Checks for ‘Small’ TEC Events <6kVA (approx. 26A)
    -
    - {% include 'partials/checklist_checkbox.html' with formitem=form.rcds %} - {% include 'partials/checklist_checkbox.html' with formitem=form.supply_test %} - {% include 'partials/checklist_checkbox.html' with formitem=form.earthing %} - {% include 'partials/checklist_checkbox.html' with formitem=form.pat %} -
    -
    -
    -
    - {% else %} -
    -
    - {% if event.riskassessment.event_size == 1 %} -
    -
    Electrical Checks for ‘Medium’ TEC Events
    -
    - {% else %} -
    -
    Electrical Checks for ‘Large’ TEC Events
    -
    -
    Here be dragons. Ensure you have appeased the Power Gods before continuing... (If you didn't check with a Supervisor, you cannot continue your event!)
    - {% endif %} - {% include 'partials/checklist_checkbox.html' with formitem=form.source_rcd %} - {% include 'partials/checklist_checkbox.html' with formitem=form.labelling %} - {% include 'partials/checklist_checkbox.html' with formitem=form.earthing %} - {% include 'partials/checklist_checkbox.html' with formitem=form.pat %} -
    -

    Tests at first distro

    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    TestValue
    Voltage
    (cube meter)    		{{ form.fd_voltage_l1.help_text }}{{ form.fd_voltage_l2.help_text }}{{ form.fd_voltage_l3.help_text }}
    {% render_field form.fd_voltage_l1 class+="form-control" style="min-width: 5rem;" %}{% render_field form.fd_voltage_l2 class+="form-control" style="min-width: 5rem;" %}{% render_field form.fd_voltage_l3 class+="form-control" style="min-width: 5rem;" %}
    {{form.fd_phase_rotation.help_text|safe}}{% include 'partials/checklist_checkbox.html' with formitem=form.fd_phase_rotation %}
    {{form.fd_earth_fault.help_text|safe}}{% render_field form.fd_earth_fault class+="form-control" %}
    {{form.fd_pssc.help_text|safe}}{% render_field form.fd_pssc class+="form-control" %}
    -
    -
    -

    Tests at 'Worst Case' points (at least 1 point required)

    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    TestPoint 1Point 2Point 3
    {{form.w1_description.help_text|safe}}{% render_field form.w1_description class+="form-control" style="min-width: 5rem;" %}{% render_field form.w2_description class+="form-control" style="min-width: 5rem;" %}{% render_field form.w3_description class+="form-control" style="min-width: 5rem;" %}
    {{form.w1_polarity.help_text|safe}}{% render_field form.w1_polarity %}{% render_field form.w2_polarity %}{% render_field form.w3_polarity %}
    {{form.w1_voltage.help_text|safe}}{% render_field form.w1_voltage class+="form-control" %}{% render_field form.w2_voltage class+="form-control" %}{% render_field form.w3_voltage class+="form-control" %}
    {{form.w1_earth_fault.help_text|safe}}{% render_field form.w1_earth_fault class+="form-control" %}{% render_field form.w2_earth_fault class+="form-control" %}{% render_field form.w3_earth_fault class+="form-control" %}
    -
    -
    - {% include 'partials/checklist_checkbox.html' with formitem=form.all_rcds_tested %} - {% include 'partials/checklist_checkbox.html' with formitem=form.public_sockets_tested %} - {% include 'partials/ec_power_info.html' %} -
    -
    -
    -
    - {% endif %}
    {% button 'submit' %} diff --git a/RIGS/templates/hs/eventcheckin_form.html b/RIGS/templates/hs/eventcheckin_form.html new file mode 100644 index 00000000..f6c80995 --- /dev/null +++ b/RIGS/templates/hs/eventcheckin_form.html @@ -0,0 +1,105 @@ +{% extends request.is_ajax|yesno:'base_ajax.html,base_rigs.html' %} +{% load widget_tweaks %} +{% load static %} +{% load button from filters %} + +{% block css %} + {{ block.super }} + + +{% endblock %} + +{% block preload_js %} + {{ block.super }} + + +{% endblock %} + +{% block js %} + {{ block.super }} + + + +{% endblock %} + +{% block content %} +
    + {% include 'form_errors.html' %} + + + {% if not request.is_ajax and self.request.user.pk is form.event.mic.pk %} +
    + +
    + +
    +
    + {% else %} + + {% endif %} + {% csrf_token %} +
    + +
    + {% render_field form.time class+="form-control" %} +
    +
    +
    + +
    +
    + + + +
    +
    + {% render_field form.role class+="form-control" placeholder="Other (enter text)" %} +
    +
    +
    +
    + +
    +
    + + +
    +
    + {% render_field form.vehicle class+="form-control" placeholder="Other (enter text)" %} +
    +
    +
    + {% if edit or manual %} +
    + +
    + {% render_field form.end_time class+="form-control" %} +
    +
    + {% endif %} + {% if not request.is_ajax %} +
    +
    + {% button 'submit' %} +
    +
    + {% endif %} + +
    +{% endblock %} + +{% block footer %} +
    + +
    +{% endblock %} diff --git a/RIGS/templates/hs/hs_list.html b/RIGS/templates/hs/hs_list.html index 221eecd2..f57f6e29 100644 --- a/RIGS/templates/hs/hs_list.html +++ b/RIGS/templates/hs/hs_list.html @@ -12,6 +12,7 @@ Dates RA Checklists + Power Records @@ -35,6 +36,14 @@ Create + + {% for record in event.power_tests.all %} + {% include 'partials/hs_status.html' with event=event object=record view='pt_detail' edit='pt_edit' create='event_pt' review='pt_review' perm=perms.RIGS.review_power %} +
    + {% endfor %} + + {% empty %} diff --git a/RIGS/templates/hs/hs_object_list.html b/RIGS/templates/hs/hs_object_list.html deleted file mode 100644 index c3ebaf4d..00000000 --- a/RIGS/templates/hs/hs_object_list.html +++ /dev/null @@ -1,59 +0,0 @@ -{% extends 'base_rigs.html' %} -{% load paginator from filters %} -{% load help_text from filters %} -{% load verbose_name from filters %} -{% load get_field from filters %} - -{% block title %}{{ title }} List{% endblock %} - -{% block content %} -
    -
    -

    {{title}} List

    -
    -
    -
    -
    -
    - - - - - {# mmm hax #} - {% if object_list.0 != None %} - {% for field in object_list.0.fieldz %} - - {% endfor %} - {% endif %} - - - - - {% for object in object_list %} - - {# General #} - - {% for field in object_list.0.fieldz %} - - {% endfor %} - {# Buttons #} - - - {% empty %} - - - - {% endfor %} - -
    Event{{ object_list.0|verbose_name:field|title }}
    {{ object.event }}
    {{ object.event.get_status_display }}    		{{ object|get_field:field }} - {% include 'partials/hs_status.html' %} -
    Nothing found
    -
    -
    -
    - {% if is_paginated %} -
    - {% paginator %} -
    - {% endif %} -{% endblock %} diff --git a/RIGS/templates/hs/power_detail.html b/RIGS/templates/hs/power_detail.html new file mode 100644 index 00000000..d8253248 --- /dev/null +++ b/RIGS/templates/hs/power_detail.html @@ -0,0 +1,175 @@ +{% extends request.is_ajax|yesno:"base_ajax.html,base_rigs.html" %} +{% load help_text from filters %} +{% load profile_by_index from filters %} +{% load yesnoi from filters %} +{% load button from filters %} + +{% block content %} +
    +
    + {% button 'edit' url='pt_edit' pk=object.pk %} + {% button 'view' url='event_detail' pk=object.event.pk text="Event" %} + {% include 'partials/review_status.html' with perm=perms.RIGS.review_power review='pt_review' %} +
    +
    +
    +
    {% include 'partials/event_size.html' with object=object.event.riskassessment %}
    +
    +
    +
    {{ object|help_text:'power_mic' }}
    +
    + {% if object.power_mic %} + {{ object.power_mic.name }} + {% else %} + None + {% endif %} +
    +
    Venue
    +
    + {% if object.venue %} + + {{ object.venue }} + + {% endif %} +
    +
    Notes
    +
    + {{ object.notes }} +
    +
    + {% if object.event.riskassessment.event_size == 0 %} +
    +
    {{ object|help_text:'rcds'|safe }}
    +
    + {{ object.rcds|yesnoi }} +
    +
    {{ object|help_text:'supply_test'|safe }}
    +
    + {{ object.supply_test|yesnoi }} +
    +
    {{ object|help_text:'earthing'|safe }}
    +
    + {{ object.earthing|yesnoi }} +
    +
    {{ object|help_text:'pat'|safe }}
    +
    + {{ object.pat|yesnoi }} +
    +
    + {% else %} +
    +
    {{ object|help_text:'source_rcd'|safe }}
    +
    + {{ object.source_rcd|yesnoi }} +
    +
    {{ object|help_text:'labelling'|safe }}
    +
    + {{ object.labelling|yesnoi }} +
    +
    {{ object|help_text:'earthing'|safe }}
    +
    + {{ object.earthing|yesnoi }} +
    +
    {{ object|help_text:'pat'|safe }}
    +
    + {{ object.pat|yesnoi }} +
    +
    +
    +

    Tests at first distro

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    TestValue
    Voltage
    (cube meter)    		{{ object|help_text:'fd_voltage_l1' }}{{ object|help_text:'fd_voltage_l2' }}{{ object|help_text:'fd_voltage_l3' }}
    {{ object.fd_voltage_l1 }}{{ object.fd_voltage_l2 }}{{ object.fd_voltage_l3 }}
    {{ object|help_text:'fd_phase_rotation'|safe }}{{ object.fd_phase_rotation|yesnoi }}
    {{ object|help_text:'fd_earth_fault'|safe}}{{ object.fd_earth_fault }}
    {{ object|help_text:'fd_pssc'}}{{ object.fd_pssc }}
    +
    +

    Tests at 'Worst Case' points (at least 1 point required)

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    TestPoint 1Point 2Point 3
    {{ object|help_text:'w1_description'|safe}}{{ object.w1_description }}{{ object.w2_description|default:'' }}{{ object.w3_description|default:'' }}
    {{ object|help_text:'w1_polarity'|safe}}{{ object.w1_polarity|yesnoi }}{{ object.w2_polarity|default:''|yesnoi }}{{ object.w3_polarity|default:''|yesnoi }}
    {{ object|help_text:'w1_voltage'|safe}}{{ object.w1_voltage }}{{ object.w2_voltage|default:'' }}{{ object.w3_voltage|default:'' }}
    {{ object|help_text:'w1_earth_fault'|safe}}{{ object.w1_earth_fault }}{{ object.w2_earth_fault|default:'' }}{{ object.w3_earth_fault|default:'' }}
    +
    +
    +
    {{ object|help_text:'all_rcds_tested'|safe }}
    +
    + {{ object.all_rcds_tested|yesnoi }} +
    +
    {{ object|help_text:'public_sockets_tested'|safe }}
    +
    + {{ object.public_sockets_tested|yesnoi }} +
    +
    +
    + {% include 'partials/ec_power_info.html' %} + {% endif %} +
    +
    +
    +{% button 'edit' url='ec_edit' pk=object.pk %} +{% button 'view' url='event_detail' pk=object.pk text="Event" %} +{% include 'partials/review_status.html' with perm=perms.RIGS.review_eventchecklist review='ec_review' %} +
    +
    +{% include 'partials/last_edited.html' with target="eventchecklist_history" %} +
    +{% endblock %} diff --git a/RIGS/templates/hs/power_form.html b/RIGS/templates/hs/power_form.html new file mode 100644 index 00000000..315175b7 --- /dev/null +++ b/RIGS/templates/hs/power_form.html @@ -0,0 +1,203 @@ +{% extends request.is_ajax|yesno:'base_ajax.html,base_rigs.html' %} +{% load widget_tweaks %} +{% load static %} +{% load help_text from filters %} +{% load profile_by_index from filters %} +{% load button from filters %} + +{% block css %} + {{ block.super }} + +{% endblock %} + +{% block preload_js %} + {{ block.super }} + +{% endblock %} + +{% block js %} + {{ block.super }} + + +{% endblock %} + +{% block content %} +
    + {% include 'form_errors.html' %} + {% if edit %} +
    + {% else %} + + {% endif %} + + {% csrf_token %} +
    +
    +
    +
    Event Information
    +
    +
    +
    Event Date
    +
    {{ event.start_date}}{%if event.end_date %}-{{ event.end_date}}{%endif%}
    +
    Event Name
    +
    {{ event.name }}
    +
    Client
    +
    {{ event.person }}
    +
    Event Size
    +
    {% include 'partials/event_size.html' with object=event.riskassessment %}
    +
    +
    +
    + + +
    +
    + + +
    + + {% render_field form.notes class+="form-control" %} +
    +
    +
    +
    + {% if event.riskassessment.event_size == 0 %} +
    +
    +
    +
    Electrical Checks for ‘Small’ TEC Events <6kVA (approx. 26A)
    +
    + {% include 'partials/checklist_checkbox.html' with formitem=form.rcds %} + {% include 'partials/checklist_checkbox.html' with formitem=form.supply_test %} + {% include 'partials/checklist_checkbox.html' with formitem=form.earthing %} + {% include 'partials/checklist_checkbox.html' with formitem=form.pat %} +
    +
    +
    +
    + {% else %} +
    +
    + {% if event.riskassessment.event_size == 1 %} +
    +
    Electrical Checks for ‘Medium’ TEC Events
    +
    + {% else %} +
    +
    Electrical Checks for ‘Large’ TEC Events
    +
    +
    Here be dragons. Ensure you have appeased the Power Gods before continuing... (If you didn't check with a Supervisor, you cannot continue your event!)
    + {% endif %} + {% include 'partials/checklist_checkbox.html' with formitem=form.source_rcd %} + {% include 'partials/checklist_checkbox.html' with formitem=form.labelling %} + {% include 'partials/checklist_checkbox.html' with formitem=form.earthing %} + {% include 'partials/checklist_checkbox.html' with formitem=form.pat %} +
    +

    Tests at first distro

    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    TestValue
    Voltage
    (cube meter)    		{{ form.fd_voltage_l1.help_text }}{{ form.fd_voltage_l2.help_text }}{{ form.fd_voltage_l3.help_text }}
    {% render_field form.fd_voltage_l1 class+="form-control" style="min-width: 5rem;" %}{% render_field form.fd_voltage_l2 class+="form-control" style="min-width: 5rem;" %}{% render_field form.fd_voltage_l3 class+="form-control" style="min-width: 5rem;" %}
    {{form.fd_phase_rotation.help_text|safe}}{% include 'partials/checklist_checkbox.html' with formitem=form.fd_phase_rotation %}
    {{form.fd_earth_fault.help_text|safe}}{% render_field form.fd_earth_fault class+="form-control" %}
    {{form.fd_pssc.help_text|safe}}{% render_field form.fd_pssc class+="form-control" %}
    +
    +
    +

    Tests at 'Worst Case' points (at least 1 point required)

    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    TestPoint 1Point 2Point 3
    {{form.w1_description.help_text|safe}}{% render_field form.w1_description class+="form-control" style="min-width: 5rem;" %}{% render_field form.w2_description class+="form-control" style="min-width: 5rem;" %}{% render_field form.w3_description class+="form-control" style="min-width: 5rem;" %}
    {{form.w1_polarity.help_text|safe}}{% render_field form.w1_polarity %}{% render_field form.w2_polarity %}{% render_field form.w3_polarity %}
    {{form.w1_voltage.help_text|safe}}{% render_field form.w1_voltage class+="form-control" %}{% render_field form.w2_voltage class+="form-control" %}{% render_field form.w3_voltage class+="form-control" %}
    {{form.w1_earth_fault.help_text|safe}}{% render_field form.w1_earth_fault class+="form-control" %}{% render_field form.w2_earth_fault class+="form-control" %}{% render_field form.w3_earth_fault class+="form-control" %}
    +
    +
    + {% include 'partials/checklist_checkbox.html' with formitem=form.all_rcds_tested %} + {% include 'partials/checklist_checkbox.html' with formitem=form.public_sockets_tested %} + {% include 'partials/ec_power_info.html' %} +
    +
    +
    +
    + {% endif %} +
    +
    + {% button 'submit' %} +
    +
    + +
    +{% endblock %} diff --git a/RIGS/templates/partials/ec_power_info.html b/RIGS/templates/partials/ec_power_info.html index 8dd1f92d..8273f625 100644 --- a/RIGS/templates/partials/ec_power_info.html +++ b/RIGS/templates/partials/ec_power_info.html @@ -47,6 +47,6 @@ -

    Voltage Drop on Circuit: 5% (approx. 12v)

    +

    Voltage Drop on Circuit: ≤5% (approx. 12v)

    diff --git a/RIGS/templates/partials/event_detail_buttons.html b/RIGS/templates/partials/event_detail_buttons.html index f04f20f8..e393dab2 100644 --- a/RIGS/templates/partials/event_detail_buttons.html +++ b/RIGS/templates/partials/event_detail_buttons.html @@ -49,5 +49,13 @@ {% endif %} Subhire Insurance Form + + {% if event.can_check_in %} + {% if request.user.current_event %} + Check Out + {% else %} + Check In + {% endif %} + {% endif %} {% endif %}
    diff --git a/RIGS/templates/partials/event_status.html b/RIGS/templates/partials/event_status.html index cb93b8d3..e4f1ad53 100644 --- a/RIGS/templates/partials/event_status.html +++ b/RIGS/templates/partials/event_status.html @@ -15,19 +15,21 @@ {% endif %} {% endif %} {% if not event.dry_hire %} - {% if event.riskassessment %} + {% if event.has_checklist %} RA: {% else %} RA: {% endif %} - {% endif %} - {% if not event.dry_hire %} - {% if event.hs_done %} - {# TODO Display status of all checklists #} - Checklist: + {% if event.has_checklist %} + Checklist: {% if event.checklists.count > 1 %}({{event.checklists.count}}){% endif %} {% else %} Checklist: {% endif %} + {% if event.has_power %} + Power Record: {% if event.power_tests.count > 1 %}({{event.power_tests.count}}){% endif %} + {% else %} + Power Record: + {% endif %} {% endif %} {% if perms.RIGS.view_invoice %} {% if event.invoice %} diff --git a/RIGS/templates/partials/hs_details.html b/RIGS/templates/partials/hs_details.html index 0decf382..edafa608 100644 --- a/RIGS/templates/partials/hs_details.html +++ b/RIGS/templates/partials/hs_details.html @@ -10,10 +10,18 @@
    Event Checklists:
    {% for checklist in event.checklists.all %} - {% include 'partials/hs_status.html' with event=event object=checklist view='ec_detail' edit='ec_edit' create='event_ec' review='ec_review' perm=perms.RIGS.review_eventchecklist %} -
    - {% endfor %} - + {% include 'partials/hs_status.html' with event=event object=checklist view='ec_detail' edit='ec_edit' create='event_ec' review='ec_review' perm=perms.RIGS.review_eventchecklist %} +
    + {% endfor %} + +
    +
    Power Test Records:
    + {% for record in event.power_tests.all %} + {% include 'partials/hs_status.html' with event=event object=record view='pt_detail' edit='pt_edit' create='event_pt' review='pt_review' perm=perms.RIGS.review_power %} +
    + {% endfor %} +
    diff --git a/RIGS/tests/conftest.py b/RIGS/tests/conftest.py index 835d0bae..bcb4add9 100644 --- a/RIGS/tests/conftest.py +++ b/RIGS/tests/conftest.py @@ -43,15 +43,22 @@ def venue(db): @pytest.fixture # TODO parameterise with Event sizes def checklist(basic_event, venue, admin_user, ra): - checklist = models.EventChecklist.objects.create(event=basic_event, power_mic=admin_user, safe_parking=False, + checklist = models.EventChecklist.objects.create(event=basic_event, safe_parking=False, safe_packing=False, exits=False, trip_hazard=False, warning_signs=False, ear_plugs=False, hs_location="Locked away safely", - extinguishers_location="Somewhere, I forgot", earthing=False, pat=False, + extinguishers_location="Somewhere, I forgot", date=timezone.now(), venue=venue) yield checklist checklist.delete() +@pytest.fixture +def power_test(basic_event, venue, admin_user, ra): + power_test = models.PowerTestRecord.objects.create(event=basic_event, venue=venue) + yield power_test + power_test.delete() + + @pytest.fixture def many_events(db, admin_user, scope="class"): many_events = { diff --git a/RIGS/tests/pages.py b/RIGS/tests/pages.py index 774a8362..7745c0c1 100644 --- a/RIGS/tests/pages.py +++ b/RIGS/tests/pages.py @@ -230,11 +230,6 @@ class CreateEventChecklist(FormPage): URL_TEMPLATE = 'event/{event_id}/checklist' _submit_locator = (By.XPATH, "//button[@type='submit' and contains(., 'Save')]") - _power_mic_selector = (By.XPATH, "//div[select[@id='id_power_mic']]") - _add_vehicle_locator = (By.XPATH, "//button[contains(., 'Vehicle')]") - _add_crew_locator = (By.XPATH, "//button[contains(., 'Crew')]") - _vehicle_row_locator = ('xpath', "//tr[@id[starts-with(., 'vehicle') and not(contains(.,'new'))]]") - _crew_row_locator = ('xpath', "//tr[@id[starts-with(., 'crew') and not(contains(.,'new'))]]") form_items = { 'safe_parking': (regions.CheckBox, (By.ID, 'id_safe_parking')), @@ -245,6 +240,20 @@ class CreateEventChecklist(FormPage): 'ear_plugs': (regions.CheckBox, (By.ID, 'id_ear_plugs')), 'hs_location': (regions.TextBox, (By.ID, 'id_hs_location')), 'extinguishers_location': (regions.TextBox, (By.ID, 'id_extinguishers_location')), + } + + @property + def success(self): + return '{event_id}' not in self.driver.current_url + + +class CreatePowerTestRecord(FormPage): + URL_TEMPLATE = 'event/{event_id}/power' + + _submit_locator = (By.XPATH, "//button[@type='submit' and contains(., 'Save')]") + _power_mic_selector = (By.XPATH, "//div[select[@id='id_power_mic']]") + + form_items = { 'rcds': (regions.CheckBox, (By.ID, 'id_rcds')), 'supply_test': (regions.CheckBox, (By.ID, 'id_supply_test')), 'earthing': (regions.CheckBox, (By.ID, 'id_earthing')), @@ -263,58 +272,10 @@ class CreateEventChecklist(FormPage): 'w1_earth_fault': (regions.TextBox, (By.ID, 'id_w1_earth_fault')), } - def add_vehicle(self): - self.find_element(*self._add_vehicle_locator).click() - - def add_crew(self): - self.find_element(*self._add_crew_locator).click() - @property def power_mic(self): return regions.BootstrapSelectElement(self, self.find_element(*self._power_mic_selector)) - @property - def vehicles(self): - return [self.VehicleRow(self, el) for el in self.find_elements(*self._vehicle_row_locator)] - - class VehicleRow(Region): - _name_locator = ('xpath', ".//input") - _select_locator = ('xpath', ".//div[contains(@class,'bootstrap-select')]/..") - - @property - def name(self): - return regions.TextBox(self, self.root.find_element(*self._name_locator)) - - @property - def vehicle(self): - return regions.BootstrapSelectElement(self, self.root.find_element(*self._select_locator)) - - @property - def crew(self): - return [self.CrewRow(self, el) for el in self.find_elements(*self._crew_row_locator)] - - class CrewRow(Region): - _select_locator = ('xpath', ".//div[contains(@class,'bootstrap-select')]/..") - _start_time_locator = ('xpath', ".//input[@name[starts-with(., 'start') and not(contains(.,'new'))]]") - _end_time_locator = ('xpath', ".//input[@name[starts-with(., 'end') and not(contains(.,'new'))]]") - _role_locator = ('xpath', ".//input[@name[starts-with(., 'role') and not(contains(.,'new'))]]") - - @property - def crewmember(self): - return regions.BootstrapSelectElement(self, self.root.find_element(*self._select_locator)) - - @property - def start_time(self): - return regions.DateTimePicker(self, self.root.find_element(*self._start_time_locator)) - - @property - def end_time(self): - return regions.DateTimePicker(self, self.root.find_element(*self._end_time_locator)) - - @property - def role(self): - return regions.TextBox(self, self.root.find_element(*self._role_locator)) - @property def success(self): return '{event_id}' not in self.driver.current_url diff --git a/RIGS/tests/test_interaction.py b/RIGS/tests/test_interaction.py index 645bfc22..6239b307 100644 --- a/RIGS/tests/test_interaction.py +++ b/RIGS/tests/test_interaction.py @@ -676,14 +676,6 @@ def small_ec(page, admin_user): page.ear_plugs = True page.hs_location = "The Moon" page.extinguishers_location = "With the rest of the fire" - # If we do this first the search fails, for ... reasons - page.power_mic.search(admin_user.name) - page.power_mic.toggle() - assert not page.power_mic.is_open - page.earthing = True - page.rcds = True - page.supply_test = True - page.pat = True def test_ec_create_small(logged_in_browser, live_server, admin_user, ra): @@ -704,14 +696,15 @@ def test_ec_create_medium(logged_in_browser, live_server, admin_user, medium_ra) page.ear_plugs = True page.hs_location = "Death Valley" page.extinguishers_location = "With the rest of the fire" - # If we do this first the search fails, for ... reasons - page.power_mic.search(admin_user.name) - page.power_mic.toggle() - assert not page.power_mic.is_open # Gotta scroll to make the button clickable logged_in_browser.driver.execute_script("window.scrollTo(0, document.body.scrollHeight);") + page.submit() + assert page.success + +def test_power_checklist(logged_in_browser, live_server, admin_user, power_test, medium_ra): + page = pages.CreatePowerTestRecord(logged_in_browser.driver, live_server.url, event_id=medium_ra.event.pk).open() page.earthing = True page.pat = True page.source_rcd = True @@ -726,56 +719,15 @@ def test_ec_create_medium(logged_in_browser, live_server, admin_user, medium_ra) page.w1_polarity = True page.w1_voltage = 240 page.w1_earth_fault = "0.42" + # If we do this first the search fails, for ... reasons + page.power_mic.search(admin_user.name) + page.power_mic.toggle() + assert not page.power_mic.is_open page.submit() assert page.success -def test_ec_create_vehicle(logged_in_browser, live_server, admin_user, checklist): - page = pages.EditEventChecklist(logged_in_browser.driver, live_server.url, pk=checklist.pk).open() - small_ec(page, admin_user) - page.add_vehicle() - assert len(page.vehicles) == 1 - vehicle_name = 'Brian' - page.vehicles[0].name.set_value(vehicle_name) - # Appears we're moving too fast for javascript... - t.sleep(1) - page.vehicles[0].vehicle.search(admin_user.first_name) - t.sleep(1) - page.submit() - assert page.success - # Check data is correct - checklist.refresh_from_db() - vehicle = models.EventChecklistVehicle.objects.get(checklist=checklist.pk) - assert vehicle_name == vehicle.vehicle - - -# TODO Test validation of end before start -def test_ec_create_crew(logged_in_browser, live_server, admin_user, checklist): - page = pages.EditEventChecklist(logged_in_browser.driver, live_server.url, pk=checklist.pk).open() - small_ec(page, admin_user) - page.add_crew() - assert len(page.crew) == 1 - role = "MIC" - start_time = timezone.make_aware(datetime.datetime(2015, 1, 1, 9, 0)) - end_time = timezone.make_aware(datetime.datetime(2015, 1, 1, 10, 30)) - crew = page.crew[0] - t.sleep(2) - crew.crewmember.search(admin_user.first_name) - t.sleep(2) - crew.role.set_value(role) - crew.start_time.set_value(start_time) - crew.end_time.set_value(end_time) - page.submit() - assert page.success - # Check data is correct - crew_obj = models.EventChecklistCrew.objects.get(checklist=checklist.pk) - assert admin_user.pk == crew_obj.crewmember.pk - assert role == crew_obj.role - assert start_time == crew_obj.start - assert end_time == crew_obj.end - - # TODO Can I loop through all the boolean fields and test them at once? def test_ra_creation(logged_in_browser, live_server, admin_user, basic_event): page = pages.CreateRiskAssessment(logged_in_browser.driver, live_server.url, event_id=basic_event.pk).open() diff --git a/RIGS/urls.py b/RIGS/urls.py index 4f4577da..9a5a1f7c 100644 --- a/RIGS/urls.py +++ b/RIGS/urls.py @@ -79,10 +79,8 @@ urlpatterns = [ name='ra_detail'), path('event/ra//edit/', permission_required_with_403('RIGS.change_riskassessment')(views.EventRiskAssessmentEdit.as_view()), name='ra_edit'), - path('event/ra/list', permission_required_with_403('RIGS.view_riskassessment')(views.EventRiskAssessmentList.as_view()), - name='ra_list'), - path('event/ra//review/', permission_required_with_403('RIGS.review_riskassessment')(views.EventRiskAssessmentReview.as_view()), - name='ra_review'), + path('event/ra//review/', permission_required_with_403('RIGS.review_riskassessment')(views.MarkReviewed.as_view()), + name='ra_review', kwargs={'model': 'RiskAssessment'}), path('event/ra//print/', permission_required_with_403('RIGS.view_riskassessment')(views.RAPrint.as_view()), name='ra_print'), path('event//checklist/', permission_required_with_403('RIGS.add_eventchecklist')(views.EventChecklistCreate.as_view()), @@ -91,10 +89,26 @@ urlpatterns = [ name='ec_detail'), path('event/checklist//edit/', permission_required_with_403('RIGS.change_eventchecklist')(views.EventChecklistEdit.as_view()), name='ec_edit'), - path('event/checklist/list', permission_required_with_403('RIGS.view_eventchecklist')(views.EventChecklistList.as_view()), - name='ec_list'), - path('event/checklist//review/', permission_required_with_403('RIGS.review_eventchecklist')(views.EventChecklistReview.as_view()), - name='ec_review'), + path('event/checklist//review/', permission_required_with_403('RIGS.review_eventchecklist')(views.MarkReviewed.as_view()), + name='ec_review', kwargs={'model': 'EventChecklist'}), + + path('event//power/', permission_required_with_403('RIGS.add_powertestrecord')(views.PowerTestCreate.as_view()), + name='event_pt'), + path('event/power//', login_required(views.PowerTestDetail.as_view()), + name='pt_detail'), + path('event/power//edit/', permission_required_with_403('RIGS.change_powertestrecord')(views.PowerTestEdit.as_view()), + name='pt_edit'), + path('event/power//review/', permission_required_with_403('RIGS.review_power')(views.MarkReviewed.as_view()), + name='pt_review', kwargs={'model': 'PowerTestRecord'}), + + path('event//checkin/', login_required(views.EventCheckIn.as_view()), + name='event_checkin'), + path('event/checkout/', login_required(views.EventCheckOut.as_view()), + name='event_checkout'), + path('event//checkin/edit/', login_required(views.EventCheckInEdit.as_view()), + name='edit_checkin'), + path('event//checkin/add/', login_required(views.EventCheckInOverride.as_view()), + name='event_checkin_override'), # Finance path('invoice/', permission_required_with_403('RIGS.view_invoice')(views.InvoiceIndex.as_view()), diff --git a/RIGS/views/hs.py b/RIGS/views/hs.py index cc9dffa2..a2ac9786 100644 --- a/RIGS/views/hs.py +++ b/RIGS/views/hs.py @@ -1,16 +1,46 @@ +from django.apps import apps from django.contrib import messages from django.http import HttpResponseRedirect -from django.urls import reverse_lazy +from django.urls import reverse from django.utils import timezone 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 +from PyRIGS.views import PrintView, ModalURLMixin +from django.shortcuts import redirect -class EventRiskAssessmentCreate(generic.CreateView): +class HSCreateView(generic.CreateView): + def get_form(self, **kwargs): + form = super().get_form(**kwargs) + epk = self.kwargs.get('pk') + event = models.Event.objects.get(pk=epk) + form.instance.event = event + return form + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + epk = self.kwargs.get('pk') + event = models.Event.objects.get(pk=epk) + context['event'] = event + context['page_title'] = f'Create {self.model.__name__} for Event {event.display_id}' + return context + + +class MarkReviewed(generic.View): + def get(self, *args, **kwargs): + obj = apps.get_model('RIGS', kwargs.get('model')).objects.get(pk=kwargs.get('pk')) + with reversion.create_revision(): + reversion.set_user(self.request.user) + obj.reviewed_by = self.request.user + obj.reviewed_at = timezone.now() + obj.save() + return HttpResponseRedirect(reverse('hs_list')) + + +class EventRiskAssessmentCreate(HSCreateView): model = models.RiskAssessment template_name = 'hs/risk_assessment_form.html' form_class = forms.EventRiskAssessmentForm @@ -23,28 +53,12 @@ class EventRiskAssessmentCreate(generic.CreateView): ra = models.RiskAssessment.objects.filter(event=event).first() if ra is not None: - return HttpResponseRedirect(reverse_lazy('ra_edit', kwargs={'pk': ra.pk})) + return HttpResponseRedirect(reverse('ra_edit', kwargs={'pk': ra.pk})) return super(EventRiskAssessmentCreate, self).get(self) - def get_form(self, **kwargs): - form = super(EventRiskAssessmentCreate, self).get_form(**kwargs) - epk = self.kwargs.get('pk') - event = models.Event.objects.get(pk=epk) - form.instance.event = event - return form - - def get_context_data(self, **kwargs): - context = super(EventRiskAssessmentCreate, self).get_context_data(**kwargs) - epk = self.kwargs.get('pk') - 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): - return reverse_lazy('ra_detail', kwargs={'pk': self.object.pk}) + return reverse('ra_detail', kwargs={'pk': self.object.pk}) class EventRiskAssessmentEdit(generic.UpdateView): @@ -57,7 +71,7 @@ class EventRiskAssessmentEdit(generic.UpdateView): ra.reviewed_by = None ra.reviewed_at = None ra.save() - return reverse_lazy('ra_detail', kwargs={'pk': self.object.pk}) + return reverse('ra_detail', kwargs={'pk': self.object.pk}) def get_context_data(self, **kwargs): context = super(EventRiskAssessmentEdit, self).get_context_data(**kwargs) @@ -80,36 +94,6 @@ class EventRiskAssessmentDetail(generic.DetailView): return context -class EventRiskAssessmentList(generic.ListView): - paginate_by = 20 - model = models.RiskAssessment - template_name = 'hs/hs_object_list.html' - - def get_queryset(self): - return self.model.objects.exclude(event__status=models.Event.CANCELLED).order_by('reviewed_at').select_related('event') - - def get_context_data(self, **kwargs): - context = super(EventRiskAssessmentList, self).get_context_data(**kwargs) - context['title'] = 'Risk Assessment' - context['view'] = 'ra_detail' - context['edit'] = 'ra_edit' - context['review'] = 'ra_review' - context['perm'] = 'perms.RIGS.review_riskassessment' - return context - - -class EventRiskAssessmentReview(generic.View): - def get(self, *args, **kwargs): - rpk = kwargs.get('pk') - ra = models.RiskAssessment.objects.get(pk=rpk) - with reversion.create_revision(): - reversion.set_user(self.request.user) - ra.reviewed_by = self.request.user - ra.reviewed_at = timezone.now() - ra.save() - return HttpResponseRedirect(reverse_lazy('ra_list')) - - class EventChecklistDetail(generic.DetailView): model = models.EventChecklist template_name = 'hs/event_checklist_detail.html' @@ -130,7 +114,7 @@ class EventChecklistEdit(generic.UpdateView): ec.reviewed_by = None ec.reviewed_at = None ec.save() - return reverse_lazy('ec_detail', kwargs={'pk': self.object.pk}) + return reverse('ec_detail', kwargs={'pk': self.object.pk}) def get_context_data(self, **kwargs): context = super(EventChecklistEdit, self).get_context_data(**kwargs) @@ -143,7 +127,7 @@ class EventChecklistEdit(generic.UpdateView): return context -class EventChecklistCreate(generic.CreateView): +class EventChecklistCreate(HSCreateView): model = models.EventChecklist template_name = 'hs/event_checklist_form.html' form_class = forms.EventChecklistForm @@ -158,57 +142,67 @@ class EventChecklistCreate(generic.CreateView): if ra is None: messages.error(self.request, f'A Risk Assessment must exist prior to creating any Event Checklists for {event}! Please create one now.') - return HttpResponseRedirect(reverse_lazy('event_ra', kwargs={'pk': epk})) + return HttpResponseRedirect(reverse('event_ra', kwargs={'pk': epk})) return super(EventChecklistCreate, self).get(self) - def get_form(self, **kwargs): - form = super(EventChecklistCreate, self).get_form(**kwargs) - epk = self.kwargs.get('pk') - event = models.Event.objects.get(pk=epk) - form.instance.event = event - return form + def get_success_url(self): + return reverse('ec_detail', kwargs={'pk': self.object.pk}) + + +class PowerTestDetail(generic.DetailView): + model = models.PowerTestRecord + template_name = 'hs/power_detail.html' def get_context_data(self, **kwargs): - context = super(EventChecklistCreate, self).get_context_data(**kwargs) - epk = self.kwargs.get('pk') - event = models.Event.objects.get(pk=epk) - context['event'] = event - context['page_title'] = f'Create Event Checklist for Event {event.display_id}' + context = super().get_context_data(**kwargs) + context['page_title'] = f"Power Test Record for Event {self.object.event.display_id} {self.object.event.name}" return context + +class PowerTestEdit(generic.UpdateView): + model = models.PowerTestRecord + template_name = 'hs/power_form.html' + form_class = forms.PowerTestRecordForm + def get_success_url(self): - return reverse_lazy('ec_detail', kwargs={'pk': self.object.pk}) - - -class EventChecklistList(generic.ListView): - paginate_by = 20 - model = models.EventChecklist - template_name = 'hs/hs_object_list.html' - - def get_queryset(self): - return self.model.objects.exclude(event__status=models.Event.CANCELLED).order_by('reviewed_at').select_related('event') + ec = self.get_object() + ec.reviewed_by = None + ec.reviewed_at = None + ec.save() + return reverse('ec_detail', kwargs={'pk': self.object.pk}) def get_context_data(self, **kwargs): - context = super(EventChecklistList, self).get_context_data(**kwargs) - context['title'] = 'Event Checklist' - context['view'] = 'ec_detail' - context['edit'] = 'ec_edit' - context['review'] = 'ec_review' - context['perm'] = 'perms.RIGS.review_eventchecklist' + context = super().get_context_data(**kwargs) + pk = self.kwargs.get('pk') + ec = models.PowerTestRecord.objects.get(pk=pk) + context['event'] = ec.event + context['edit'] = True + context['page_title'] = f'Edit Power Test Record for Event {ec.event.display_id}' + # get_related(context['form'], context) return context -class EventChecklistReview(generic.View): +class PowerTestCreate(HSCreateView): + model = models.PowerTestRecord + template_name = 'hs/power_form.html' + form_class = forms.PowerTestRecordForm + def get(self, *args, **kwargs): - rpk = kwargs.get('pk') - ec = models.EventChecklist.objects.get(pk=rpk) - with reversion.create_revision(): - reversion.set_user(self.request.user) - ec.reviewed_by = self.request.user - ec.reviewed_at = timezone.now() - ec.save() - return HttpResponseRedirect(reverse_lazy('ec_list')) + epk = kwargs.get('pk') + event = models.Event.objects.get(pk=epk) + + # Check if RA exists + ra = models.RiskAssessment.objects.filter(event=event).first() + + if ra is None: + messages.error(self.request, f'A Risk Assessment must exist prior to creating any Power Test Records for {event}! Please create one now.') + return HttpResponseRedirect(reverse('event_ra', kwargs={'pk': epk})) + + return super().get(self) + + def get_success_url(self): + return reverse('pt_detail', kwargs={'pk': self.object.pk}) class HSList(generic.ListView): @@ -233,3 +227,64 @@ class RAPrint(PrintView): context = super().get_context_data(**kwargs) context['filename'] = f"EventSpecificRiskAssessment_for_{context['object'].event.display_id}.pdf" return context + + +class EventCheckIn(generic.CreateView, ModalURLMixin): + model = models.EventCheckIn + template_name = 'hs/eventcheckin_form.html' + form_class = forms.EventCheckInForm + + def get_success_url(self): + return self.get_close_url('event_detail', 'event_detail') # Well, that's one way of doing that...! + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context['event'] = models.Event.objects.get(pk=self.kwargs.get('pk')) + context['page_title'] = f'Check In to Event {context["event"].display_id}' + # get_related(context['form'], context) + return context + + +class EventCheckInOverride(generic.CreateView): + model = models.EventCheckIn + template_name = 'hs/eventcheckin_form.html' + form_class = forms.EditCheckInForm + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context['event'] = models.Event.objects.get(pk=self.kwargs.get('pk')) + context['page_title'] = f'Manually add Check In to Event {context["event"].display_id}' + context['manual'] = True + return context + + +class EventCheckInEdit(generic.UpdateView, ModalURLMixin): + model = models.EventCheckIn + template_name = 'hs/eventcheckin_form.html' + form_class = forms.EditCheckInForm + + def dispatch(self, request, *args, **kwargs): + obj = self.get_object() + if not obj.person == self.request.user and not obj.event.mic == self.request.user: + return redirect(self.request.META.get('HTTP_REFERER', '/')) + return super().dispatch(request) + + def get_success_url(self): + return self.get_close_url('event_detail', 'event_detail') # Well, that's one way of doing that...! + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context['event'] = self.object.event + context['page_title'] = f'Edit Check In for Event {context["event"].display_id}' + context['edit'] = True + # get_related(context['form'], context) + return context + + +class EventCheckOut(generic.RedirectView): + def get_redirect_url(self, *args, **kwargs): + checkin = self.request.user.current_event() + if checkin: + checkin.end_time = timezone.now() + checkin.save() + return self.request.META.get('HTTP_REFERER', '/') diff --git a/pipeline/source_assets/js/autocompleter.js b/pipeline/source_assets/js/autocompleter.js index 4672fe27..1f8ea909 100644 --- a/pipeline/source_assets/js/autocompleter.js +++ b/pipeline/source_assets/js/autocompleter.js @@ -73,7 +73,7 @@ function initPicker(obj) { return array; } }; - console.log(obj.data); + //console.log(obj.data); if (!obj.data('noclear')) { obj.prepend($("") .attr("value",'') diff --git a/templates/base.html b/templates/base.html index 95075c83..562e0c12 100644 --- a/templates/base.html +++ b/templates/base.html @@ -30,6 +30,9 @@ {% block navbar %} +{% if request.user.current_event %} +
    You are currently checked in to {{request.user.current_event.event}}Check Out
    +{% endif %}