From 961d6ba2b95c9db3314ff88f1aae2ceb81361b0e Mon Sep 17 00:00:00 2001
From: xds <iam@voroninv.ru>
Date: Mon, 14 Apr 2025 10:39:18 +0300
Subject: [PATCH] + some fixes

---
 .../transactions/TransactionFormContent.vue       | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/components/transactions/TransactionFormContent.vue b/src/components/transactions/TransactionFormContent.vue
index 88e33a6..809c857 100644
--- a/src/components/transactions/TransactionFormContent.vue
+++ b/src/components/transactions/TransactionFormContent.vue
@@ -311,12 +311,13 @@ const resetForm = () => {
 
 const dateErrorMessage = computed(() => {
 
+  if (editedTransaction.value?.category.type.code == 'INCOME') {}
   if (editedTransaction.value.type.code != 'PLANNED' && editedTransaction.value.date > new Date()) {
 
     return 'При мгновенных тратах дата должна быть меньше текущей!'
   } else if (editedTransaction.value.type.code == 'PLANNED' && editedTransaction.value.date < new Date()) {
 
-    return 'При плановых тратах дата должна быть больше текущей!'
+    return 'Внимание! При плановых тратах дата должна быть больше текущей!'
   } else {
 
     return ''
@@ -408,8 +409,8 @@ onMounted(async () => {
 
         <!-- Анимированное открытие списка категорий -->
         <div v-show="isCategorySelectorOpened"
-             class="absolute left-0 right-0 top-full overflow-y-auto z-50 border-b-4 border-x  rounded-b-lg bg-white shadow-lg transition-all duration-500"
-             :class="{ 'max-h-0': !isCategorySelectorOpened, 'max-h-[500px]': isCategorySelectorOpened }">
+             class="absolute left-0 right-0  overflow-y-auto z-50 border-b-4 border-x  rounded-b-lg bg-white shadow-lg transition-all duration-500"
+             :class="{ 'max-h-0': !isCategorySelectorOpened, 'max-h-[500px]': isCategorySelectorOpened, 'top-[600%]': selectedCategoryType.code=='EXPENSE', 'top-[400%]': selectedCategoryType.code=='INCOME' }">
           <div class="grid grid-cols-2  mt-2">
             <button
                 v-for="category in editedTransaction.category.type.code == 'EXPENSE' ? expenseCategories : incomeCategories"
@@ -464,7 +465,7 @@ onMounted(async () => {
       </div>
       <div class="grid grid-cols-2 gap-2">
 
-        <button v-for="category in predictedCategories" class="border-2  rounded-lg w-full z-40"
+        <button v-if='selectedCategoryType.code=="EXPENSE"' v-for="category in predictedCategories" class="border-2  rounded-lg w-full z-40"
                 :class="isSelectedFromPredict  && editedTransaction.category.id == category.id ? 'border-5 border-emerald-400' : 'border-gray-300'"
                 @click="selectCategory(category, true)">
           <div class="flex flex-row  items-center pe-4 py-2 ">
@@ -496,7 +497,7 @@ onMounted(async () => {
                 }}</p>
               <div class="flex flex-col items-start justify-items-start justify-around w-full">
                 <p class="font-bold  text-start line-clamp-1">{{  !isSelectedFromPredict ? editedTransaction.category.name :  anotherCategories[0].name }}</p>
-                <p class="font-light text-xs line-clamp-1 items-start text-start">Нажмите чтобы выбрать другую категорию</p>
+                <p class="font-light text-xs line-clamp-1 items-start text-start">Другая категория</p>
                 <!--                <p class="font-light line-clamp-1 items-start text-start">Нажмите чтобы выбрать другую категорию</p>-->
               </div>
             </div>
@@ -523,8 +524,8 @@ onMounted(async () => {
                       showIcon
 
           />
-          <p :class="dateErrorMessage != '' ? 'visible' : 'invisible'"
-             class="text-red-400">{{ dateErrorMessage }}</p>
+<!--          <p :class="dateErrorMessage != '' ? 'visible' : 'invisible'"-->
+<!--             class="text-red-400">{{ dateErrorMessage }}</p>-->
 
 
         </FloatLabel>