From 219a0a5a36a531c2919f0c77ac954226b099fd39 Mon Sep 17 00:00:00 2001 From: JKuijperM Date: Tue, 24 Feb 2026 19:20:27 +0100 Subject: [PATCH] Minor changes --- expenses_manager/expenses/forms.py | 2 +- .../expenses/templates/expenses/dashboard.html | 2 +- .../expenses/templates/expenses/home.html | 2 +- expenses_manager/expenses/views.py | 11 ++++++++++- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/expenses_manager/expenses/forms.py b/expenses_manager/expenses/forms.py index 12f310b..69bd580 100644 --- a/expenses_manager/expenses/forms.py +++ b/expenses_manager/expenses/forms.py @@ -64,7 +64,7 @@ class FuelEntryForm(forms.Form): account = forms.ModelChoiceField(queryset=None) # Specifics fuel fields - odometer = forms.IntegerField(label='kilometraje actual') + odometer = forms.DecimalField(label='Current kilometers') liters = forms.DecimalField(max_digits=8, decimal_places=2) def __init__(self, *args, **kwargs): diff --git a/expenses_manager/expenses/templates/expenses/dashboard.html b/expenses_manager/expenses/templates/expenses/dashboard.html index f08cfd5..3e65de1 100644 --- a/expenses_manager/expenses/templates/expenses/dashboard.html +++ b/expenses_manager/expenses/templates/expenses/dashboard.html @@ -117,7 +117,7 @@
Gastos totales - {{ kpi_total }}€ + {{ kpi_total|floatformat:2 }}€
diff --git a/expenses_manager/expenses/templates/expenses/home.html b/expenses_manager/expenses/templates/expenses/home.html index 840b72f..9fd90ff 100644 --- a/expenses_manager/expenses/templates/expenses/home.html +++ b/expenses_manager/expenses/templates/expenses/home.html @@ -8,7 +8,7 @@

Resumen del mes

-

Total: {{ kpi_total }}

+

Total: {{ kpi_total|floatformat:2 }}

Gastos: {{ kpi_count }}

Categorías: {{ kpi_categories }}

diff --git a/expenses_manager/expenses/views.py b/expenses_manager/expenses/views.py index bea3029..f614232 100644 --- a/expenses_manager/expenses/views.py +++ b/expenses_manager/expenses/views.py @@ -809,6 +809,15 @@ def fuel_list(request): for month in range(1, 13) ] + year_list = ( + FuelEntry.objects.filter( + expense__owner=request.user,) + .annotate(year=ExtractYear('expense__date')) + .values_list('year', flat=True) + .distinct() + .order_by('year') + ) + km_data = [] dates = [] @@ -826,7 +835,7 @@ def fuel_list(request): 'km_data': km_data, 'km_dates': dates, 'selected_year': selected_year, - 'year_list': range(current_year - 5, current_year + 1), + 'year_list': year_list, } )