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

Add type-information to GetBudgeted
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/pr Build is passing
Details

Browse Source
This commit is contained in:
Jan Bader
2022-04-08 18:28:52 +00:00
parent 23bd12147c
commit c4fc80e47d
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
web/src/components/TransactionRow.vue
View File

@@ -6,7 +6,6 @@ import Currency from "./Currency.vue";
import TransactionEditRow from "./TransactionEditRow.vue"; import TransactionEditRow from "./TransactionEditRow.vue";
import { formatDate } from "../date"; import { formatDate } from "../date";
import { useAccountStore } from "../stores/budget-account"; import { useAccountStore } from "../stores/budget-account";
import Input from "./Input.vue";
import Checkbox from "./Checkbox.vue"; import Checkbox from "./Checkbox.vue";
const props = defineProps<{ const props = defineProps<{

6
web/src/pages/Budgeting.vue
View File

@@ -83,17 +83,17 @@ function assignedChanged(e : Event, category : Category){
</span><br /> </span><br />
<span>Budgeted this month: <span>Budgeted this month:
<Currency <Currency
:value="accountStore.GetBudgeted(selected.Year, selected.Month).assigned" :value="accountStore.GetBudgeted(selected.Year, selected.Month).Assigned"
/> />
</span><br /> </span><br />
<span>Deassigned this month: <span>Deassigned this month:
<Currency <Currency
:value="accountStore.GetBudgeted(selected.Year, selected.Month).deassigned" :value="accountStore.GetBudgeted(selected.Year, selected.Month).Deassigned"
/> />
</span><br /> </span><br />
<span>Spent this month: <span>Spent this month:
<Currency <Currency
:value="accountStore.GetBudgeted(selected.Year, selected.Month).activity" :value="accountStore.GetBudgeted(selected.Year, selected.Month).Activity"
/> />
</span><br /> </span><br />
<div> <div>

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

@@ -39,6 +39,12 @@ export interface Category {
Activity: number; Activity: number;
} }
interface BudgetedAmounts {
Assigned: number,
Deassigned: number,
Activity: number,
}
export const useAccountStore = defineStore("budget/account", { export const useAccountStore = defineStore("budget/account", {
state: (): State => ({ state: (): State => ({
Accounts: new Map<string, Account>(), Accounts: new Map<string, Account>(),
@@ -71,9 +77,9 @@ export const useAccountStore = defineStore("budget/account", {
return budget.CurrentBudget?.IncomeCategoryID; return budget.CurrentBudget?.IncomeCategoryID;
}, },
GetBudgeted(state) { GetBudgeted(state) {
return (year: number, month: number) => { return (year: number, month: number) : BudgetedAmounts => {
const IncomeCategoryID = this.GetIncomeCategoryID; const IncomeCategoryID = this.GetIncomeCategoryID;
if (IncomeCategoryID == null) return 0; if (IncomeCategoryID == null) return {Activity: 0, Assigned: 0, Deassigned: 0};
const categories = this.AllCategoriesForMonth(year, month); const categories = this.AllCategoriesForMonth(year, month);
@@ -90,9 +96,9 @@ export const useAccountStore = defineStore("budget/account", {
deassigned += category.Assigned; deassigned += category.Assigned;
} }
return { return {
assigned, Assigned: assigned,
deassigned, Deassigned: deassigned,
activity Activity: activity
}; };
}; };
}, },