zhengchen.tao/ezbookkeeping
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix the amounts in non-default currencies are not converted to the default currency in the statistics data shown in the insights explorer data table

Browse Source
This commit is contained in:
MaysWind
2026-03-08 18:04:48 +08:00
parent 0b7471879d
commit a0fd468309
1 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/stores/explorer.ts
+27 -14
View File
@@ -608,6 +608,7 @@ export const useExplorersStore = defineStore('explorers', () => {
}); });
const filteredTransactionsInDataTableStatistic = computed<InsightsExplorerTransactionStatisticData>(() => { const filteredTransactionsInDataTableStatistic = computed<InsightsExplorerTransactionStatisticData>(() => {
const defaultCurrency = userStore.currentUserDefaultCurrency;
const statisticData: InsightsExplorerTransactionStatisticData = { const statisticData: InsightsExplorerTransactionStatisticData = {
totalCount: 0, totalCount: 0,
totalAmount: 0, totalAmount: 0,
@@ -632,23 +633,35 @@ export const useExplorersStore = defineStore('explorers', () => {
for (const transaction of filteredTransactionsInDataTable.value) { for (const transaction of filteredTransactionsInDataTable.value) {
statisticData.totalCount++; statisticData.totalCount++;
statisticData.totalAmount += transaction.sourceAmount;
let amountInDefaultCurrency: number = transaction.sourceAmount;
if (transaction.sourceAccount.currency !== defaultCurrency) {
const amount = exchangeRatesStore.getExchangedAmount(transaction.sourceAmount, transaction.sourceAccount.currency, defaultCurrency);
if (isNumber(amount)) {
amountInDefaultCurrency = Math.trunc(amount);
} else {
continue;
}
}
statisticData.totalAmount += amountInDefaultCurrency;
sourceAmounts.push(amountInDefaultCurrency);
if (transaction.type === TransactionType.Income) { if (transaction.type === TransactionType.Income) {
statisticData.totalIncome += transaction.sourceAmount; statisticData.totalIncome += amountInDefaultCurrency;
} else if (transaction.type === TransactionType.Expense) { } else if (transaction.type === TransactionType.Expense) {
statisticData.totalExpense += transaction.sourceAmount; statisticData.totalExpense += amountInDefaultCurrency;
} }
if (transaction.sourceAmount >= 0 && transaction.sourceAmount < statisticData.minimumAmount) { if (amountInDefaultCurrency >= 0 && amountInDefaultCurrency < statisticData.minimumAmount) {
statisticData.minimumAmount = transaction.sourceAmount; statisticData.minimumAmount = amountInDefaultCurrency;
} }
if (transaction.sourceAmount > statisticData.maximumAmount) { if (amountInDefaultCurrency > statisticData.maximumAmount) {
statisticData.maximumAmount = transaction.sourceAmount; statisticData.maximumAmount = amountInDefaultCurrency;
} }
sourceAmounts.push(transaction.sourceAmount);
} }
statisticData.netIncome = statisticData.totalIncome - statisticData.totalExpense; statisticData.netIncome = statisticData.totalIncome - statisticData.totalExpense;
@@ -661,8 +674,8 @@ export const useExplorersStore = defineStore('explorers', () => {
statisticData.maximumAmount = 0; statisticData.maximumAmount = 0;
} }
if (statisticData.totalCount > 0) { if (sourceAmounts.length > 0) {
statisticData.averageAmount = Math.trunc(statisticData.totalAmount / statisticData.totalCount); statisticData.averageAmount = Math.trunc(statisticData.totalAmount / sourceAmounts.length);
} }
statisticData.range = statisticData.maximumAmount - statisticData.minimumAmount; statisticData.range = statisticData.maximumAmount - statisticData.minimumAmount;
@@ -692,14 +705,14 @@ export const useExplorersStore = defineStore('explorers', () => {
cumulativeCount++; cumulativeCount++;
if (cumulativeAmount >= eightyPercentAmountThreshold) { if (cumulativeAmount >= eightyPercentAmountThreshold) {
statisticData.transactionsFor80PercentAmount = 100.0 * cumulativeCount / statisticData.totalCount; statisticData.transactionsFor80PercentAmount = 100.0 * cumulativeCount / sourceAmounts.length;
break; break;
} }
} }
} }
if (statisticData.totalCount > 0 && sourceAmounts.length > 0) { if (sourceAmounts.length > 0) {
const averageAmountForVarianceCalculation: number = statisticData.totalAmount / statisticData.totalCount / 100.0; const averageAmountForVarianceCalculation: number = statisticData.totalAmount / sourceAmounts.length / 100.0;
const sumOfSquaredDifferences: number = sourceAmounts.reduce((sum, amount) => sum + Math.pow(amount / 100.0 - averageAmountForVarianceCalculation, 2), 0); const sumOfSquaredDifferences: number = sourceAmounts.reduce((sum, amount) => sum + Math.pow(amount / 100.0 - averageAmountForVarianceCalculation, 2), 0);
statisticData.variance = sumOfSquaredDifferences / sourceAmounts.length; statisticData.variance = sumOfSquaredDifferences / sourceAmounts.length;
statisticData.standardDeviation = Math.sqrt(statisticData.variance); statisticData.standardDeviation = Math.sqrt(statisticData.variance);