Minor changes
This commit is contained in:
parent
ae5bb71a5e
commit
219a0a5a36
@ -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):
|
||||
|
||||
@ -117,7 +117,7 @@
|
||||
|
||||
<div class="kpi-card">
|
||||
<span class="kpi-label">Gastos totales</span>
|
||||
<span class="kpi-value">{{ kpi_total }}€</span>
|
||||
<span class="kpi-value">{{ kpi_total|floatformat:2 }}€</span>
|
||||
</div>
|
||||
|
||||
<div class="kpi-card">
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
<section>
|
||||
<h2>Resumen del mes</h2>
|
||||
<p>Total: {{ kpi_total }}</p>
|
||||
<p>Total: {{ kpi_total|floatformat:2 }}</p>
|
||||
<p>Gastos: {{ kpi_count }}</p>
|
||||
<p>Categorías: {{ kpi_categories }}</p>
|
||||
</section>
|
||||
|
||||
@ -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,
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user