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

create-categories #79

Open
jacob1123 wants to merge 31 commits from create-categories into master
pull from: create-categories
merge into: jacob1123:master
Conversation 1 Commits 31 Files Changed 26 +1 -3
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6a5bf419e2 - Show all commits

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

@ -22,7 +22,6 @@ export interface Account {
ClearedBalance: number; ClearedBalance: number;
WorkingBalance: number; WorkingBalance: number;
ReconciledBalance: number; ReconciledBalance: number;
Transactions: string[];
LastReconciled: NullDate; LastReconciled: NullDate;
} }
@ -190,7 +189,6 @@ export const useAccountStore = defineStore("budget/account", {
transactionsStore.AddTransactions( transactionsStore.AddTransactions(
response.Transactions response.Transactions
); );
account.Transactions = response.Transactions.map((x : Transaction) =>x.ID);
}, },
async FetchMonthBudget(budgetid: string, year: number, month: number) { async FetchMonthBudget(budgetid: string, year: number, month: number) {
const result = await GET( const result = await GET(

2
web/src/stores/transactions.ts
View File

@ -52,7 +52,7 @@ export const useTransactionsStore = defineStore("budget/transactions", {
const account = accountsStore.CurrentAccount; const account = accountsStore.CurrentAccount;
if(account === undefined) if(account === undefined)
return undefined; return undefined;
const allTransactions = account!.Transactions.map(x => this.Transactions.get(x) ?? {} as Transaction); const allTransactions = [...this.Transactions.values()].filter(x => x.AccountID == account.ID);
return groupBy(allTransactions, x => formatDate(x.Date)); return groupBy(allTransactions, x => formatDate(x.Date));
}, },
TransactionsList(state) : Transaction[] { TransactionsList(state) : Transaction[] {