Add badge to nav for number of waiting invoices

Might slightly help us stop leaving them waiting for far too long...

RIGS/finance.py

@@ -179,24 +179,7 @@ class InvoiceWaiting(generic.ListView):
         return context
 
     def get_queryset(self):
-        return self.get_objects()
-
-    def get_objects(self):
-        # TODO find a way to select items
-        events = self.model.objects.filter(
-            (
-                Q(start_date__lte=datetime.date.today(), end_date__isnull=True) |  # Starts before with no end
-                Q(end_date__lte=datetime.date.today())  # Has end date, finishes before
-            ) & Q(invoice__isnull=True) &  # Has not already been invoiced
-            Q(is_rig=True)  # Is a rig (not non-rig)
-
-        ).order_by('start_date') \
-            .select_related('person',
-                            'organisation',
-                            'venue', 'mic') \
-            .prefetch_related('items')
-
-        return events
+        return self.model.objects.waiting_invoices()
 
 
 class InvoiceEvent(generic.View):

RIGS/models.py

@@ -278,6 +278,19 @@ class EventManager(models.Manager):
         ).count()
         return event_count
 
+    def waiting_invoices(self):
+        events = self.filter(
+            (
+                models.Q(start_date__lte=datetime.date.today(), end_date__isnull=True) |  # Starts before with no end
+                models.Q(end_date__lte=datetime.date.today())  # Or has end date, finishes before
+            ) & models.Q(invoice__isnull=True) &  # Has not already been invoiced
+            models.Q(is_rig=True)  # Is a rig (not non-rig)
+        ).order_by('start_date') \
+        .select_related('person', 'organisation', 'venue', 'mic') \
+        .prefetch_related('items')
+
+        return events
+
 
 @reversion.register(follow=['items'])
 class Event(models.Model, RevisionMixin):

RIGS/templates/base_rigs.html

@@ -1,6 +1,7 @@
 {% extends 'base.html' %}
 
 {% load static %}
+{% load invoices_waiting from filters %}
 
 {% block titleheader %}
 <a class="navbar-brand" href="/">RIGS</a>
@@ -45,11 +46,11 @@
     {% if perms.RIGS.view_invoice %}
     <li class="nav-item dropdown">
       <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownInvoices" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-        Invoices
+        Invoices <span class="badge badge-danger badge-pill">{% invoices_waiting %}</span>
       </a>
       <div class="dropdown-menu" aria-labelledby="navbarDropdownInvoices">
         {% if perms.RIGS.add_invoice %}
-        <a class="dropdown-item" href="{% url 'invoice_waiting' %}"><span class="fas fa-briefcase text-danger"></span> Waiting</a>
+        <a class="dropdown-item text-nowrap" href="{% url 'invoice_waiting' %}"><span class="fas fa-briefcase text-danger"></span> Waiting <span class="badge badge-danger badge-pill">{% invoices_waiting %}</span></a> 
         {% endif %}
         <a class="dropdown-item" href="{% url 'invoice_list' %}"><span class="fas fa-pound-sign text-warning"></span> Outstanding</a>
         <a class="dropdown-item" href="{% url 'invoice_archive' %}"><span class="fas fa-book"></span> Archive</a>

RIGS/templatetags/filters.py

@@ -217,3 +217,8 @@ def button(type, url=None, pk=None, clazz="", icon=None, text="", id=None, style
     elif type == 'submit':
         return {'submit': True, 'class': 'btn-primary', 'icon': 'fa-save', 'text': 'Save', 'id': id, 'style': style}
     return {'target': url, 'pk': pk, 'class': clazz, 'icon': icon, 'text': text, 'id': id, 'style': style}
+
+
+@register.simple_tag
+def invoices_waiting():
+    return len(models.Event.objects.waiting_invoices())

templates/base.html

@@ -31,12 +31,12 @@
 <a class="skip-link" href='#main'>Skip to content</a>
 {% include "analytics.html" %}
 {% block navbar %}
-<nav class="navbar navbar-expand-lg navbar-dark bg-dark flex-nowrap" role="navigation">
+<nav class="navbar navbar-expand-lg navbar-dark bg-dark flex-nowrap text-nowrap" role="navigation">
   <a class="navbar-brand" href="{% if request.user.is_authenticated %}https://members.nottinghamtec.co.uk{%else%}https://nottinghamtec.co.uk{%endif%}">
     <img src="{% static 'imgs/logo.webp' %}" width="40" height="40" alt="TEC's Logo: Serif 'TEC' vertically next to a blue box with the words 'PA and Lighting', surrounded by graduated rings" id="logo">
   </a>
   <div class="container" style="padding-left: 0; padding-right: 0;">
-    <div class="row w-100">
+    <div class="row">
       {% block titleheader %}
       {% endblock %}
       <button class="navbar-toggler ml-auto" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation" onclick="document.getElementById('logo').classList.toggle('d-none');">

templates/partials/search.html

@@ -1,10 +1,10 @@
 {% if user.is_authenticated %}
-<form id="searchForm" class="form-inline flex-nowrap mx-md-3 px-2 border border-light rounded" role="form" method="GET" action="{% url 'event_archive' %}">
+<form id="searchForm" class="form-inline flex-nowrap mx-md-3 px-2 border border-light rounded w-75" role="form" method="GET" action="{% url 'event_archive' %}">
     <div class="input-group input-group-sm flex-nowrap">
         <div class="input-group-prepend">
             <input id="id_search_input" type="search" name="q" class="form-control form-control-sm" placeholder="Search..." value="{{ request.GET.q }}" />
         </div>
-        <select id="search-options" class="custom-select form-control" style="border-top-right-radius: 0px; border-bottom-right-radius: 0px; width: 20ch;">
+        <select id="search-options" class="custom-select form-control" style="border-top-right-radius: 0px; border-bottom-right-radius: 0px; width: 15ch;">
           <option selected data-action="{% url 'event_archive' %}" href="#">Events</option>
           <option data-action="{% url 'person_list' %}" href="#">People</option>
           <option data-action="{% url 'organisation_list' %}" href="#">Organisations</option>
@@ -17,7 +17,7 @@
         </select>
     </div>
     <button class="btn btn-info form-control form-control-sm btn-sm w-25" style="border-top-left-radius: 0px;border-bottom-left-radius: 0px;"><span class="fas fa-search"></span><span class="sr-only"> Search</span></button>
-    <a href="{% url 'search_help' %}" class="nav-link modal-href ml-2"><span class="fas fa-question-circle"></span></a>
+    <a href="{% url 'search_help' %}" class="nav-link modal-href ml-1"><span class="fas fa-question-circle"></span></a>
 </form>
 {% endif %}