From eeac03235b7c619c3adecf4079f8c738e0c5cf8a Mon Sep 17 00:00:00 2001 From: patrykb Date: Mon, 9 Sep 2024 13:27:25 +0200 Subject: [PATCH] Nowe pole Trasa --- src/components/ConfirmationModal.vue | 8 +- src/components/ConfirmedForm.vue | 13 +++ src/components/MainForm.vue | 114 ++++++++++++++++++++++----- src/main.ts | 6 ++ src/stores/orders.store.ts | 5 +- src/stores/routes.store.ts | 17 ++++ src/stores/siteControl.store.ts | 8 +- src/views/MainView.vue | 3 + 8 files changed, 149 insertions(+), 25 deletions(-) create mode 100644 src/stores/routes.store.ts diff --git a/src/components/ConfirmationModal.vue b/src/components/ConfirmationModal.vue index 0c65d95..45756ed 100644 --- a/src/components/ConfirmationModal.vue +++ b/src/components/ConfirmationModal.vue @@ -5,23 +5,27 @@ import { axiosInstance } from '@/main' import { useSiteControlStore } from '@/stores/siteControl.store' import { useContractorsStore } from '@/stores/contractors.store' import { useCategoriesStore } from '@/stores/categories.store' +import { useRoute } from 'vue-router' +import { useRoutesStore } from '@/stores/routes.store' const ordersStore = useOrdersStore(); const siteControlStore = useSiteControlStore(); const contractorStore = useContractorsStore(); const categoriesStore = useCategoriesStore(); +const routeStore = useRoutesStore(); const { contractor, contractors } = storeToRefs(contractorStore); const { categories } = storeToRefs(categoriesStore); const { uuid } = storeToRefs(ordersStore); const { showConfirmationModal, isLoading} = storeToRefs(siteControlStore); +const { route, routes } = storeToRefs(routeStore); async function confirmOrder() { await axiosInstance.put('/zamowienie/' + uuid.value); showConfirmationModal.value = false; - if (uuid.value != undefined) { + if (uuid.value != undefined && route.value != undefined) { isLoading.value = true; - await ordersStore.loadOrder(uuid.value, true, contractor, contractors, categories); + await ordersStore.loadOrder(uuid.value, true, contractor, contractors, categories, route, routes); isLoading.value = false; } } diff --git a/src/components/ConfirmedForm.vue b/src/components/ConfirmedForm.vue index 29f312a..4101a5d 100644 --- a/src/components/ConfirmedForm.vue +++ b/src/components/ConfirmedForm.vue @@ -5,10 +5,12 @@ import { storeToRefs } from 'pinia' import { useCategoriesStore } from '@/stores/categories.store' import { useContractorsStore } from '@/stores/contractors.store' import { axiosInstance } from '@/main' +import { useRoutesStore } from '@/stores/routes.store' const ordersStore = useOrdersStore(); const categoriesStore = useCategoriesStore(); const contractorsStore = useContractorsStore(); +const routeStore = useRoutesStore(); const { order, uuid} = storeToRefs(ordersStore); @@ -16,6 +18,8 @@ const { categories } = storeToRefs(categoriesStore); const { contractor } = storeToRefs(contractorsStore); +const { route } = storeToRefs(routeStore); + function cancelOrder(event: Event) { event.preventDefault(); axiosInstance.delete('/zamowienie/' + uuid.value); @@ -63,6 +67,15 @@ function cancelOrder(event: Event) { hide-input-icon/> +
+ +
+ +
+
diff --git a/src/components/MainForm.vue b/src/components/MainForm.vue index c62b062..0f1c374 100644 --- a/src/components/MainForm.vue +++ b/src/components/MainForm.vue @@ -1,34 +1,40 @@