Fixing tests for new logic etc

RIGS/models.py

@@ -616,7 +616,7 @@ def validate_url(value):
     if not value:
         return  # Required error is done the field
     obj = urlparse(value)
-    if not obj.hostname in ('nottinghamtec.sharepoint.com'):
+    if obj.hostname not in ('nottinghamtec.sharepoint.com'):
         raise ValidationError('URL must point to a location on the TEC Sharepoint')
 
 
@@ -638,12 +638,12 @@ class RiskAssessment(models.Model, RevisionMixin):
     general_notes = models.TextField(blank=True, null=True, help_text="Did you have to consult a supervisor about any of the above? If so who did you consult and what was the outcome?")
 
     # Power
-    event_size = models.IntegerField(blank=True, null=True, choices=SIZES)
+    # event_size = models.IntegerField(blank=True, null=True, choices=SIZES)
     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?")    
+    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?")
@@ -704,13 +704,6 @@ class RiskAssessment(models.Model, RevisionMixin):
         # Check for idiots
         if not self.outside and self.generators:
             raise forms.ValidationError("Engage brain, please. <strong>No generators indoors!(!)</strong>")
-        # Confirm event size. Check all except generators, since generators entails outside
-        if self.outside or self.other_companies_power or self.nonstandard_equipment_power or self.multiple_electrical_environments:
-            self.event_size = self.LARGE[0]
-        elif self.big_power:
-            self.event_size = self.MEDIUM[0]
-        else:
-            self.event_size = self.SMALL[0]
 
     class Meta:
         ordering = ['event']
@@ -718,6 +711,16 @@ class RiskAssessment(models.Model, RevisionMixin):
             ('review_riskassessment', 'Can review Risk Assessments')
         ]
 
+    @property
+    def event_size(self):
+        # Confirm event size. Check all except generators, since generators entails outside
+        if self.outside or self.other_companies_power or self.nonstandard_equipment_power or self.multiple_electrical_environments:
+            return self.LARGE[0]
+        elif self.big_power:
+            return self.MEDIUM[0]
+        else:
+            return self.SMALL[0]
+
     @property
     def activity_feed_string(self):
         return str(self.event)