Event properties internal/authorised always return a explicit boolean rather than sometimes None

RIGS/management/commands/generateSampleRIGSData.py

@@ -184,7 +184,7 @@ class Command(BaseCommand):
                           "delete_eventchecklistvehicle", "view_eventchecklistvehicle", ]
         financePerms = keyholderPerms + ["add_invoice", "change_invoice", "view_invoice",
                                          "add_payment", "change_payment", "delete_payment"]
-        hsPerms = keyHolderPerms + [ "review_riskassessment", "review_eventchecklist" ]
+        hsPerms = keyholderPerms + ["review_riskassessment", "review_eventchecklist"]
 
         for permId in keyholderPerms:
             self.keyholder_group.permissions.add(Permission.objects.get(codename=permId))

RIGS/models.py

@@ -443,9 +443,10 @@ class Event(models.Model, RevisionMixin):
         else:
             return endDate
 
+
     @property
     def internal(self):
-        return self.organisation and self.organisation.union_account
+        return bool(self.organisation and self.organisation.union_account)
 
     @property
     def status_color(self):
@@ -453,7 +454,7 @@ class Event(models.Model, RevisionMixin):
             return "text-muted table-secondary"
         elif not self.is_rig:
             return "table-info"
-        elif self.authorised and self.mic and (self.dry_hire or self.riskassessment):
+        elif self.mic and (self.dry_hire or self.riskassessment) and self.authorised:
             return "table-success"
         else:
             return "table-warning"
@@ -732,17 +733,17 @@ class EventChecklist(models.Model, RevisionMixin):
 
     def clean(self):
         errdict = {}
-        if self.earthing == None or self.pat == None:
+        if self.earthing is None or self.pat is None:
             errdict['earthing'] = 'Fill out the electrical checks'
 
-        if not self.medium_event and (self.rcds == None or self.supply_test == None):
+        if not self.medium_event and (self.rcds is None or self.supply_test is None):
             errdict['rcds'] = 'Fill out the small event electrical checks'
 
         if self.medium_event:
-            if self.source_rcd == None or self.labelling == None or self.all_rcds_tested == None or self.public_sockets_tested == None:
+            if self.source_rcd is None or self.labelling is None or self.all_rcds_tested is None or self.public_sockets_tested is None:
                 errdict['source_rcd'] = 'Fill out the medium event electrical checks'
 
-            if self.w1_description == None or self.w1_polarity == None or self.w1_voltage == None or self.w1_earth_fault == None:
+            if self.w1_description is None or self.w1_polarity is None or self.w1_voltage is None or self.w1_earth_fault is None:
                 errdict['w1_description'] = 'Fully complete at least the first worst case point'
 
         if errdict != {}:  # If there was an error when validation

RIGS/templates/rigboard.html

@@ -8,6 +8,7 @@
 <a href="{% url 'event_create' %}" class="btn btn-success my-3 float-right">New <i class="fas fa-plus"></i></a>
 {% endif %}
 
+<p>Key: <span class="badge badge-success mr-1">Ready</span><span class="badge badge-warning mr-1">Action Required</span><span class="badge badge-secondary mr-1">Cancelled</span><span class="badge badge-info">Non-Rig</span></p>
 {% include 'event_table.html' %}
 
 {% endblock %}

RIGS/templatetags/filters.py

@@ -166,6 +166,7 @@ def yesnoi(boolean, invert=False, autoescape=True):
         value += ' <span class="fas fa-exclamation" style="color: red;"></span>'
     return mark_safe(value)
 
+
 @register.filter
 def title_spaced(string):
     return title(string).replace('_', ' ')

RIGS/tests/test_functional.py

@@ -393,7 +393,7 @@ class TestEventDuplicate(BaseRigboardTest):
         self.assertEqual(newEvent.auth_request_by, None)
         self.assertEqual(newEvent.auth_request_at, None)
 
-        self.assertFalse(hasattr(newEvent, 'authorised'))
+        self.assertFalse(newEvent.authorised)
 
         self.assertNotIn("N%05d" % self.testEvent.pk, self.driver.find_element_by_xpath('//h1').text)
         self.assertNotIn("Event data duplicated but not yet saved", self.page.warning)  # Check info message not visible

RIGS/tests/test_models.py

@@ -101,8 +101,8 @@ class EventTestCase(TestCase):
         self.assertEqual(models.Event.objects.count(), 18, "Incorrect number of events, check setup")
 
     def test_rig_count(self):
-        # by my count this is 7
+        # Changed to not include unreturned dry hires in rig count
-        self.assertEqual(models.Event.objects.rig_count(), 8)
+        self.assertEqual(models.Event.objects.rig_count(), 7)
 
     def test_current_events(self):
         current_events = models.Event.objects.current_events()
@@ -374,8 +374,8 @@ class EventAuthorisationTestCase(TestCase):
             is_superuser=True  # lazily grant all permissions
         )[0]
         self.person = models.Person.objects.create(name='Authorisation Test Person')
-        self.organisation = models.Organisation.objects.create(name='Authorisation Test Organisation')
+        self.organisation = models.Organisation.objects.create(name='Authorisation Test Organisation', union_account=True)
-        self.event = models.Event.objects.create(name="AuthorisationTestCase", person=self.person,
+        self.event = models.Event.objects.create(name="AuthorisationTestCase", person=self.person, organisation=self.organisation,
                                                  start_date=date.today())
         # Add some items
         models.EventItem.objects.create(event=self.event, name="Authorisation test item", quantity=2, cost=123.45,

assets/tests/test_assets.py

@@ -592,7 +592,7 @@ class TestVersioningViews(TestCase):
         self.assertEqual(response.status_code, 200)
 
     def test_activity_table_loads_successfully(self):
-        request_url = reverse('asset_activity_table')
+        request_url = reverse('assets_activity_table')
 
         response = self.client.get(request_url, follow=True)
         self.assertEqual(response.status_code, 200)

versioning/versioning.py

@@ -118,7 +118,7 @@ class ModelComparison(object):
 
     @cached_property
     def item_changes(self):
-        if self.follow:
+        if self.follow and self.version.object is not None:
             item_type = ContentType.objects.get_for_model(self.version.object)
             old_item_versions = self.version.parent.revision.version_set.exclude(content_type=item_type)
             new_item_versions = self.version.revision.version_set.exclude(content_type=item_type)