fixes
This commit is contained in:
@@ -15,11 +15,12 @@ import {
|
||||
createTransactionRequest,
|
||||
getTransactionTypes,
|
||||
updateTransactionRequest,
|
||||
deleteTransactionRequest
|
||||
deleteTransactionRequest, getTransactions
|
||||
} from "@/services/transactionService";
|
||||
import {getCategories, getCategoryTypes} from "@/services/categoryService";
|
||||
import {useToast} from "primevue/usetoast";
|
||||
import LoadingView from "@/components/LoadingView.vue";
|
||||
import BudgetTransactionView from "@/components/budgets/BudgetTransactionView.vue";
|
||||
|
||||
const props = defineProps({
|
||||
visible: {
|
||||
@@ -37,6 +38,10 @@ const props = defineProps({
|
||||
categoryType: {
|
||||
type: String,
|
||||
required: false
|
||||
},
|
||||
transactions: {
|
||||
type: Array as () => Array<Transaction>,
|
||||
required: false
|
||||
}
|
||||
});
|
||||
|
||||
@@ -247,6 +252,7 @@ const closeDrawer = () => emit('close-drawer');
|
||||
const keyboardOpen = ref(false);
|
||||
const isMobile = ref(false);
|
||||
const userAgent = ref(null);
|
||||
const transactions = ref<Transaction[]>(props.transactions);
|
||||
// Мониторинг при монтировании
|
||||
onMounted(async () => {
|
||||
loading.value = true;
|
||||
@@ -254,7 +260,12 @@ onMounted(async () => {
|
||||
await fetchCategoriesAndTypes();
|
||||
|
||||
prepareData();
|
||||
|
||||
if (!transactions.value && !isEditing.value) {
|
||||
console.log()
|
||||
await getTransactions('INSTANT', 'EXPENSE' ).then(transactionsResponse => transactions.value = transactionsResponse.data);
|
||||
transactions.value = transactions.value.slice(0,3)
|
||||
console.log(transactions.value.slice(0,3))
|
||||
}
|
||||
loading.value = false;
|
||||
const deviceInfo = platform;
|
||||
isMobile.value = deviceInfo.os.family === 'iOS' || deviceInfo.os.family === 'Android';
|
||||
@@ -267,7 +278,7 @@ onMounted(async () => {
|
||||
<div class="card flex justify-center h-dvh">
|
||||
|
||||
|
||||
<Drawer :visible="visible" :header="isEditing ? 'Edit Transaction' : 'Create Transaction'" :showCloseIcon="false"
|
||||
<Drawer :visible="visible" :header="isEditing ? 'Изменить транзакцию' : 'Создать транзакцию'" :showCloseIcon="false"
|
||||
position="right" @hide="closeDrawer"
|
||||
class="!w-128 ">
|
||||
<div v-if="result" class="absolute top-0 left-0 w-full h-full flex items-center justify-center z-50">
|
||||
@@ -363,13 +374,13 @@ onMounted(async () => {
|
||||
@blur="keyboardOpen=false"
|
||||
|
||||
/>
|
||||
<label for="amount" class="">Amount</label>
|
||||
<label for="amount" class="">Сумма</label>
|
||||
</FloatLabel>
|
||||
|
||||
<!-- Comment Input -->
|
||||
|
||||
<FloatLabel variant="on" class="w-full">
|
||||
<label for="comment">Comment</label>
|
||||
<label for="comment">Комментарий</label>
|
||||
<InputText class="w-full"
|
||||
:invalid="!editedTransaction.comment"
|
||||
id="comment"
|
||||
@@ -384,7 +395,7 @@ onMounted(async () => {
|
||||
<!-- Date Picker -->
|
||||
<div class="field col-12 gap-0">
|
||||
<FloatLabel variant="on">
|
||||
<label for="date">Date </label>
|
||||
<label for="date">Дата</label>
|
||||
|
||||
<DatePicker class="w-full"
|
||||
inline
|
||||
@@ -401,18 +412,17 @@ onMounted(async () => {
|
||||
|
||||
</FloatLabel>
|
||||
</div>
|
||||
<div>
|
||||
<BudgetTransactionView v-if="!isEditing && transactions" v-for="transaction in transactions" :is-list="true"
|
||||
:transaction="transaction"/>
|
||||
</div>
|
||||
|
||||
<!-- Amount Input -->
|
||||
|
||||
|
||||
<!-- Buttons -->
|
||||
{{ keyboardOpen }}
|
||||
<div class="fixed col-12 flex justify-content-end gap-4 bottom-8">
|
||||
|
||||
<Button label="Save" icon="pi pi-check" class="p-button-success"
|
||||
<Button label="Сохранить" icon="pi pi-check" class="p-button-success"
|
||||
@click="isEditing ? updateTransaction() : createTransaction()"/>
|
||||
<Button label="Cancel" icon="pi pi-times" class="p-button-secondary " @click="closeDrawer"/>
|
||||
<Button v-if="isEditing" label="Delete" icon="pi pi-times" class="p-button-success" severity="danger"
|
||||
<Button label="Отмена" icon="pi pi-times" class="p-button-secondary " @click="closeDrawer"/>
|
||||
<Button v-if="isEditing" label="Удалить" icon="pi pi-times" class="p-button-success" severity="danger"
|
||||
@click="deleteTransaction"/>
|
||||
</div>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user