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
@@ -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">
+74 -13
View File
@@ -49,21 +49,31 @@
<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" %}"
title_css_classes="cursor-pointer" _="on click showAllDatasetsCurrency()">
<ul class="menu bg-base-100 w-full rounded-box"> <ul class="menu bg-base-100 w-full rounded-box">
{% for currency in currency_net_worth.values %} {% for currency in currency_net_worth.values %}
<li> <li>
{% if currency.consolidated and currency.consolidated.total_final != currency.total_final %} {% if currency.consolidated and currency.consolidated.total_final != currency.total_final %}
<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 text-ellipsis">{{ currency.currency.name }}</span> <span
class="currency-name text-start font-mono shrink text-ellipsis">{{ 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>
@@ -73,7 +83,12 @@
<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>
@@ -84,11 +99,19 @@
<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>
@@ -136,7 +159,8 @@
<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" %}"
title_css_classes="cursor-pointer" _="on click showAllDatasetsAccount()">
<ul class="menu bg-base-100 w-full rounded-box"> <ul class="menu bg-base-100 w-full rounded-box">
{% regroup account_net_worth.values by account.group as account_data %} {% regroup account_net_worth.values by account.group as account_data %}
{% for data in account_data %} {% for data in account_data %}
@@ -151,14 +175,22 @@
<li> <li>
<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 showOnlyAccountDataset('{{ account.account.name }}')"> _="on click showOnlyAccountDataset('{{ account.account.name }}')">
<span class="account-name text-start font-mono shrink text-ellipsis">{{ account.account.name }}</span> <span
class="account-name text-start font-mono shrink text-ellipsis">{{ account.account.name }}</span>
<span class="text-end shrink-0"> <span class="text-end shrink-0">
<div> <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> <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> </div>
{% if account.exchanged and account.exchanged.total_final %} {% if account.exchanged and account.exchanged.total_final %}
<div> <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> <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> </div>
{% endif %} {% endif %}
</span> </span>
@@ -176,11 +208,18 @@
<span class="account-name text-start font-mono shrink">{{ account.account.name }}</span> <span class="account-name text-start font-mono shrink">{{ account.account.name }}</span>
<span class="text-end shrink-0"> <span class="text-end shrink-0">
<div> <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> <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> </div>
{% if account.exchanged and account.exchanged.total_final %} {% if account.exchanged and account.exchanged.total_final %}
<div> <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> <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> </div>
{% endif %} {% endif %}
</span> </span>
@@ -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,
}
} }
} }
} }