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

Merge pull request 'Use accounts transactions instead of global (Fixes #65)' (#78) from add-new-to-top into master
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source 
Reviewed-on: #78
This commit is contained in:
Jan Bader 2022-09-10 23:26:13 +02:00
commit a241298170
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@ import { defineStore } from "pinia";
import { GET, POST } from "../api";
import { useBudgetsStore } from "./budget";
import { useSessionStore } from "./session";
import { useTransactionsStore } from "./transactions";
import { Transaction, useTransactionsStore } from "./transactions";
interface State {
Accounts: Map<string, Account>;
@ -200,6 +200,7 @@ export const useAccountStore = defineStore("budget/account", {
transactionsStore.AddTransactions(
response.Transactions
);
account.Transactions = response.Transactions.map((x : Transaction) =>x.ID);
},
async FetchMonthBudget(budgetid: string, year: number, month: number) {
const result = await GET(

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

@ -47,10 +47,12 @@ export const useTransactionsStore = defineStore("budget/transactions", {
}
return reconciledBalance;
},
TransactionsByDate(state) : Record<string, Transaction[]> {
TransactionsByDate(state) : Record<string, Transaction[]>|undefined{
const accountsStore = useAccountStore();
const accountID = accountsStore.CurrentAccountID;
const allTransactions = [...this.Transactions.values()].filter(x => x.AccountID == accountID);
const account = accountsStore.CurrentAccount;
if(account === undefined)
return undefined;
const allTransactions = account!.Transactions.map(x => this.Transactions.get(x) ?? {} as Transaction);
return groupBy(allTransactions, x => formatDate(x.Date));
},
TransactionsList(state) : Transaction[] {