From 828964ecb631869e7687ef2d7ca36386f3d73edb Mon Sep 17 00:00:00 2001
From: FreneticScribbler <aj@aronajones.com>
Date: Thu, 27 Aug 2020 17:08:51 +0100
Subject: [PATCH] Alter rig_count to not include un-checked-in dry hires

---
 RIGS/models.py            | 15 +--------------
 RIGS/templates/index.html |  3 ++-
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/RIGS/models.py b/RIGS/models.py
index d22d35aa..2337932c 100644
--- a/RIGS/models.py
+++ b/RIGS/models.py
@@ -275,9 +275,7 @@ class EventManager(models.Manager):
             (models.Q(end_date__gte=timezone.now().date(), dry_hire=False, is_rig=True) & ~models.Q(
                 status=Event.CANCELLED)) |  # Ends after
             (models.Q(dry_hire=True, start_date__gte=timezone.now().date(), is_rig=True) & ~models.Q(
-                status=Event.CANCELLED)) |  # Active dry hire
-            (models.Q(dry_hire=True, checked_in_by__isnull=True, is_rig=True) & (
-                models.Q(status=Event.BOOKED) | models.Q(status=Event.CONFIRMED)))  # Active dry hire GT
+                status=Event.CANCELLED))  # Active dry hire
         ).count()
         return event_count
 
@@ -341,17 +339,6 @@ class Event(models.Model, RevisionMixin):
 
     @property
     def sum_total(self):
-        # Manual querying is required for efficiency whilst maintaining floating point arithmetic
-        # if connection.vendor == 'postgresql':
-        #    sql = "SELECT SUM(quantity * cost) AS sum_total FROM \"RIGS_eventitem\" WHERE event_id=%i" % self.id
-        # else:
-        #    sql = "SELECT id, SUM(quantity * cost) AS sum_total FROM RIGS_eventitem WHERE event_id=%i" % self.id
-        # total = self.items.raw(sql)[0]
-        # if total.sum_total:
-        #    return total.sum_total
-        # total = 0.0
-        # for item in self.items.filter(cost__gt=0).extra(select="SUM(cost * quantity) AS sum"):
-        #    total += item.sum
         total = EventItem.objects.filter(event=self).aggregate(
             sum_total=models.Sum(models.F('cost') * models.F('quantity'),
                                  output_field=models.DecimalField(max_digits=10, decimal_places=2))
diff --git a/RIGS/templates/index.html b/RIGS/templates/index.html
index 6274569f..9242ca97 100644
--- a/RIGS/templates/index.html
+++ b/RIGS/templates/index.html
@@ -1,11 +1,12 @@
 {% extends 'base_rigs.html' %}
+{% load humanize %}
 
 {% block title %}RIGS{% endblock %}
 
 {% block content %}
 <div class="row">
     <h1 class="col-sm-12 pb-3">R<small class="text-muted">ig</small> I<small class="text-muted">nformation</small class="text-muted"> G<small class="text-muted">athering</small> S<small class="text-muted">ystem</small></h1>
-    <h4 class="col-sm-12 pb-3">Welcome back {{ user.get_full_name }}, there are {{ rig_count }} rigs coming up.</h4>
+    <h4 class="col-sm-12 pb-3">Welcome back {{ user.get_full_name }}, there {%if rig_count == 1 %}is one rig coming up{%else%}are {{ rig_count|apnumber }} rigs coming up.{%endif%}</h4>
     <div class="col-sm">
         <div class="card">
             <div class="card-header">