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

This reverts commit 0be772f23780086c7c678b46195b9588bdb19cf9.
---
 src/pages/Worker/Card/WorkerBasicData.vue | 14 ++++-----
 src/pages/Zone/Card/ZoneCard.vue          | 35 +++++++++++++++++++++--
 2 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerBasicData.vue b/src/pages/Worker/Card/WorkerBasicData.vue
index b8c1c54df..f2a16b7e1 100644
--- a/src/pages/Worker/Card/WorkerBasicData.vue
+++ b/src/pages/Worker/Card/WorkerBasicData.vue
@@ -1,5 +1,6 @@
 <script setup>
-import { ref, nextTick } from 'vue';
+import { ref, nextTick, onMounted } from 'vue';
+import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import FetchData from 'components/FetchData.vue';
@@ -17,12 +18,12 @@ const maritalStatus = [
     { code: 'M', name: t('Married') },
     { code: 'S', name: t('Single') },
 ];
-async function setAdvancedSummary(data) {
-    const advanced = (await useAdvancedSummary('Workers', data.id)) ?? {};
+
+onMounted(async () => {
+    const advanced = await useAdvancedSummary('Workers', useRoute().params.id);
     Object.assign(form.value.formData, advanced);
-    await nextTick();
-    if (form.value) form.value.hasChanges = false;
-}
+    nextTick(() => (form.value.hasChanges = false));
+});
 </script>
 <template>
     <FetchData
@@ -42,7 +43,6 @@ async function setAdvancedSummary(data) {
         :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 2ce4193a0..f40294e54 100644
--- a/src/pages/Zone/Card/ZoneCard.vue
+++ b/src/pages/Zone/Card/ZoneCard.vue
@@ -1,7 +1,38 @@
 <script setup>
-import VnCard from 'src/components/common/VnCard.vue';
+import { useRoute } from 'vue-router';
+import { computed } from 'vue';
+
+import VnCard from '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="Zones" :descriptor="ZoneDescriptor" />
+    <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}%` } };
+            }),
+        }"
+    />
 </template>