From 41c13f208cbdcd02345ca0aa56b8efd7f35e4421 Mon Sep 17 00:00:00 2001 From: szewczyw Date: Thu, 27 Feb 2025 13:04:26 +0100 Subject: [PATCH] code cleanup --- src/components/SummaryComponent.vue | 227 +++++++++++----------------- 1 file changed, 88 insertions(+), 139 deletions(-) diff --git a/src/components/SummaryComponent.vue b/src/components/SummaryComponent.vue index 3eb53df..7ce9aca 100644 --- a/src/components/SummaryComponent.vue +++ b/src/components/SummaryComponent.vue @@ -3,71 +3,36 @@ import { useOrdersStore } from '@/stores/orders.store' import { storeToRefs } from 'pinia' import VueDatePicker from '@vuepic/vue-datepicker' import { useSiteControlStore } from '@/stores/siteControl.store' -import { computed, onBeforeUnmount, onMounted, ref } from 'vue' +import { onBeforeUnmount, onMounted, ref } from 'vue' import { useCategoriesStore } from '@/stores/categories.store' import type { Order, OrderProduct, Product } from '@/main' import { useRoutesStore } from '@/stores/routes.store' const ordersStore = useOrdersStore() - const categoriesStore = useCategoriesStore(); - const routeStore = useRoutesStore(); +const categoriesStore = useCategoriesStore() +const routeStore = useRoutesStore() - const { orders, dates } = storeToRefs(ordersStore); - const { routes } = storeToRefs(routeStore); - const searchDate = ref(new Date(Date.now())); - const confirmedOrders = ref(); - const isSummed = ref(true); +const { orders, dates } = storeToRefs(ordersStore) +const { routes } = storeToRefs(routeStore) +const searchDate = ref(new Date(Date.now())) +const confirmedOrders = ref() +const isSummed = ref(true) const nipGrouped = ref(false) - const isLoading = ref(true); - const summedProducts = ref>([]); - const products = ref>(); +const isLoading = ref(true) +const summedProducts = ref>([]) +const products = ref>() const ordersByRoute = ref>>(new Map>()) const orderByRouteAndNipRef = ref>>(new Map>) -const orderNumbers = computed(() => { - const orders = orderByRouteAndNipRef.get(route.MZT_Nazwa1)?.get(order.MZN_PodNipE) - ?.orders ?? [] - return orders.map(o => o.MZN_MZNID).join(', ') -}) - -// const watchSearchDate = watch(searchDate, async (oldSearchDate, newSeatchDate) => { -// if(oldSearchDate != newSeatchDate) { -// await fetchOrders(); -// } -// }); -// -// const watchConfirmedOrders = watch(confirmedOrders, async (oldConfirmedOrders, newConfirmedOrders) => { -// if (oldConfirmedOrders != newConfirmedOrders) { -// await fetchOrders(); -// } -// }) -// -// async function fetchOrders() { -// isLoading.value=true; -// orders.value = await ordersStore.fetchOrdersByDateStartAndEnd(searchDate.value != undefined ? searchDate.value : new Date(Date.now()), -// searchDate.value != undefined ? searchDate.value : new Date(Date.now()), -// (confirmedOrders.value) ? false : null); -// const productsMap = await categoriesStore.sumProductsFromOrders(orders.value); -// summedProducts.value = []; -// for(const product of productsMap.values()) { -// if(product.SummedQuantity > 0) { -// summedProducts.value.push(product); -// } -// } -// await prepareProductsFromOrders(); -// isLoading.value=false; -// } - function addRoutes() { for (const route of routes.value) { ordersByRoute.value.set(route.MZT_Nazwa1, []) } ordersByRoute.value.set('brak', []) } - function updateProducts(order: UnwrapRefSimple | UnwrapRefSimple>) { for (const product of order.MZamElem) { const newProduct = { @@ -81,7 +46,6 @@ function updateProducts(order: UnwrapRefSimple | UnwrapRefSimple ({ + kod: product.MZE_TwrKod, + nazwa: product.MZE_TwrNazwa, + ilosc: Number(product.MZE_TwrIlosc).toFixed(2), + jm: product.MZE_TwrJm, + cena: Number(product.MZE_TwrCena).toFixed(2), + suma: Number(Number(product.MZE_TwrCena) * Number(product.MZE_TwrIlosc)).toFixed(2) + })); +// Aktualizacja newOrder z dodanymi produktami + newOrder.products = produkciki; + ordersByRoute.value.get("Wrocław")?.push(newOrder); + + + console.log(newOrder); } function groupByNip() { @@ -131,61 +156,16 @@ function groupByNip() { element.suma = Number(Number(element.MZE_TwrIlosc )*Number(element.MZE_TwrCena)).toFixed(2) entry.products.push(element) } - } } orderByRouteAndNip.set(route, ordersByNip) } orderByRouteAndNipRef.value = orderByRouteAndNip - -}/* -function groupByNip() { - const orderByRouteAndNip = new Map, Array>>>()//TODO moze tu dodać liste numerów orderów - Array.from(ordersByRoute.value).forEach(([route, orders]) => { - const ordersByNip = new Map>() - const productsByNip = new Map>() - const productsAndOrdersByNip = new Map, Array>> - orders.forEach((order) => { - if (!ordersByNip.has(order.MZN_PodNipE)) { - ordersByNip.set(order.MZN_PodNipE, []) - } - ordersByNip.get(order.MZN_PodNipE).push(order) - - order.MZamElem.forEach(element => { - if (!productsByNip.has(order.MZN_PodNipE)) { - productsByNip.set(order.MZN_PodNipE, []) - } - - const productList = productsByNip.get(order.MZN_PodNipE) - const currentElement = productList.find(iterator => iterator.MZE_TwrId === element.MZE_TwrId) - - if (currentElement) { - currentElement.MZE_TwrIlosc = String( - Number.parseFloat(element.MZE_TwrIlosc) + Number.parseFloat(currentElement.MZE_TwrIlosc) - ) - } else { - productList.push(element) - } - - if (!productsAndOrdersByNip.has(order.MZN_PodNipE)) { - const tempMap = new Map, Array> - tempMap.set(ordersByNip.get(order.MZN_PodNipE),productList) - productsAndOrdersByNip.set(order.MZN_PodNipE, tempMap) - } - }) - }) - - - if (!orderByRouteAndNip.has(route)) { - orderByRouteAndNip.set(route, productsAndOrdersByNip) - } - }) console.log(orderByRouteAndNip) } -*/ - onMounted(async () => { +onMounted(async () => { orders.value = await ordersStore.fetchOrdersByDay(searchDate.value, null); const productsMap = await categoriesStore.sumProductsFromOrders(orders.value); summedProducts.value = []; @@ -199,12 +179,14 @@ function groupByNip() { console.log(products.value); isLoading.value=false; groupByNip() - }); + console.log(ordersByRoute.value) +}); - onBeforeUnmount( async function (){ +onBeforeUnmount(async function() { const siteControlStore = useSiteControlStore(); await siteControlStore.newOrder(false); - }) +}) +