Fix amount for available balance #50

Merged
jacob1123 merged 28 commits from available-balance into master 2022-04-08 22:43:22 +02:00
3 changed files with 14 additions and 9 deletions
Showing only changes of commit c4fc80e47d - Show all commits

View File

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

View File

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

View File

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