- {% for goal in goals %}
-
-
{{ goal.name }}
- {% if goal.is_exceeded %}
-
Excedido
- {% endif %}
+
+ Objetivos
+ {% if goals %}
+
- {% else %}
- No tienes objetivos aún.
- {% endif %}
+ {% endfor %}
+
+ {% else %}
+
No tienes objetivos aún.
+ {% endif %}
+
{% endblock %}
diff --git a/expenses_manager/expenses/views.py b/expenses_manager/expenses/views.py
index 65cd142..6f8e710 100644
--- a/expenses_manager/expenses/views.py
+++ b/expenses_manager/expenses/views.py
@@ -1,6 +1,7 @@
import logging
import calendar
from datetime import date, datetime
+from decimal import Decimal
from django.contrib import messages
from .models import Account, Category, Expense, FuelEntry, Tag, Income, Goal
from .forms import (
@@ -58,21 +59,108 @@ def sub_months(year, month, n):
@login_required
def home(request):
+ today = date.today()
expenses = Expense.objects.filter(owner=request.user)
- # Last expenses
- last_expenses = expenses.select_related("category").order_by("-date")[:5]
-
- # Simple KPIs (current month)
- today = date.today()
+ # ---- KPIs del mes en curso ----
month_expenses = expenses.filter(date__year=today.year, date__month=today.month)
-
- kpi_total = month_expenses.aggregate(total=Sum("amount"))["total"] or 0
-
+ kpi_total = month_expenses.aggregate(total=Sum("amount"))["total"] or Decimal("0")
kpi_count = month_expenses.count()
-
kpi_categories = month_expenses.values("category").distinct().count()
+ # ---- Comparativa con el mes anterior ----
+ prev_year, prev_month = sub_months(today.year, today.month, 1)
+ prev_total = (
+ expenses.filter(date__year=prev_year, date__month=prev_month).aggregate(
+ total=Sum("amount")
+ )["total"]
+ or Decimal("0")
+ )
+ diff_amount = kpi_total - prev_total
+ # None cuando no hay mes anterior con gastos (evita división por cero)
+ diff_pct = None
+ if prev_total:
+ diff_pct = (diff_amount / prev_total) * 100
+
+ # ---- Saldos de cuentas ----
+ # Dos queries agregadas en lugar de N+1 (nada de account.current_balance() en bucle).
+ accounts = list(Account.objects.filter(owner=request.user, active=True))
+ account_ids = [a.id for a in accounts]
+
+ expense_totals = {
+ row["account_id"]: row["total"]
+ for row in Expense.objects.filter(account_id__in=account_ids)
+ .values("account_id")
+ .annotate(total=Sum("amount"))
+ }
+ income_totals = {
+ row["account_id"]: row["total"]
+ for row in Income.objects.filter(account_id__in=account_ids)
+ .values("account_id")
+ .annotate(total=Sum("amount"))
+ }
+
+ account_balances = []
+ negative_accounts = []
+ total_balance = Decimal("0")
+ for acc in accounts:
+ balance = (
+ acc.initial_balance
+ + (income_totals.get(acc.id) or Decimal("0"))
+ - (expense_totals.get(acc.id) or Decimal("0"))
+ )
+ total_balance += balance
+ account_balances.append({"account": acc, "balance": balance})
+ if balance < 0:
+ negative_accounts.append({"account": acc, "balance": balance})
+
+ # ---- Objetivos ----
+ # Una sola query reutilizada para "goals" (home) y "exceeded_goals" (alertas).
+ # is_exceeded() solo aplica a kind == budget, así que pago y ahorro nunca la disparan.
+ all_goals = list(
+ Goal.objects.filter(owner=request.user).select_related("category", "account")
+ )
+ goals = [g for g in all_goals if g.show_on_home]
+ exceeded_goals = [g for g in all_goals if g.is_exceeded()]
+
+ has_alerts = bool(exceeded_goals or negative_accounts)
+
+ # ---- Últimos movimientos (gastos + ingresos mezclados) ----
+ recent_expenses = expenses.select_related("category", "account").order_by(
+ "-date", "-id"
+ )[:8]
+ recent_incomes = (
+ Income.objects.filter(owner=request.user)
+ .select_related("account")
+ .order_by("-date", "-id")[:8]
+ )
+
+ movements = sorted(
+ [
+ {
+ "kind": "expense",
+ "date": e.date,
+ "label": e.category.name,
+ "account": e.account.name,
+ "amount": e.amount,
+ }
+ for e in recent_expenses
+ ]
+ + [
+ {
+ "kind": "income",
+ "date": i.date,
+ "label": i.name,
+ "account": i.account.name,
+ "amount": i.amount,
+ }
+ for i in recent_incomes
+ ],
+ key=lambda m: m["date"],
+ reverse=True,
+ )[:8]
+
+ # ---- Mini-gráfico de 6 meses (sin cambios) ----
six_months = []
for i in range(5, -1, -1):
y, m = sub_months(today.year, today.month, i)
@@ -86,28 +174,28 @@ def home(request):
]
or 0
)
+ mini_data.append({"label": f"{m}/{y}", "total": float(total)})
- mini_data.append(
- {
- "label": f"{m}/{y}",
- "total": float(total),
- }
- )
-
- goals = Goal.objects.filter(owner=request.user, show_on_home=True)
-
return render(
request,
"expenses/home.html",
{
"active_menu": "home",
- "last_expenses": last_expenses,
"kpi_total": kpi_total,
"kpi_count": kpi_count,
"kpi_categories": kpi_categories,
+ "prev_total": prev_total,
+ "diff_amount": diff_amount,
+ "diff_pct": diff_pct,
+ "total_balance": total_balance,
+ "account_balances": account_balances,
+ "negative_accounts": negative_accounts,
+ "goals": goals,
+ "exceeded_goals": exceeded_goals,
+ "has_alerts": has_alerts,
+ "movements": movements,
"mini_chart_labels": [x["label"] for x in mini_data],
"mini_chart_data": [x["total"] for x in mini_data],
- "goals": goals,
},
)