jkuijperm/expenses_manager
1
0
Fork 0
Code Issues 13 Pull Requests Actions Packages Projects Releases Wiki Activity

Modificaciones en filtrado y creada opción para marcar que un gasto/ingreso es un traspaso de cuentas #34

Merged
jkuijperm merged 18 commits from dev into main 2026-09-16 07:50:18 +00:00
Conversation 0 Commits 18 Files Changed 20 +11 -11
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit beeda95d5d - Show all commits

2
expenses_manager/expenses/static/expenses/css/base.css
View File

@ -273,7 +273,7 @@ a.danger:visited,
margin-bottom: 1rem; margin-bottom: 1rem;
} }
.dashboard-context h2 { .dashboard-context h1 {
margin: 0; margin: 0;
} }

20
expenses_manager/expenses/templates/expenses/dashboard.html
View File

@ -7,13 +7,13 @@
{% block content %} {% block content %}
<section class="dashboard-context"> <section class="dashboard-context">
<h2> <h1>
{% if selected_account_obj %} {% if selected_account_obj %}
{{ selected_account_obj.name }} {{ selected_account_obj.name }}
{% else %} {% else %}
Todas las cuentas Todas las cuentas
{% endif %} {% endif %}
</h2> </h1>
<p class="muted"> <p class="muted">
{% if selected_month %} {% if selected_month %}
@ -137,7 +137,7 @@
{% if compare_enabled %} {% if compare_enabled %}
<section class="comparison"> <section class="comparison">
<h3>Resumen comparativo</h3> <h2>Resumen comparativo</h2>
<p> <p>
Gastos periodo actual: <strong>{{ kpi_total|floatformat:2 }} €</strong><br> Gastos periodo actual: <strong>{{ kpi_total|floatformat:2 }} €</strong><br>
Gastos periodo anterior: <strong>{{ kpi_previous_total|floatformat:2 }} €</strong><br> Gastos periodo anterior: <strong>{{ kpi_previous_total|floatformat:2 }} €</strong><br>
@ -150,7 +150,7 @@
</small> </small>
</p> </p>
<h3>Desglose de cambios por categoría</h3> <h2>Desglose de cambios por categoría</h2>
<div class="table-wrap"> <div class="table-wrap">
<table> <table>
<thead> <thead>
@ -184,21 +184,21 @@
<div class="charts-container"> <div class="charts-container">
<section> <section>
<h3>Evolución de Gastos ({% if chart_type == 'day' %}Por día {% else %} Por Meses{% endif %})</h3> <h2>Evolución de Gastos ({% if chart_type == 'day' %}Por día {% else %} Por Meses{% endif %})</h2>
<div class="chart-box"> <div class="chart-box">
<canvas id="mainChart"></canvas> <canvas id="mainChart"></canvas>
</div> </div>
</section> </section>
<section> <section>
<h3>Distribución por Categorías</h3> <h2>Distribución por Categorías</h2>
<div class="chart-box"> <div class="chart-box">
<canvas id="categoryChart"></canvas> <canvas id="categoryChart"></canvas>
</div> </div>
</section> </section>
<section> <section>
<h3>Gastos Recientes</h3> <h2>Gastos Recientes</h2>
<div class="table-wrap"> <div class="table-wrap">
<table class="table"> <table class="table">
<thead> <thead>
@ -262,11 +262,11 @@
}); });
</script> </script>
<h3>Evolución anual por cuenta ({{ selected_year }})</h3> <h2>Evolución anual por cuenta ({{ selected_year }})</h2>
<div class="dashboard-grid"> <div class="dashboard-grid">
{% for acc in accounts_charts %} {% for acc in accounts_charts %}
<div class="card card-chart"> <div class="card card-chart">
<h4>{{ acc.name }}</h4> <h3>{{ acc.name }}</h3>
<p><strong>Saldo actual:</strong> {{ acc.current_balance|floatformat:2 }}€</p> <p><strong>Saldo actual:</strong> {{ acc.current_balance|floatformat:2 }}€</p>
<div class="canvas-wrapper"> <div class="canvas-wrapper">
<canvas id="accountChart{{ acc.id }}"></canvas> <canvas id="accountChart{{ acc.id }}"></canvas>
@ -369,7 +369,7 @@
<!-- Goals --> <!-- Goals -->
<!-- ========================= --> <!-- ========================= -->
<h3>Objetivos</h3> <h2>Objetivos</h2>
{% if goals %} {% if goals %}
<div class="goals-widget"> <div class="goals-widget">
{% for goal in goals %} {% for goal in goals %}