jacob1123/budgeteer
1
1
Fork 0
Code Issues 12 Pull Requests 1 Packages Releases 1 Wiki Activity

Show cleared balance by default

Browse Source
This commit is contained in:
Jan Bader 2022-02-27 15:22:54 +00:00
parent 79fd95e152
commit c4995bcbaf
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/src/pages/BudgetSidebar.vue
View File

@ -36,7 +36,7 @@ const OffBudgetAccountsBalance = computed(() => accountStore.OffBudgetAccountsBa
</div> </div>
<div v-for="account in OnBudgetAccounts" class="flex flex-row justify-between"> <div v-for="account in OnBudgetAccounts" class="flex flex-row justify-between">
<router-link :to="'/budget/'+CurrentBudgetID+'/account/'+account.ID">{{account.Name}}</router-link> <router-link :to="'/budget/'+CurrentBudgetID+'/account/'+account.ID">{{account.Name}}</router-link>
<Currency :class="ExpandMenu?'md:inline':'md:hidden'" :value="account.Balance" /> <Currency :class="ExpandMenu?'md:inline':'md:hidden'" :value="account.ClearedBalance" />
</div> </div>
</li> </li>
<li class="bg-red-200 rounded-lg m-1 p-1 px-3"> <li class="bg-red-200 rounded-lg m-1 p-1 px-3">
@ -46,7 +46,7 @@ const OffBudgetAccountsBalance = computed(() => accountStore.OffBudgetAccountsBa
</div> </div>
<div v-for="account in OffBudgetAccounts" class="flex flex-row justify-between"> <div v-for="account in OffBudgetAccounts" class="flex flex-row justify-between">
<router-link :to="'/budget/'+CurrentBudgetID+'/account/'+account.ID">{{account.Name}}</router-link> <router-link :to="'/budget/'+CurrentBudgetID+'/account/'+account.ID">{{account.Name}}</router-link>
<Currency :class="ExpandMenu?'md:inline':'md:hidden'" :value="account.Balance" /> <Currency :class="ExpandMenu?'md:inline':'md:hidden'" :value="account.ClearedBalance" />
</div> </div>
</li> </li>
<li class="bg-red-200 rounded-lg m-1 p-1 px-3"> <li class="bg-red-200 rounded-lg m-1 p-1 px-3">

8
web/src/stores/budget-account.ts
View File

@ -31,7 +31,9 @@ export interface Account {
ID: string ID: string
Name: string Name: string
OnBudget: boolean OnBudget: boolean
Balance: number ClearedBalance: number
WorkingBalance: number
ReconciledBalance: number
Transactions: string[] Transactions: string[]
} }
@ -95,13 +97,13 @@ export const useAccountStore = defineStore("budget/account", {
return [...state.Accounts.values()].filter(x => x.OnBudget); return [...state.Accounts.values()].filter(x => x.OnBudget);
}, },
OnBudgetAccountsBalance(state): number { OnBudgetAccountsBalance(state): number {
return this.OnBudgetAccounts.reduce((prev, curr) => prev + Number(curr.Balance), 0); return this.OnBudgetAccounts.reduce((prev, curr) => prev + Number(curr.ClearedBalance), 0);
}, },
OffBudgetAccounts(state) { OffBudgetAccounts(state) {
return [...state.Accounts.values()].filter(x => !x.OnBudget); return [...state.Accounts.values()].filter(x => !x.OnBudget);
}, },
OffBudgetAccountsBalance(state): number { OffBudgetAccountsBalance(state): number {
return this.OffBudgetAccounts.reduce((prev, curr) => prev + Number(curr.Balance), 0); return this.OffBudgetAccounts.reduce((prev, curr) => prev + Number(curr.ClearedBalance), 0);
}, },
TransactionsList(state) : Transaction[] { TransactionsList(state) : Transaction[] {
return this.CurrentAccount!.Transactions.map(x => { return this.CurrentAccount!.Transactions.map(x => {