diff --git a/src/components/budgets/BudgetCreationView.vue b/src/components/budgets/BudgetCreationView.vue
index 79b1493..fe57155 100644
--- a/src/components/budgets/BudgetCreationView.vue
+++ b/src/components/budgets/BudgetCreationView.vue
@@ -30,7 +30,7 @@ const budget = ref(new Budget())
const create = async () => {
try {
- await createBudget(budget.value)
+ await createBudget(budget.value, createRecurrentPayments.value)
.then((res) => budget.value = res)
.catch((err) => console.log(err));
emits("budget-created", budget.value, createRecurrentPayments.value);
@@ -115,10 +115,10 @@ onMounted(() => {
-
-
-
-
+
diff --git a/src/components/transactions/TransactionList.vue b/src/components/transactions/TransactionList.vue
index b1c71ae..9bffc25 100644
--- a/src/components/transactions/TransactionList.vue
+++ b/src/components/transactions/TransactionList.vue
@@ -10,9 +10,10 @@ import {Transaction} from "@/models/Transaction";
import ProgressSpinner from "primevue/progressspinner";
import {getUsers} from "@/services/userService";
import Button from "primevue/button";
-import { EventBus } from '@/utils/EventBus.ts';
+import {EventBus} from '@/utils/EventBus.ts';
import {useSpaceStore} from "@/stores/spaceStore";
import router from "@/router";
+import {useDrawerStore} from "@/stores/drawerStore";
const loading = ref(false);
const searchText = ref("");
@@ -21,6 +22,8 @@ const limit = 20; // Количество транзакций на одну з
const offset = ref(0); // Начальное смещение
const allLoaded = ref(false); // Флаг для отслеживания окончания данных
+const drawerStore = useDrawerStore()
+
// Функция для получения транзакций с параметрами limit и offset
const fetchTransactions = async (reload) => {
@@ -28,7 +31,7 @@ const fetchTransactions = async (reload) => {
loading.value = true;
try {
- const response = await getTransactions( 'INSTANT', null, null, selectedUserId.value ? selectedUserId.value : null, null, reload ? offset.value : limit, reload ? 0 : offset.value);
+ const response = await getTransactions('INSTANT', null, null, selectedUserId.value ? selectedUserId.value : null, null, reload ? offset.value : limit, reload ? 0 : offset.value);
const newTransactions = response.data;
// Проверка на конец данных
@@ -39,7 +42,7 @@ const fetchTransactions = async (reload) => {
// Добавляем новые транзакции к текущему списку
reload ? transactions.value = newTransactions : transactions.value.push(...newTransactions)
- !reload ? offset.value += limit : offset.value
+ !reload ? offset.value += limit : offset.value
} catch (error) {
console.error("Error fetching transactions:", error);
}
@@ -62,7 +65,6 @@ const switchUserFilter = async (user) => {
}
-
const tgname = computed(() => {
if (window.Telegram.WebApp) {
const tg = window.Telegram.WebApp;
@@ -109,38 +111,47 @@ const fetchUsers = async () => {
}
const selectedTransactionType = ref(null)
-const spaceStore = useSpaceStore()
+const spaceStore = useSpaceStore()
const selectedSpace = computed(() => spaceStore.space)
-watch( selectedSpace, async (newValue, oldValue) => {
+watch(selectedSpace, async (newValue, oldValue) => {
if (newValue != oldValue) {
await fetchTransactions(false)
}
})
const types = ref([])
onMounted(async () => {
- EventBus.on('transactions-updated', fetchTransactions,true);
- if (selectedSpace.value){
+ EventBus.on('transactions-updated', fetchTransactions, true);
+ if (selectedSpace.value) {
await fetchTransactions(false); // Первоначальная загрузка данных
}
// await fetchUsers();
- await getTransactionTypes().then( it => types.value = it.data);
+ await getTransactionTypes().then(it => types.value = it.data);
// window.addEventListener("scroll", handleScroll); // Добавляем обработчик прокрутки
});
-onUnmounted( async () => {
+onUnmounted(async () => {
EventBus.off('transactions-updated', fetchTransactions);
})
-
-
Список транзакций
+
+
+
Список транзакций
+
+
Сперва нужно выбрать Пространство.
-
+
@@ -158,9 +169,9 @@ onUnmounted( async () => {
-
-
-
+
+
+