+
-
{{ budget.budget.name }}
-
+ {{ budget.name }}
+
- {{ formatDate(budget.budget.dateFrom) }} - {{ formatDate(budget.budget.dateTo) }}
+ {{ formatDate(budget.dateFrom) }} - {{ formatDate(budget.dateTo) }}
-
Total Income: {{ formatAmount(budget.totalIncomes) }} ₽
-
Total Expenses: {{ formatAmount(budget.totalExpenses) }} ₽
-
Planned Expenses: {{ formatAmount(budget.totalExpenses) }} ₽
+
+
+
Unplanned Expenses:
-
{{ formatAmount(budget.totalIncomes - budget.totalExpenses) }} ₽
+
-
+
@@ -57,7 +57,7 @@ import {onMounted, ref} from 'vue';
import ProgressBar from 'primevue/progressbar';
import {BudgetInfo} from "@/models/Budget";
import {getBudgetInfos} from "@/services/budgetsService";
-import {formatAmount, formatDate} from "@/utils/utils";
+import { formatDate} from "@/utils/utils";
import LoadingView from "@/components/LoadingView.vue";
const loading = ref(false)
diff --git a/src/services/budgetsService.ts b/src/services/budgetsService.ts
index d50dc0a..8081404 100644
--- a/src/services/budgetsService.ts
+++ b/src/services/budgetsService.ts
@@ -7,19 +7,19 @@ export const getBudgetInfos = async () => {
let response = await apiClient.get('/budgets/');
let budgetInfos = response.data;
budgetInfos.forEach((budgetInfo: Budget) => {
- budgetInfo.budget.dateFrom = new Date(budgetInfo.budget.dateFrom);
- budgetInfo.budget.dateTo = new Date(budgetInfo.budget.dateTo);
- budgetInfo.plannedExpenses.forEach(e => {
- e.date = new Date(e.date)
- })
-
- budgetInfo.plannedIncomes.forEach(e => {
- e.date = new Date(e.date)
- })
-
- budgetInfo.transactions.forEach(e => {
- e.date = new Date(e.date)
- })
+ budgetInfo.dateFrom = new Date(budgetInfo.dateFrom);
+ budgetInfo.dateTo = new Date(budgetInfo.dateTo);
+ // budgetInfo.plannedExpenses.forEach(e => {
+ // e.date = new Date(e.date)
+ // })
+ //
+ // budgetInfo.plannedIncomes.forEach(e => {
+ // e.date = new Date(e.date)
+ // })
+ //
+ // budgetInfo.transactions.forEach(e => {
+ // e.date = new Date(e.date)
+ // })
})
return budgetInfos
}