Skip to content

Commit 3afa4de

Browse files
Tweak finance dashboard to ignore 'non-rigs' when counting 'total events'
You can't invoice for a 'non-rig' after all.
1 parent 9f910af commit 3afa4de

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

RIGS/views/finance.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,19 @@ def get_context_data(self, **kwargs):
4040
time_filter = 'all'
4141

4242
if time_filter == 'all':
43-
context['events'] = models.Event.objects.all()
43+
context['events'] = models.Event.objects.filter(is_rig=True)
4444
context['invoices'] = models.Invoice.objects.all()
4545
context['payments'] = models.Payment.objects.all()
4646
elif time_filter == 'year':
47-
context['events'] = models.Event.objects.filter(start_date__gte=datetime.date.today() - datetime.timedelta(days=365))
47+
context['events'] = models.Event.objects.filter(is_rig=True, start_date__gte=datetime.date.today() - datetime.timedelta(days=365))
4848
context['invoices'] = models.Invoice.objects.filter(invoice_date__gte=datetime.date.today() - datetime.timedelta(days=365))
4949
context['payments'] = models.Payment.objects.filter(date__gte=datetime.date.today() - datetime.timedelta(days=365))
5050
elif time_filter == 'month':
51-
context['events'] = models.Event.objects.filter(start_date__gte=datetime.date.today() - datetime.timedelta(days=30))
51+
context['events'] = models.Event.objects.filter(is_rig=True, start_date__gte=datetime.date.today() - datetime.timedelta(days=30))
5252
context['invoices'] = models.Invoice.objects.filter(invoice_date__gte=datetime.date.today() - datetime.timedelta(days=30))
5353
context['payments'] = models.Payment.objects.filter(date__gte=datetime.date.today() - datetime.timedelta(days=30))
5454
elif time_filter == 'week':
55-
context['events'] = models.Event.objects.filter(start_date__gte=datetime.date.today() - datetime.timedelta(days=7))
55+
context['events'] = models.Event.objects.filter(is_rig=True, start_date__gte=datetime.date.today() - datetime.timedelta(days=7))
5656
context['invoices'] = models.Invoice.objects.filter(invoice_date__gte=datetime.date.today() - datetime.timedelta(days=7))
5757
context['payments'] = models.Payment.objects.filter(date__gte=datetime.date.today() - datetime.timedelta(days=7))
5858

0 commit comments

Comments
 (0)