From 391588fdf694a01618becc133fa52d97f7366704 Mon Sep 17 00:00:00 2001 From: MaysWind Date: Tue, 17 Nov 2020 00:52:26 +0800 Subject: [PATCH] add net assets/total assets/total liabilities in account list page --- src/consts/account.js | 7 ++ src/lib/utils.js | 37 +++++++ src/locales/en.js | 3 + src/locales/zh_Hans.js | 3 + src/views/mobile/accounts/AccountList.vue | 121 +++++++++++++++++++++- 5 files changed, 169 insertions(+), 2 deletions(-) diff --git a/src/consts/account.js b/src/consts/account.js index 34c7a58d..8af46fed 100644 --- a/src/consts/account.js +++ b/src/consts/account.js @@ -2,36 +2,43 @@ const allAccountCategories = [ { id: 1, name: 'Cash', + isAsset: true, defaultAccountIconId: '1' }, { id: 2, name: 'Debit Card', + isAsset: true, defaultAccountIconId: '2' }, { id: 3, name: 'Credit Card', + isLiability: true, defaultAccountIconId: '2' }, { id: 4, name: 'Virtual Account', + isAsset: true, defaultAccountIconId: '3' }, { id: 5, name: 'Debt Account', + isLiability: true, defaultAccountIconId: '4' }, { id: 6, name: 'Receivables', + isAsset: true, defaultAccountIconId: '5' }, { id: 7, name: 'Investment Account', + isAsset: true, defaultAccountIconId: '6' } ]; diff --git a/src/lib/utils.js b/src/lib/utils.js index 0445fb8e..3054164d 100644 --- a/src/lib/utils.js +++ b/src/lib/utils.js @@ -1,3 +1,5 @@ +import accountConstants from '../consts/account.js' + function isFunction(val) { return typeof(val) === 'function'; } @@ -61,6 +63,40 @@ function getAccountByAccountId(categorizedAccounts, accountId) { return null; } +function getAllFilteredAccountsBalance(categorizedAccounts, accountCategoryFilter) { + const allAccountCategories = accountConstants.allCategories; + const ret = []; + + for (let categoryIdx = 0; categoryIdx < allAccountCategories.length; categoryIdx++) { + const accountCategory = allAccountCategories[categoryIdx]; + + if (!accountCategoryFilter(accountCategory) || !categorizedAccounts[accountCategory.id]) { + continue; + } + + for (let accountIdx = 0; accountIdx < categorizedAccounts[accountCategory.id].length; accountIdx++) { + const account = categorizedAccounts[accountCategory.id][accountIdx]; + + if (account.type === accountConstants.allAccountTypes.SingleAccount) { + ret.push({ + balance: account.balance, + currency: account.currency + }); + } else if (account.type === accountConstants.allAccountTypes.MultiSubAccounts) { + for (let subAccountIdx = 0; subAccountIdx < account.subAccounts.length; subAccountIdx++) { + const subAccount = account.subAccounts[subAccountIdx]; + ret.push({ + balance: subAccount.balance, + currency: subAccount.currency + }); + } + } + } + } + + return ret; +} + export default { isFunction, isObject, @@ -70,4 +106,5 @@ export default { isBoolean, getCategorizedAccounts, getAccountByAccountId, + getAllFilteredAccountsBalance, }; diff --git a/src/locales/en.js b/src/locales/en.js index 517612b6..554fb84a 100644 --- a/src/locales/en.js +++ b/src/locales/en.js @@ -301,6 +301,9 @@ export default { 'Transaction Details': 'Transaction Details', 'Account List': 'Account List', 'New Transaction': 'New Transaction', + 'Net assets': 'Net assets', + 'Total assets': 'Total assets', + 'Total liabilities': 'Total liabilities', 'Expense': 'Expense', 'Income': 'Income', 'Transfer': 'Transfer', diff --git a/src/locales/zh_Hans.js b/src/locales/zh_Hans.js index 7682bf47..0361f0f7 100644 --- a/src/locales/zh_Hans.js +++ b/src/locales/zh_Hans.js @@ -301,6 +301,9 @@ export default { 'Transaction Details': '交易详情', 'Account List': '账户列表', 'New Transaction': '新交易', + 'Net assets': '净资产', + 'Total assets': '总资产', + 'Total liabilities': '总负债', 'Expense': '支出', 'Income': '收入', 'Transfer': '转账', diff --git a/src/views/mobile/accounts/AccountList.vue b/src/views/mobile/accounts/AccountList.vue index db0ee930..fb4b08ab 100644 --- a/src/views/mobile/accounts/AccountList.vue +++ b/src/views/mobile/accounts/AccountList.vue @@ -9,6 +9,24 @@ + + + {{ $t('Net assets') }}
+ {{ netAssets | currency(defaultCurrency) }} + + + +
+ + + + Account Category @@ -47,7 +65,12 @@ - {{ $t(accountCategory.name) }} + + + {{ $t(accountCategory.name) }} + {{ accountCategoryTotalBalance(accountCategory) | currency(defaultCurrency) }} + + true); + let netAssets = 0; + + for (let i = 0; i < accountsBalance.length; i++) { + if (accountsBalance[i].currency === this.defaultCurrency) { + netAssets += accountsBalance[i].balance; + } else { + // TODO: calculate exchange rate + netAssets += accountsBalance[i].balance; + } + } + + return netAssets; + }, + totalAssets() { + if (!this.showAccountBalance) { + return '---'; + } + + const accountsBalance = this.$utilities.getAllFilteredAccountsBalance(this.accounts, category => category.isAsset); + let totalAssets = 0; + + for (let i = 0; i < accountsBalance.length; i++) { + if (accountsBalance[i].currency === this.defaultCurrency) { + totalAssets += accountsBalance[i].balance; + } else { + // TODO: calculate exchange rate + totalAssets += accountsBalance[i].balance; + } + } + + return totalAssets; + }, + totalLiabilities() { + if (!this.showAccountBalance) { + return '---'; + } + + const accountsBalance = this.$utilities.getAllFilteredAccountsBalance(this.accounts, category => category.isLiability); + let totalLiabilities = 0; + + for (let i = 0; i < accountsBalance.length; i++) { + if (accountsBalance[i].currency === this.defaultCurrency) { + totalLiabilities += accountsBalance[i].balance; + } else { + // TODO: calculate exchange rate + totalLiabilities += accountsBalance[i].balance; + } + } + + return totalLiabilities; } }, created() { @@ -227,17 +311,40 @@ export default { return shownCount > 0; }, + toggleShowAccountBalance() { + this.showAccountBalance = !this.showAccountBalance; + this.$settings.setShowAccountBalance(this.showAccountBalance); + }, accountBalance(account) { if (account.type !== this.$constants.account.allAccountTypes.SingleAccount) { return null; } - if (this.$settings.isShowAccountBalance()) { + if (this.showAccountBalance) { return account.balance; } else { return '---'; } }, + accountCategoryTotalBalance(accountCategory) { + if (!this.showAccountBalance) { + return '---'; + } + + const accountsBalance = this.$utilities.getAllFilteredAccountsBalance(this.accounts, category => category.id === accountCategory.id); + let totalBalance = 0; + + for (let i = 0; i < accountsBalance.length; i++) { + if (accountsBalance[i].currency === this.defaultCurrency) { + totalBalance += accountsBalance[i].balance; + } else { + // TODO: calculate exchange rate + totalBalance += accountsBalance[i].balance; + } + } + + return totalBalance; + }, setSortable() { this.showHidden = true; this.sortable = true; @@ -404,3 +511,13 @@ export default { } }; + +