From 0be772f23780086c7c678b46195b9588bdb19cf9 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 18 Mar 2025 11:53:47 +0100
Subject: [PATCH] Revert "Merge branch 'master' of https: refs
 #8388//gitea.verdnatura.es/verdnatura/salix-front into 8388-fixInvoiceIn"

This reverts commit f58361794576ab2259ba4e7c52685c552594f6d1, reversing
changes made to a01be2d0c19d5c5796e377199f3aa122c96e4812.
---
 src/pages/Worker/Card/WorkerBasicData.vue | 14 ++++-----
 src/pages/Zone/Card/ZoneCard.vue          | 35 ++---------------------
 2 files changed, 9 insertions(+), 40 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerBasicData.vue b/src/pages/Worker/Card/WorkerBasicData.vue
index f2a16b7e1..b8c1c54df 100644
--- a/src/pages/Worker/Card/WorkerBasicData.vue
+++ b/src/pages/Worker/Card/WorkerBasicData.vue
@@ -1,6 +1,5 @@
 <script setup>
-import { ref, nextTick, onMounted } from 'vue';
-import { useRoute } from 'vue-router';
+import { ref, nextTick } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import FetchData from 'components/FetchData.vue';
@@ -18,12 +17,12 @@ const maritalStatus = [
     { code: 'M', name: t('Married') },
     { code: 'S', name: t('Single') },
 ];
-
-onMounted(async () => {
-    const advanced = await useAdvancedSummary('Workers', useRoute().params.id);
+async function setAdvancedSummary(data) {
+    const advanced = (await useAdvancedSummary('Workers', data.id)) ?? {};
     Object.assign(form.value.formData, advanced);
-    nextTick(() => (form.value.hasChanges = false));
-});
+    await nextTick();
+    if (form.value) form.value.hasChanges = false;
+}
 </script>
 <template>
     <FetchData
@@ -43,6 +42,7 @@ onMounted(async () => {
         :url-update="`Workers/${$route.params.id}`"
         auto-load
         model="Worker"
+        @on-fetch="setAdvancedSummary"
     >
         <template #form="{ data }">
             <VnRow>
diff --git a/src/pages/Zone/Card/ZoneCard.vue b/src/pages/Zone/Card/ZoneCard.vue
index f40294e54..2ce4193a0 100644
--- a/src/pages/Zone/Card/ZoneCard.vue
+++ b/src/pages/Zone/Card/ZoneCard.vue
@@ -1,38 +1,7 @@
 <script setup>
-import { useRoute } from 'vue-router';
-import { computed } from 'vue';
-
-import VnCard from 'components/common/VnCard.vue';
+import VnCard from 'src/components/common/VnCard.vue';
 import ZoneDescriptor from './ZoneDescriptor.vue';
-import ZoneFilterPanel from '../ZoneFilterPanel.vue';
-import filter from './ZoneFilter.js';
-
-const route = useRoute();
-const routeName = computed(() => route.name);
-
-function notIsLocations(ifIsFalse, ifIsTrue) {
-    if (routeName.value != 'ZoneLocations') return ifIsFalse;
-    return ifIsTrue;
-}
 </script>
-
 <template>
-    <VnCard
-        data-key="Zone"
-        :url="notIsLocations(`Zones/${route.params.id}`, undefined)"
-        :descriptor="ZoneDescriptor"
-        :filter="filter"
-        :filter-panel="notIsLocations(ZoneFilterPanel, undefined)"
-        :search-data-key="notIsLocations('ZoneList', undefined)"
-        :searchbar-props="{
-            url: notIsLocations('Zones', 'ZoneLocations'),
-            label: notIsLocations($t('list.searchZone'), $t('list.searchLocation')),
-            info: $t('list.searchInfo'),
-            whereFilter: notIsLocations((value) => {
-                return /^\d+$/.test(value)
-                    ? { id: value }
-                    : { name: { like: `%${value}%` } };
-            }),
-        }"
-    />
+    <VnCard data-key="Zone" url="Zones" :descriptor="ZoneDescriptor" />
 </template>