From c9cfb2b1cf38854ca7c7d36217c25776540a8cd5 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 24 Oct 2024 12:29:46 +0200
Subject: [PATCH 1/4] fix: refs #7524 changes

---
 src/pages/Ticket/TicketAdvance.vue | 57 ++++++++++++------------------
 1 file changed, 22 insertions(+), 35 deletions(-)

diff --git a/src/pages/Ticket/TicketAdvance.vue b/src/pages/Ticket/TicketAdvance.vue
index f6fb37e21..7db2b54b3 100644
--- a/src/pages/Ticket/TicketAdvance.vue
+++ b/src/pages/Ticket/TicketAdvance.vue
@@ -243,36 +243,31 @@ const requestComponentUpdate = async (ticket, isWithoutNegatives) => {
 };
 
 const moveTicketsAdvance = async () => {
-    try {
-        let ticketsToMove = [];
-        for (const ticket of selectedTickets.value) {
-            if (!ticket.id) {
-                try {
-                    const { query, params } = await requestComponentUpdate(ticket, false);
-                    axios.post(query, params);
-                } catch (e) {
-                    console.error('Error moving ticket', e);
-                }
-                continue;
+    let ticketsToMove = [];
+    for (const ticket of selectedTickets.value) {
+        if (!ticket.id) {
+            try {
+                const { query, params } = await requestComponentUpdate(ticket, false);
+                axios.post(query, params);
+            } catch (e) {
+                console.error('Error moving ticket', e);
             }
-            ticketsToMove.push({
-                originId: ticket.futureId,
-                destinationId: ticket.id,
-                originShipped: ticket.futureShipped,
-                destinationShipped: ticket.shipped,
-                workerFk: ticket.workerFk,
-            });
+            continue;
         }
-
-        const params = { tickets: ticketsToMove };
-        await axios.post('Tickets/merge', params);
-        vnTableRef.value.reload();
-        selectedTickets.value = [];
-        if (ticketsToMove.length)
-            notify(t('advanceTickets.moveTicketSuccess'), 'positive');
-    } catch (error) {
-        console.error('Error moving tickets', error);
+        ticketsToMove.push({
+            originId: ticket.futureId,
+            destinationId: ticket.id,
+            originShipped: ticket.futureShipped,
+            destinationShipped: ticket.shipped,
+            workerFk: ticket.workerFk,
+        });
     }
+
+    const params = { tickets: ticketsToMove };
+    await axios.post('Tickets/merge', params);
+    vnTableRef.value.reload();
+    selectedTickets.value = [];
+    if (ticketsToMove.length) notify(t('advanceTickets.moveTicketSuccess'), 'positive');
 };
 
 const progressLength = ref(0);
@@ -313,8 +308,6 @@ const splitTickets = async () => {
                 progressAdd(ticket.futureId);
             }
         }
-    } catch (error) {
-        console.error('Error splitting tickets', error);
     } finally {
         vnTableRef.value.reload();
     }
@@ -400,12 +393,6 @@ watch(
         auto-load
         @on-fetch="(data) => (zonesOptions = data)"
     />
-    <!-- Fix searchbar #8154 -->
-    <VnSearchbar
-        data-key="advanceTickets"
-        :label="t('weeklyTickets.search')"
-        :info="t('weeklyTickets.searchInfo')"
-    />
     <VnSubToolbar>
         <template #st-data>
             <QBtn

From f52b4c9a598dc400c3379f800b2f1157f339159f Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 24 Oct 2024 13:24:45 +0200
Subject: [PATCH 2/4] fix: refs #7524 vnProgressModal

---
 src/components/common/VnProgressModal.vue | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/src/components/common/VnProgressModal.vue b/src/components/common/VnProgressModal.vue
index cfd948d5f..99bf15a7e 100644
--- a/src/components/common/VnProgressModal.vue
+++ b/src/components/common/VnProgressModal.vue
@@ -9,10 +9,6 @@ const $props = defineProps({
         type: Number, //Progress value (1.0 > x > 0.0)
         required: true,
     },
-    showDialog: {
-        type: Boolean,
-        required: true,
-    },
     cancelled: {
         type: Boolean,
         required: false,
@@ -24,25 +20,17 @@ const emit = defineEmits(['cancel', 'close']);
 
 const dialogRef = ref(null);
 
-const _showDialog = computed({
-    get: () => $props.showDialog,
-    set: (value) => {
-        if (value) dialogRef.value.show();
-    },
+const showDialog = defineModel('showDialog', {
+    type: Boolean,
+    default: false,
 });
 
 const _progress = computed(() => $props.progress);
-
 const progressLabel = computed(() => `${Math.round($props.progress * 100)}%`);
-
-const cancel = () => {
-    dialogRef.value.hide();
-    emit('cancel');
-};
 </script>
 
 <template>
-    <QDialog ref="dialogRef" v-model="_showDialog" @hide="onDialogHide">
+    <QDialog ref="dialogRef" v-model="showDialog" @hide="emit('close')">
         <QCard class="full-width dialog">
             <QCardSection class="row">
                 <span class="text-h6">{{ t('Progress') }}</span>
@@ -80,7 +68,7 @@ const cancel = () => {
                     type="button"
                     flat
                     class="text-primary"
-                    @click="cancel()"
+                    v-close-popup
                 >
                     {{ t('globals.cancel') }}
                 </QBtn>

From 823c354ef1a376b988e34a7f2f50f6f210ee34b7 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 24 Oct 2024 13:27:08 +0200
Subject: [PATCH 3/4] fix: refs #7524 vnProgressModal

---
 src/components/common/VnProgressModal.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/common/VnProgressModal.vue b/src/components/common/VnProgressModal.vue
index 99bf15a7e..23fb8ae70 100644
--- a/src/components/common/VnProgressModal.vue
+++ b/src/components/common/VnProgressModal.vue
@@ -35,7 +35,7 @@ const progressLabel = computed(() => `${Math.round($props.progress * 100)}%`);
             <QCardSection class="row">
                 <span class="text-h6">{{ t('Progress') }}</span>
                 <QSpace />
-                <QBtn icon="close" flat round dense @click="emit('close')" />
+                <QBtn icon="close" flat round dense v-close-popup />
             </QCardSection>
             <QCardSection>
                 <div class="column">

From 4828e32c9eec24cb349bb5c39cae075653d08538 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 24 Oct 2024 14:26:16 +0200
Subject: [PATCH 4/4] fix: refs #7652 datakey

---
 src/pages/Worker/Card/WorkerDescriptor.vue      | 7 ++++++-
 src/pages/Worker/Card/WorkerDescriptorProxy.vue | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue
index 3675d40f8..b9ccedbfc 100644
--- a/src/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@@ -17,6 +17,11 @@ const $props = defineProps({
         required: false,
         default: null,
     },
+    dataKey: {
+        type: String,
+        required: false,
+        default: 'workerData',
+    },
 });
 const image = ref(null);
 
@@ -70,7 +75,7 @@ const refetch = async () => await cardDescriptorRef.value.getData();
     <CardDescriptor
         ref="cardDescriptorRef"
         module="Worker"
-        data-key="workerData"
+        :data-key="dataKey"
         url="Workers/descriptor"
         :filter="{ where: { id: entityId } }"
         title="user.nickname"
diff --git a/src/pages/Worker/Card/WorkerDescriptorProxy.vue b/src/pages/Worker/Card/WorkerDescriptorProxy.vue
index a142570f9..43deb7821 100644
--- a/src/pages/Worker/Card/WorkerDescriptorProxy.vue
+++ b/src/pages/Worker/Card/WorkerDescriptorProxy.vue
@@ -12,6 +12,11 @@ const $props = defineProps({
 
 <template>
     <QPopupProxy>
-        <WorkerDescriptor v-if="$props.id" :id="$props.id" :summary="WorkerSummary" />
+        <WorkerDescriptor
+            v-if="$props.id"
+            :id="$props.id"
+            :summary="WorkerSummary"
+            data-key="workerDescriptorProxy"
+        />
     </QPopupProxy>
 </template>