feat: fixes

This commit is contained in:
Herculino Trotta
2025-11-22 01:30:43 -03:00
parent 2ae57e83cb
commit 605ece705e
2 changed files with 170 additions and 109 deletions

View File

@@ -16,7 +16,7 @@
</div> </div>
</div> </div>
<div class="row gap-3"> <div class="row g-3">
<div class="col-12 lg:col-6"> <div class="col-12 lg:col-6">
<div class="card bg-base-100 card-border shadow h-full"> <div class="card bg-base-100 card-border shadow h-full">
<div class="card-header bg-base-200 p-4 font-semibold rounded-box shadow"> <div class="card-header bg-base-200 p-4 font-semibold rounded-box shadow">

View File

@@ -24,23 +24,23 @@
<label class="tab"> <label class="tab">
<input type="radio" <input type="radio"
name="view_type" name="view_type"
class="tab" class="tab"
aria-label="{% trans "Current" %}" aria-label="{% trans "Current" %}"
value="current" value="current"
{% if type == "current" %}checked{% endif %} /> {% if type == "current" %}checked{% endif %}/>
<i class="fa-solid fa-sack-dollar fa-fw me-2"></i> <i class="fa-solid fa-sack-dollar fa-fw me-2"></i>
{% trans "Current" %} {% trans "Current" %}
</label> </label>
<label class="tab"> <label class="tab">
<input type="radio" <input type="radio"
name="view_type" name="view_type"
class="tab" class="tab"
aria-label="{% trans "Projected" %}" aria-label="{% trans "Projected" %}"
value="projected" value="projected"
{% if type == "projected" %}checked{% endif %} /> {% if type == "projected" %}checked{% endif %}/>
<i class="fa-solid fa-rocket fa-fw me-2"></i> <i class="fa-solid fa-rocket fa-fw me-2"></i>
{% trans "Projected" %} {% trans "Projected" %}
</label> </label>
</div> </div>
</div> </div>
@@ -49,54 +49,77 @@
<div class="row gap-y-3"> <div class="row gap-y-3">
<div class="col lg:col-5"> <div class="col lg:col-5">
<div> <div>
<c-ui.info-card color="yellow" icon="fa-solid fa-coins" title="{% trans "By currency" %}" title_css_classes="cursor-pointer" _="on click showAllDatasetsCurrency()"> <c-ui.info-card color="yellow" icon="fa-solid fa-coins" title="{% trans "By currency" %}"
<ul class="menu bg-base-100 w-full rounded-box"> title_css_classes="cursor-pointer" _="on click showAllDatasetsCurrency()">
{% for currency in currency_net_worth.values %} <ul class="menu bg-base-100 w-full rounded-box">
<li> {% for currency in currency_net_worth.values %}
{% if currency.consolidated and currency.consolidated.total_final != currency.total_final %} <li>
<a class="cursor-pointer select-auto flex justify-between items-center w-full" {% if currency.consolidated and currency.consolidated.total_final != currency.total_final %}
_="on click showOnlyCurrencyDataset('{{ currency.currency.name }}')"> <a class="cursor-pointer select-auto flex justify-between items-center w-full"
<span class="currency-name text-start font-mono shrink text-ellipsis">{{ currency.currency.name }}</span> _="on click showOnlyCurrencyDataset('{{ currency.currency.name }}')">
<span class="text-end shrink-0"> <span
class="currency-name text-start font-mono shrink text-ellipsis">{{ currency.currency.name }}</span>
<span class="text-end shrink-0">
<div> <div>
<c-amount.display :amount="currency.total_final" :prefix="currency.currency.prefix" :suffix="currency.currency.suffix" :decimal_places="currency.currency.decimal_places" color="{% if currency.total_final > 0 %}green{% elif currency.total_final < 0 %}red{% endif %}" text-end></c-amount.display> <c-amount.display :amount="currency.total_final" :prefix="currency.currency.prefix"
:suffix="currency.currency.suffix"
:decimal_places="currency.currency.decimal_places"
color="{% if currency.total_final > 0 %}green{% elif currency.total_final < 0 %}red{% endif %}"
text-end></c-amount.display>
</div> </div>
{% if currency.exchanged and currency.exchanged.total_final %} {% if currency.exchanged and currency.exchanged.total_final %}
<div> <div>
<c-amount.display :amount="currency.exchanged.total_final" :prefix="currency.exchanged.currency.prefix" :suffix="currency.exchanged.currency.suffix" :decimal_places="currency.exchanged.currency.decimal_places" text-end color="grey"></c-amount.display> <c-amount.display :amount="currency.exchanged.total_final"
:prefix="currency.exchanged.currency.prefix"
:suffix="currency.exchanged.currency.suffix"
:decimal_places="currency.exchanged.currency.decimal_places" text-end
color="grey"></c-amount.display>
</div> </div>
{% endif %} {% endif %}
</span> </span>
</a> </a>
<ul> <ul>
<li> <li>
<a class="text-base-content/60 select-auto flex justify-between items-center w-full"> <a class="text-base-content/60 select-auto flex justify-between items-center w-full">
<span class="text-start shrink">{% trans "Consolidated" %}</span> <span class="text-start shrink">{% trans "Consolidated" %}</span>
<span class="text-end shrink-0"> <span class="text-end shrink-0">
<c-amount.display :amount="currency.consolidated.total_final" :prefix="currency.consolidated.currency.prefix" :suffix="currency.consolidated.currency.suffix" :decimal_places="currency.consolidated.currency.decimal_places" color="{% if currency.consolidated.total_final > 0 %}green{% elif currency.consolidated.total_final < 0 %}red{% endif %}" text-end></c-amount.display> <c-amount.display :amount="currency.consolidated.total_final"
:prefix="currency.consolidated.currency.prefix"
:suffix="currency.consolidated.currency.suffix"
:decimal_places="currency.consolidated.currency.decimal_places"
color="{% if currency.consolidated.total_final > 0 %}green{% elif currency.consolidated.total_final < 0 %}red{% endif %}"
text-end></c-amount.display>
</span> </span>
</a> </a>
</li> </li>
</ul> </ul>
{% else %} {% else %}
<a class="cursor-pointer select-auto flex justify-between items-center w-full" <a class="cursor-pointer select-auto flex justify-between items-center w-full"
_="on click showOnlyCurrencyDataset('{{ currency.currency.name }}')"> _="on click showOnlyCurrencyDataset('{{ currency.currency.name }}')">
<span class="currency-name text-start font-mono shrink">{{ currency.currency.name }}</span> <span class="currency-name text-start font-mono shrink">{{ currency.currency.name }}</span>
<span class="text-end shrink-0"> <span class="text-end shrink-0">
<div> <div>
<c-amount.display :amount="currency.total_final" :prefix="currency.currency.prefix" :suffix="currency.currency.suffix" :decimal_places="currency.currency.decimal_places" color="{% if currency.total_final > 0 %}green{% elif currency.total_final < 0 %}red{% endif %}" text-end></c-amount.display> <c-amount.display :amount="currency.total_final" :prefix="currency.currency.prefix"
:suffix="currency.currency.suffix"
:decimal_places="currency.currency.decimal_places"
color="{% if currency.total_final > 0 %}green{% elif currency.total_final < 0 %}red{% endif %}"
text-end></c-amount.display>
</div> </div>
{% if currency.exchanged and currency.exchanged.total_final %} {% if currency.exchanged and currency.exchanged.total_final %}
<div> <div>
<c-amount.display :amount="currency.exchanged.total_final" :prefix="currency.exchanged.currency.prefix" :suffix="currency.exchanged.currency.suffix" :decimal_places="currency.exchanged.currency.decimal_places" text-end color="grey"></c-amount.display> <c-amount.display :amount="currency.exchanged.total_final"
:prefix="currency.exchanged.currency.prefix"
:suffix="currency.exchanged.currency.suffix"
:decimal_places="currency.exchanged.currency.decimal_places" text-end
color="grey"></c-amount.display>
</div> </div>
{% endif %} {% endif %}
</span> </span>
</a> </a>
{% endif %} {% endif %}
</li> </li>
{% endfor %} {% endfor %}
</ul> </ul>
</c-ui.info-card> </c-ui.info-card>
</div> </div>
</div> </div>
@@ -110,7 +133,7 @@
class="tab" class="tab"
aria-label="{% trans 'Evolution' %}" aria-label="{% trans 'Evolution' %}"
id="tab-evolution" id="tab-evolution"
checked="checked" /> checked="checked"/>
<div role="tabpanel" class="tab-content p-4" id="evolution-tab-pane"> <div role="tabpanel" class="tab-content p-4" id="evolution-tab-pane">
<div class="chart-container relative min-h-[80vh] md:min-h-[40vh] h-full w-full"> <div class="chart-container relative min-h-[80vh] md:min-h-[40vh] h-full w-full">
<canvas id="currencyBalanceChart"></canvas> <canvas id="currencyBalanceChart"></canvas>
@@ -121,7 +144,7 @@
role="tab" role="tab"
class="tab" class="tab"
aria-label="{% trans 'Difference' %}" aria-label="{% trans 'Difference' %}"
id="tab-diff" /> id="tab-diff"/>
<div role="tabpanel" class="tab-content p-4" id="diff-tab-pane"> <div role="tabpanel" class="tab-content p-4" id="diff-tab-pane">
<div class="chart-container relative min-h-[80vh] md:min-h-[40vh] h-full w-full"> <div class="chart-container relative min-h-[80vh] md:min-h-[40vh] h-full w-full">
<canvas id="monthlyDifferenceChart"></canvas> <canvas id="monthlyDifferenceChart"></canvas>
@@ -132,64 +155,80 @@
</div> </div>
</div> </div>
</div> </div>
<hr class="hr my-6" /> <hr class="hr my-6"/>
<div class="row gap-y-3"> <div class="row gap-y-3">
<div class="col lg:col-5"> <div class="col lg:col-5">
<div> <div>
<c-ui.info-card color="blue" icon="fa-solid fa-wallet" title="{% trans "By account" %}" title_css_classes="cursor-pointer" _="on click showAllDatasetsAccount()"> <c-ui.info-card color="blue" icon="fa-solid fa-wallet" title="{% trans "By account" %}"
<ul class="menu bg-base-100 w-full rounded-box"> title_css_classes="cursor-pointer" _="on click showAllDatasetsAccount()">
{% regroup account_net_worth.values by account.group as account_data %} <ul class="menu bg-base-100 w-full rounded-box">
{% for data in account_data %} {% regroup account_net_worth.values by account.group as account_data %}
{% if data.grouper %} {% for data in account_data %}
<li> {% if data.grouper %}
<details open>
<summary class="select-auto">
<span class="badge badge-primary">{{ data.grouper }}</span>
</summary>
<ul>
{% for account in data.list %}
<li>
<a class="cursor-pointer select-auto flex justify-between items-center w-full"
_="on click showOnlyAccountDataset('{{ account.account.name }}')">
<span class="account-name text-start font-mono shrink text-ellipsis">{{ account.account.name }}</span>
<span class="text-end shrink-0">
<div>
<c-amount.display :amount="account.total_final" :prefix="account.currency.prefix" :suffix="account.currency.suffix" :decimal_places="account.currency.decimal_places" color="{% if account.total_final > 0 %}green{% elif account.total_final < 0 %}red{% endif %}"></c-amount.display>
</div>
{% if account.exchanged and account.exchanged.total_final %}
<div>
<c-amount.display :amount="account.exchanged.total_final" :prefix="account.exchanged.currency.prefix" :suffix="account.exchanged.currency.suffix" :decimal_places="account.exchanged.currency.decimal_places" color="grey" text-end></c-amount.display>
</div>
{% endif %}
</span>
</a>
</li>
{% endfor %}
</ul>
</details>
</li>
{% else %}
{% for account in data.list %}
<li> <li>
<a class="cursor-pointer flex select-auto justify-between items-center w-full" <details open>
_="on click showOnlyAccountDataset('{{ account.account.name }}')"> <summary class="select-auto">
<span class="account-name text-start font-mono shrink">{{ account.account.name }}</span> <span class="badge badge-primary">{{ data.grouper }}</span>
<span class="text-end shrink-0"> </summary>
<div> <ul>
<c-amount.display :amount="account.total_final" :prefix="account.currency.prefix" :suffix="account.currency.suffix" :decimal_places="account.currency.decimal_places" color="{% if account.total_final > 0 %}green{% elif account.total_final < 0 %}red{% endif %}"></c-amount.display> {% for account in data.list %}
</div> <li>
{% if account.exchanged and account.exchanged.total_final %} <a class="cursor-pointer select-auto flex justify-between items-center w-full"
<div> _="on click showOnlyAccountDataset('{{ account.account.name }}')">
<c-amount.display :amount="account.exchanged.total_final" :prefix="account.exchanged.currency.prefix" :suffix="account.exchanged.currency.suffix" :decimal_places="account.exchanged.currency.decimal_places" color="grey" text-end></c-amount.display> <span
</div> class="account-name text-start font-mono shrink text-ellipsis">{{ account.account.name }}</span>
{% endif %} <span class="text-end shrink-0">
</span> <div>
</a> <c-amount.display :amount="account.total_final" :prefix="account.currency.prefix"
:suffix="account.currency.suffix"
:decimal_places="account.currency.decimal_places"
color="{% if account.total_final > 0 %}green{% elif account.total_final < 0 %}red{% endif %}"></c-amount.display>
</div>
{% if account.exchanged and account.exchanged.total_final %}
<div>
<c-amount.display :amount="account.exchanged.total_final"
:prefix="account.exchanged.currency.prefix"
:suffix="account.exchanged.currency.suffix"
:decimal_places="account.exchanged.currency.decimal_places"
color="grey" text-end></c-amount.display>
</div>
{% endif %}
</span>
</a>
</li>
{% endfor %}
</ul>
</details>
</li> </li>
{% endfor %} {% else %}
{% endif %} {% for account in data.list %}
{% endfor %} <li>
</ul> <a class="cursor-pointer flex select-auto justify-between items-center w-full"
_="on click showOnlyAccountDataset('{{ account.account.name }}')">
<span class="account-name text-start font-mono shrink">{{ account.account.name }}</span>
<span class="text-end shrink-0">
<div>
<c-amount.display :amount="account.total_final" :prefix="account.currency.prefix"
:suffix="account.currency.suffix"
:decimal_places="account.currency.decimal_places"
color="{% if account.total_final > 0 %}green{% elif account.total_final < 0 %}red{% endif %}"></c-amount.display>
</div>
{% if account.exchanged and account.exchanged.total_final %}
<div>
<c-amount.display :amount="account.exchanged.total_final"
:prefix="account.exchanged.currency.prefix"
:suffix="account.exchanged.currency.suffix"
:decimal_places="account.exchanged.currency.decimal_places" color="grey"
text-end></c-amount.display>
</div>
{% endif %}
</span>
</a>
</li>
{% endfor %}
{% endif %}
{% endfor %}
</ul>
</c-ui.info-card> </c-ui.info-card>
</div> </div>
</div> </div>
@@ -249,6 +288,7 @@
display: true, display: true,
grid: { grid: {
drawOnChartArea: i === 0, drawOnChartArea: i === 0,
drawTicks: false,
}, },
ticks: { ticks: {
display: false, display: false,
@@ -313,6 +353,7 @@
position: i % 2 === 0 ? 'left' : 'right', position: i % 2 === 0 ? 'left' : 'right',
grid: { grid: {
drawOnChartArea: i === 0, drawOnChartArea: i === 0,
drawTicks: false,
}, },
ticks: { ticks: {
display: false, display: false,
@@ -365,6 +406,12 @@
}, },
y: { y: {
stacked: true, stacked: true,
border: {
display: true,
},
grid: {
drawTicks: false,
},
ticks: { ticks: {
display: false, display: false,
format: { format: {
@@ -372,6 +419,20 @@
minimumFractionDigits: 0 minimumFractionDigits: 0
} }
}, },
},
y1: {
position: 'right',
display: true,
grid: {
drawOnChartArea: false,
drawTicks: false,
},
border: {
display: true,
},
ticks: {
display: false,
}
} }
} }
} }