From 98f3d4baa4bfd9a70199cd3a3e521e5fea491fe0 Mon Sep 17 00:00:00 2001
From: xds <iam@voroninv.ru>
Date: Sat, 1 Feb 2025 16:27:54 +0300
Subject: [PATCH] hz

---
 src/components/analytics/AnalyticsView.vue    |  2 +-
 src/components/budgets/BudgetList.vue         |  2 -
 src/components/budgets/BudgetView.vue         | 25 +++---
 .../budgets/TransactionEditDrawer.vue         | 13 +--
 .../transactions/TransactionFormContent.vue   | 87 +++++++++++--------
 src/services/budgetsService.ts                |  2 +-
 6 files changed, 73 insertions(+), 58 deletions(-)

diff --git a/src/components/analytics/AnalyticsView.vue b/src/components/analytics/AnalyticsView.vue
index 219303b..c42414d 100644
--- a/src/components/analytics/AnalyticsView.vue
+++ b/src/components/analytics/AnalyticsView.vue
@@ -227,7 +227,7 @@ onMounted(async () => {
 
 <template>
   <LoadingView v-if="loading"/>
-  <div v-else class="p-4 bg-gray-100  flex flex-col gap-4 items-center justify-items-center ">
+  <div v-else class="p-4 pb-20 lg:pb-4 bg-gray-100  flex flex-col gap-4 items-center justify-items-center ">
     <div class="!items-center w-5/6  bg-white">
       <Accordion value="1" class=" " @tab-open="isChartOpen=true"
                  @tab-close="closeChart">
diff --git a/src/components/budgets/BudgetList.vue b/src/components/budgets/BudgetList.vue
index b0df514..e76d2a6 100644
--- a/src/components/budgets/BudgetList.vue
+++ b/src/components/budgets/BudgetList.vue
@@ -89,8 +89,6 @@ const creationOpened = ref(false)
 const creationSuccessModal = ref(false)
 
 const creationSuccessShow = async (budget, createRecurrentPayments) => {
-
-
   try {
     await createBudget(budget, createRecurrentPayments)
     budgetInfos.value = await getBudgetInfos()
diff --git a/src/components/budgets/BudgetView.vue b/src/components/budgets/BudgetView.vue
index 6a7cda9..0a4fd81 100644
--- a/src/components/budgets/BudgetView.vue
+++ b/src/components/budgets/BudgetView.vue
@@ -562,11 +562,10 @@ const fetchBudgetTransactions = async () => {
 }
 
 const updateTransactions = async () => {
-
   setTimeout(async () => {
     await Promise.all([fetchBudgetInfo(),fetchWarns()])
 
-  }, 10)
+  }, )
 
 }
 
@@ -608,14 +607,16 @@ const transactionCategoriesSums = computed(() => {
 
 const budgetInfo = ref<Budget>();
 const fetchBudgetInfo = async () => {
+   await getBudgetInfo(route.params.id).then((data) => {
+     budget.value = data
+     plannedExpenses.value = budget.value?.plannedExpenses
+     plannedIncomes.value = budget.value?.plannedIncomes
+     transactions.value = budget.value?.transactions
+     categories.value = budget.value?.categories
+     updateLoading.value = false
+   }
+  )
 
-
-  budget.value = await getBudgetInfo(route.params.id);
-  plannedExpenses.value = budget.value?.plannedExpenses.copyWithin()
-  plannedIncomes.value = budget.value?.plannedIncomes.copyWithin()
-  transactions.value = budget.value?.transactions.copyWithin()
-  categories.value = budget.value?.categories
-  updateLoading.value = false
 }
 
 
@@ -626,7 +627,7 @@ const updateBudgetCategory = async (category) => {
   await fetchBudgetInfo()
   setTimeout(async () => {
     await fetchWarns()
-  }, 500)
+  }, 0)
 
   // categories.value = await getBudgetCategories(route.params.id)
 
@@ -861,10 +862,6 @@ onMounted(async () => {
   } finally {
     loading.value = false
   }
-
-  setTimeout(() => {
-
-  }, 100)
 });
 </script>
 
diff --git a/src/components/budgets/TransactionEditDrawer.vue b/src/components/budgets/TransactionEditDrawer.vue
index 1bd473c..5e0942c 100644
--- a/src/components/budgets/TransactionEditDrawer.vue
+++ b/src/components/budgets/TransactionEditDrawer.vue
@@ -164,11 +164,14 @@ const createTransaction = async () => {
       if (editedTransaction.value.transactionType.code === 'INSTANT') {
         editedTransaction.value.isDone = true;
       }
-      await createTransactionRequest(editedTransaction.value);
-      toast.add({severity: 'success', summary: 'Transaction created!', detail: 'Транзакция создана!', life: 3000});
-      emit('create-transaction', editedTransaction.value);
-      computeResult(true)
-      resetForm();
+      await createTransactionRequest(editedTransaction.value).then((result) => {
+        console.log("hereeeee");
+        toast.add({severity: 'success', summary: 'Transaction created!', detail: 'Транзакция создана!', life: 3000});
+        emit('create-transaction', editedTransaction.value);
+        computeResult(true)
+        resetForm();
+      })
+
     } catch (error) {
       computeResult(false, error)
       console.error('Error creating transaction:', error);
diff --git a/src/components/transactions/TransactionFormContent.vue b/src/components/transactions/TransactionFormContent.vue
index fcb9090..1a4538a 100644
--- a/src/components/transactions/TransactionFormContent.vue
+++ b/src/components/transactions/TransactionFormContent.vue
@@ -159,44 +159,60 @@ const showError = (message) => {
 
 // Создание транзакции
 const amountInput = ref(null);
-const createTransaction = async () => {
-  if (checkForm()) {
-    try {
-      // loading.value = true;
-      if (editedTransaction.value.type.code === 'INSTANT') {
-        editedTransaction.value.isDone = true;
-      }
-      await createTransactionRequest(editedTransaction.value).then
-      {
-        loading.value = false;
-        amountInput.value.$el.querySelector('input').focus()
-      }
+const createTransaction = async (): Promise<void> => {
+  if (!checkForm()) return;
 
-
-
-      // setTimeout(async () => {
-      //
-      //   amountInput.value.$el.querySelector('input').focus()
-      // }, 0)
-
-
-      emit('create-transaction', editedTransaction.value);
-      await transactionsUpdatedEmit()
-      toast.add({severity: 'success', summary: 'Успешно!', detail: 'Транзакция создана!', life: 3000});
-      // computeResult(true)
-      resetForm();
-    } catch (error) {
-      // computeResult(false, error)
-      toast.add({severity: 'error', summary: 'Ошибка!', detail: error.response.data["message"], life: 3000});
-      console.error('Error creating transaction:', error);
-    } finally {
-      loading.value = false;
+  try {
+    // Если тип транзакции INSTANT, помечаем её как выполненную
+    if (editedTransaction.value.type.code === 'INSTANT') {
+      editedTransaction.value.isDone = true;
     }
+
+    // Отправляем запрос на создание транзакции и ждём результата
+    const result = await createTransactionRequest(editedTransaction.value);
+
+
+    // Сбрасываем состояние загрузки
+    loading.value = false;
+
+    // Фокусируем поле ввода суммы (при наличии)
+    const inputEl = amountInput.value.$el.querySelector('input') as HTMLInputElement | null;
+    if (inputEl) {
+      inputEl.focus();
+    }
+
+    // Вызываем событие создания транзакции и обновляем список транзакций
+    emit('create-transaction', editedTransaction.value);
+    await transactionsUpdatedEmit();
+
+    // Показываем уведомление об успешном создании транзакции
+    toast.add({
+      severity: 'success',
+      summary: 'Успешно!',
+      detail: 'Транзакция создана!',
+      life: 3000
+    });
+
+    // Сбрасываем форму
+    resetForm();
+  } catch (error: any) {
+    // Обработка ошибки: выводим уведомление с сообщением об ошибке
+    toast.add({
+      severity: 'error',
+      summary: 'Ошибка!',
+      detail: error.response?.data?.message || 'Ошибка при создании транзакции',
+      life: 3000
+    });
+    console.error('Error creating transaction:', error);
+  } finally {
+    loading.value = false;
   }
+
+  // Через 1 секунду обнуляем дополнительные значения
   setTimeout(() => {
-    result.value = false
-    resultText.value = ''
-  }, 1000)
+    result.value = false;
+    resultText.value = '';
+  }, 1000);
 };
 
 
@@ -439,7 +455,8 @@ onMounted(async () => {
         </FloatLabel>
       </div>
       <div class="flex flex-col gap-1">
-        <BudgetTransactionView v-if="!isEditing && transactions" v-for="transaction in transactions" :is-list="true" class="flex flexgap-4"
+        <BudgetTransactionView v-if="!isEditing && transactions" v-for="transaction in transactions" :is-list="true"
+                               class="flex flexgap-4"
                                :transaction="transaction"/>
       </div>
 
diff --git a/src/services/budgetsService.ts b/src/services/budgetsService.ts
index 7d3b8a6..807fb07 100644
--- a/src/services/budgetsService.ts
+++ b/src/services/budgetsService.ts
@@ -62,7 +62,7 @@ export const getBudgetCategoriesSums = async (budgetId) => {
     return response.data;
 }
 
-export const getBudgetInfo = async (budget_id: number) => {
+export const getBudgetInfo = async (budget_id: string) => {
 
     let budgetInfo = await apiClient.get('/budgets/' + budget_id);
     budgetInfo = budgetInfo.data;