Risk assessment form now validates power training status where required

RIGS/forms.py

@@ -8,6 +8,7 @@ from django.utils import timezone
 from reversion import revisions as reversion
 
 from RIGS import models
+from training.models import TrainingLevel
 
 # Override the django form defaults to use the HTML date/time/datetime UI elements
 forms.DateField.widget = forms.DateInput(attrs={'type': 'date'})
@@ -164,6 +165,9 @@ class EventRiskAssessmentForm(forms.ModelForm):
                 ], attrs={'class': 'custom-control-input', 'required': 'true'})
 
     def clean(self):
+        if self.cleaned_data.get('big_power'):
+            if not self.cleaned_data.get('power_mic').level_qualifications.filter(level__department=TrainingLevel.POWER).exists():
+                self.add_error('power_mic', forms.ValidationError("Your Power MIC must be a Power Technician.", code="power_tech_required"))
         # Check expected values
         unexpected_values = []
         for field, value in models.RiskAssessment.expected_values.items():

RIGS/models.py

@@ -99,7 +99,7 @@ class RevisionMixin(object):
         version = self.current_version
         if version is None:
             return None
-        return "V{0} | R{1}".format(version.pk, version.revision.pk)
+        return f"V{version.pk} | R{version.revision.pk}"
 
 
 class Person(models.Model, RevisionMixin):
@@ -207,7 +207,7 @@ class VatRate(models.Model, RevisionMixin):
         get_latest_by = 'start_at'
 
     def __str__(self):
-        return self.comment + " " + str(self.start_at) + " @ " + str(self.as_percent) + "%"
+        return f"{self.comment} {self.start_at} @ {self.as_percent}%"
 
 
 class Venue(models.Model, RevisionMixin):
@@ -347,10 +347,10 @@ class Event(models.Model, RevisionMixin):
         if self.pk:
             if self.is_rig:
                 return str("N%05d" % self.pk)
-            else:
-                return self.pk
-        else:
-            return "????"
+
+            return self.pk
+
+        return "????"
 
     # Calculated values
     """
@@ -475,7 +475,7 @@ class Event(models.Model, RevisionMixin):
         return reverse('event_detail', kwargs={'pk': self.pk})
 
     def __str__(self):
-        return "{}: {}".format(self.display_id, self.name)
+        return f"{self.display_id}: {self.name}"
 
     def clean(self):
         errdict = {}
@@ -521,11 +521,11 @@ class EventItem(models.Model, RevisionMixin):
         ordering = ['order']
 
     def __str__(self):
-        return "{}.{}: {} | {}".format(self.event_id, self.order, self.event.name, self.name)
+        return f"{self.event_id}.{self.order}: {self.event.name} | {self.name}"
 
     @property
     def activity_feed_string(self):
-        return str("item {}".format(self.name))
+        return f"item {self.name}"
 
 
 @reversion.register
@@ -543,7 +543,7 @@ class EventAuthorisation(models.Model, RevisionMixin):
 
     @property
     def activity_feed_string(self):
-        return "{} (requested by {})".format(self.event.display_id, self.sent_by.initials)
+        return f"{self.event.display_id} (requested by {self.sent_by.initials})"
 
 
 class InvoiceManager(models.Manager):
@@ -671,7 +671,6 @@ class RiskAssessment(models.Model, RevisionMixin):
 
     # Power
     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?")
-    # If yes to the above two, you must answer...
     power_mic = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='power_mic', blank=True, null=True,
                                   verbose_name="Power MIC", on_delete=models.CASCADE, help_text="Who is the Power MIC? (if yes to the above question, this person <em>must</em> be a Power Technician or Power Supervisor)")
     outside = models.BooleanField(help_text="Is the event outdoors?")