Merge branch 'master' into jb3/features/invoice-dashboard

Also made them link to their respective lists and fixed low text contrast

RIGS/management/commands/generateSampleRIGSData.py

@@ -254,7 +254,7 @@ class Command(BaseCommand):
                             new_invoice.void = True
                         elif random.randint(0, 2) > 1:  # 1 in 3 have been paid
                             models.Payment.objects.create(invoice=new_invoice, amount=new_invoice.balance,
-                                                          date=datetime.date.today())
+                                                          date=datetime.date.today(), method=random.choice(models.Payment.METHODS)[0])
             if i == 1 or random.randint(0, 5) > 0:  # Event 1 and 1 in 5 have a RA
                 models.RiskAssessment.objects.create(event=new_event, supervisor_consulted=bool(random.getrandbits(1)),
                                                      nonstandard_equipment=bool(random.getrandbits(1)),

RIGS/templates/invoice_dashboard.html

@@ -28,16 +28,20 @@
 
 <div class="card-deck">
     <div class="card">
-        <div class="card-body bg-info">
-            <h5 class="card-title text-center">Total Outstanding</h5>
-            <p class="card-text text-center h3"><strong>£{{ total_outstanding|floatformat:2 }}</strong></p>
-        </div>
+        <a href="{% url 'invoice_waiting' %}" class="text-decoration-none text-white">
+            <div class="card-body bg-primary">
+                <h5 class="card-title text-center">Total Waiting</h5>
+                <p class="card-text text-center h3"><strong>£{{ total_waiting|floatformat:2 }}</strong></p>
+            </div>
+        </a>
     </div>
     <div class="card">
-        <div class="card-body bg-primary">
-            <h5 class="card-title text-center">Total Waiting</h5>
-            <p class="card-text text-center h3"><strong>£{{ total_waiting|floatformat:2 }}</strong></p>
-        </div>
+        <a href="{% url 'invoice_list' %}" class="text-decoration-none text-dark">
+            <div class="card-body bg-info">
+                <h5 class="card-title text-center">Total Outstanding</h5>
+                <p class="card-text text-center h3"><strong>£{{ total_outstanding|floatformat:2 }}</strong></p>
+            </div>
+        </a>
     </div>
     <div class="card">
         <div class="card-body bg-danger">

templates/index.html

@@ -12,7 +12,7 @@
     <div class="col-sm-12">
     {% for event in now %}
     <div class="alert alert-primary rounded-0">
-    Event {{ event }} is happening today! <a href="{% url 'event_checkin' event.pk %}" class="btn btn-success btn-sm modal-href align-baseline {% if request.user.current_event %}disabled{%endif%}"><span class="fas fa-user-clock"></span> <span class="d-none d-sm-inline">Check In</span></a><br/>
+    Event <a href="{% url 'event_detail' event.pk %}" class="text-danger">{{ event }}</a> is happening today! <a href="{% url 'event_checkin' event.pk %}" class="btn btn-success btn-sm modal-href align-baseline {% if request.user.current_event %}disabled{%endif%}"><span class="fas fa-user-clock"></span> <span class="d-none d-sm-inline">Check In</span></a><br/>
     </div>
     {% endfor %}
     </div>