marco/webmoney
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v1.27.5: Fix multi-currency in CashflowChart and dashboard widgets

Browse Source
This commit is contained in:
CnxiFly Dev 2025-12-13 21:16:57 +01:00
parent 84a1dbae29
commit cc448b5cd4
9 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CHANGELOG.md
View File

@ -5,6 +5,19 @@ O formato segue [Keep a Changelog](https://keepachangelog.com/pt-BR/).
Este projeto adota [Versionamento Semântico](https://semver.org/pt-BR/).
## [1.27.5] - 2025-12-13
### Fixed
- **Dashboard Multi-Divisa Completo** - Corrigido Flujo de Caja para usar divisa dinâmica
- CashflowChart agora recebe `primaryCurrency` como prop
- Tooltips do gráfico mostram a divisa correta
- Totais do período (receita, despesa, médias) usam `primary_currency`
- **Widgets Vencidos/Futuros** - Removidas divisas fixas (BRL/EUR)
- UpcomingWidget: Footer mostra contagem de items em vez de totais monetários
- OverdueWidget: Rangos mostram contagem, footer mostra média de dias
## [1.27.4] - 2025-12-13
### Added

2
VERSION
View File

@ -1 +1 @@
1.27.4
1.27.5

4
frontend/src/components/dashboard/CashflowChart.jsx
View File

@ -32,7 +32,7 @@ ChartJS.register(
Filler
);
const CashflowChart = ({ data, loading, scale = 'monthly' }) => {
const CashflowChart = ({ data, loading, scale = 'monthly', primaryCurrency = 'EUR' }) => {
const { t } = useTranslation();
const { currency } = useFormatters();
const chartRef = useRef(null);
@ -134,7 +134,7 @@ const CashflowChart = ({ data, loading, scale = 'monthly' }) => {
label: (context) => {
const value = context.parsed.y;
const label = context.dataset.label || '';
return `${label}: ${currency(value, 'BRL')}`;
return `${label}: ${currency(value, primaryCurrency)}`;
},
},
},

8
frontend/src/components/dashboard/OverdueWidget.jsx
View File

@ -146,8 +146,8 @@ const OverdueWidget = () => {
</span>
</div>
<div className="d-flex align-items-center gap-2">
<span className="text-danger fw-bold small">
{currency(range.total, 'BRL')}
<span className="badge bg-danger" style={{ fontSize: '10px' }}>
{range.count} {range.count === 1 ? t('common.item') : t('common.items')}
</span>
<i className={`bi bi-chevron-${expandedRange === range.key ? 'up' : 'down'} text-slate-500`}></i>
</div>
@ -246,10 +246,10 @@ const OverdueWidget = () => {
</div>
<div className="col-4">
<small className="text-slate-500 d-block" style={{ fontSize: '10px' }}>
{t('dashboard.totalAmount')}
{t('dashboard.avgDays')}
</small>
<span className="text-danger fw-bold small">
{currency(data.summary.total_amount || 0, 'BRL')}
~{Math.round(data.summary.max_days_overdue / 2)} {t('common.days')}
</span>
</div>
<div className="col-4">

4
frontend/src/components/dashboard/UpcomingWidget.jsx
View File

@ -161,7 +161,7 @@ const UpcomingWidget = () => {
{t('dashboard.income')}
</small>
<span className="text-success fw-bold small">
+{currency(data.summary.total_credit || 0, 'EUR')}
{data.summary.credit_count || 0} {t('common.items')}
</span>
</div>
<div className="col-6">
@ -169,7 +169,7 @@ const UpcomingWidget = () => {
{t('dashboard.expenses')}
</small>
<span className="text-danger fw-bold small">
-{currency(data.summary.total_debit || 0, 'EUR')}
{data.summary.debit_count || 0} {t('common.items')}
</span>
</div>
</div>

1
frontend/src/i18n/locales/en.json
View File

@ -173,6 +173,7 @@
"totalOverdue": "Total Overdue",
"totalAmount": "Total Amount",
"maxDelay": "Max Delay",
"avgDays": "Average",
"overdueRange": {
"critical": "Critical (> 30 days)",
"high": "High (15-30 days)",

1
frontend/src/i18n/locales/es.json
View File

@ -173,6 +173,7 @@
"totalOverdue": "Total Vencido",
"totalAmount": "Monto Total",
"maxDelay": "Mayor Retraso",
"avgDays": "Promedio",
"overdueRange": {
"critical": "Crítico (> 30 días)",
"high": "Alto (15-30 días)",

1
frontend/src/i18n/locales/pt-BR.json
View File

@ -174,6 +174,7 @@
"totalOverdue": "Total em Atraso",
"totalAmount": "Valor Total",
"maxDelay": "Maior Atraso",
"avgDays": "Média",
"overdueRange": {
"critical": "Crítico (> 30 dias)",
"high": "Alto (15-30 dias)",

9
frontend/src/pages/Dashboard.jsx
View File

@ -338,6 +338,7 @@ const Dashboard = () => {
<CashflowChart
data={cashflow?.data || []}
loading={cashflowLoading}
primaryCurrency={summary?.primary_currency || 'EUR'}
/>
{/* Resumo do período */}
@ -348,7 +349,7 @@ const Dashboard = () => {
{t('dashboard.totalIncome')}
</small>
<span className="text-success fw-bold">
{currency(cashflow.totals?.income || 0, 'BRL')}
{currency(cashflow.totals?.income || 0, summary?.primary_currency || 'EUR')}
</span>
</div>
<div className="col-6 col-md-3 text-center">
@ -356,7 +357,7 @@ const Dashboard = () => {
{t('dashboard.totalExpenses')}
</small>
<span className="text-danger fw-bold">
{currency(cashflow.totals?.expense || 0, 'BRL')}
{currency(cashflow.totals?.expense || 0, summary?.primary_currency || 'EUR')}
</span>
</div>
<div className="col-6 col-md-3 text-center mt-2 mt-md-0">
@ -364,7 +365,7 @@ const Dashboard = () => {
{t('dashboard.avgIncome')}
</small>
<span className="text-success">
{currency(cashflow.totals?.average_income || 0, 'BRL')}
{currency(cashflow.totals?.average_income || 0, summary?.primary_currency || 'EUR')}
</span>
</div>
<div className="col-6 col-md-3 text-center mt-2 mt-md-0">
@ -372,7 +373,7 @@ const Dashboard = () => {
{t('dashboard.avgExpense')}
</small>
<span className="text-danger">
{currency(cashflow.totals?.average_expense || 0, 'BRL')}
{currency(cashflow.totals?.average_expense || 0, summary?.primary_currency || 'EUR')}
</span>
</div>
</div>