Fixed bugs 2 #15

Merged
jkuijperm merged 13 commits from dev into main 2026-07-24 09:38:43 +00:00
Showing only changes of commit e1b4a6eef7 - Show all commits

View File

@ -1,8 +1,7 @@
import logging import logging
from operator import truediv import calendar
from datetime import date, datetime from datetime import date, datetime
from django.contrib import messages from django.contrib import messages
from django.template import context
from .models import Account, Category, Expense, FuelEntry, Tag, Income, Goal from .models import Account, Category, Expense, FuelEntry, Tag, Income, Goal
from .forms import ( from .forms import (
ExpenseForm, ExpenseForm,
@ -14,32 +13,13 @@ from .forms import (
GoalForm, GoalForm,
) )
# from dateutli.relativedelta import relativedelta
from django.db.models import Sum from django.db.models import Sum
from django.contrib.auth import login
from django.core.paginator import Paginator from django.core.paginator import Paginator
from django.utils.ipv6 import is_valid_ipv6_address
from django.db.models.functions import ExtractMonth, ExtractYear, ExtractDay from django.db.models.functions import ExtractMonth, ExtractYear, ExtractDay
from django.contrib.auth.decorators import login_required from django.contrib.auth.decorators import login_required
from django.shortcuts import get_object_or_404, render, redirect from django.shortcuts import get_object_or_404, render, redirect
MONTHS = {
1: "ENERO",
2: "FEBRERO",
3: "MARZO",
4: "ABRIL",
5: "MAYO",
6: "JUNIO",
7: "JULIO",
8: "AGOSTO",
9: "SEPTIEMBRE",
10: "OCTUBRE",
11: "NOVIEMBRE",
12: "DICIEMBRE",
}
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
def _get_int(value): def _get_int(value):
@ -337,7 +317,7 @@ def dashboard(request):
category_count = expenses_filtered.values("category").distinct().count() category_count = expenses_filtered.values("category").distinct().count()
# Total by category # Total by category
by_category_qs = by_category = ( by_category_qs = (
expenses_filtered.values("category__name") expenses_filtered.values("category__name")
.annotate(total=Sum("amount")) .annotate(total=Sum("amount"))
.order_by("-total") .order_by("-total")
@ -369,7 +349,6 @@ def dashboard(request):
) )
day_totals = {row["day"]: float(row["total"]) for row in by_day_qs} day_totals = {row["day"]: float(row["total"]) for row in by_day_qs}
import calendar
num_days = calendar.monthrange(selected_year, selected_month)[1] num_days = calendar.monthrange(selected_year, selected_month)[1]
if selected_year == today.year and selected_month == today.month: if selected_year == today.year and selected_month == today.month:
days_passed = today.day days_passed = today.day