From 312677964e22f33a52b9e42731e5493fbea7f50e Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 25 Apr 2025 07:35:30 +0200
Subject: [PATCH 1/3] refactor(workerBasicData): fix useAdvancedSummary

---
 src/pages/Worker/Card/WorkerBasicData.vue | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerBasicData.vue b/src/pages/Worker/Card/WorkerBasicData.vue
index f2a16b7e1..b6daaa64d 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';
@@ -9,21 +8,25 @@ import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import { useAdvancedSummary } from 'src/composables/useAdvancedSummary';
+import { useState } from 'src/composables/useState';
 
 const { t } = useI18n();
+const state = useState();
 const form = ref();
 const educationLevels = ref([]);
 const countries = ref([]);
+const model = 'Worker';
 const maritalStatus = [
     { code: 'M', name: t('Married') },
     { code: 'S', name: t('Single') },
 ];
 
-onMounted(async () => {
-    const advanced = await useAdvancedSummary('Workers', useRoute().params.id);
-    Object.assign(form.value.formData, advanced);
+async function addAdvancedData(id) {
+    const data = state.get(model);
+    const advanced = await useAdvancedSummary('Workers', id);
+    state.set(model, Object.assign(data, advanced));
     nextTick(() => (form.value.hasChanges = false));
-});
+}
 </script>
 <template>
     <FetchData
@@ -42,7 +45,8 @@ onMounted(async () => {
         ref="form"
         :url-update="`Workers/${$route.params.id}`"
         auto-load
-        model="Worker"
+        :model
+        @on-fetch="() => addAdvancedData($route.params.id)"
     >
         <template #form="{ data }">
             <VnRow>

From 92b3ea126f7041e9337f505571b2a1b185a56d9f Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 25 Apr 2025 08:07:22 +0200
Subject: [PATCH 2/3] refactor(WorkerBasicData): update addAdvancedData to use
 formData and remove state dependency

---
 src/components/FormModel.vue              |  2 +-
 src/pages/Worker/Card/WorkerBasicData.vue | 14 ++++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index c4d9a4149..4a50bab76 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -279,7 +279,7 @@ function updateAndEmit(evt, { val, res, old } = { val: null, res: null, old: nul
     state.set(modelValue, val);
     if (!$props.url) arrayData.store.data = val;
 
-    emit(evt, state.get(modelValue), res, old);
+    emit(evt, state.get(modelValue), res, old, formData);
 }
 
 function trimData(data) {
diff --git a/src/pages/Worker/Card/WorkerBasicData.vue b/src/pages/Worker/Card/WorkerBasicData.vue
index b6daaa64d..cb5ead5e3 100644
--- a/src/pages/Worker/Card/WorkerBasicData.vue
+++ b/src/pages/Worker/Card/WorkerBasicData.vue
@@ -8,10 +8,9 @@ import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import { useAdvancedSummary } from 'src/composables/useAdvancedSummary';
-import { useState } from 'src/composables/useState';
+import { useRoute } from 'vue-router';
 
 const { t } = useI18n();
-const state = useState();
 const form = ref();
 const educationLevels = ref([]);
 const countries = ref([]);
@@ -20,11 +19,10 @@ const maritalStatus = [
     { code: 'M', name: t('Married') },
     { code: 'S', name: t('Single') },
 ];
-
-async function addAdvancedData(id) {
-    const data = state.get(model);
-    const advanced = await useAdvancedSummary('Workers', id);
-    state.set(model, Object.assign(data, advanced));
+const route = useRoute();
+async function addAdvancedData(data) {
+    const advanced = await useAdvancedSummary('Workers', route.params.id);
+    data.value = { ...data.value, ...advanced };
     nextTick(() => (form.value.hasChanges = false));
 }
 </script>
@@ -46,7 +44,7 @@ async function addAdvancedData(id) {
         :url-update="`Workers/${$route.params.id}`"
         auto-load
         :model
-        @on-fetch="() => addAdvancedData($route.params.id)"
+        @on-fetch="(data, res, old, formData) => addAdvancedData(formData)"
     >
         <template #form="{ data }">
             <VnRow>

From 4eff607ecb71a14f6b373cc54b671c6634520f68 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 25 Apr 2025 08:28:06 +0200
Subject: [PATCH 3/3] fix(WorkerTimeControl): replace axiosNoError with axios
 for API calls

---
 src/pages/Worker/Card/WorkerTimeControl.vue | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index 9c0fa6758..b2ecf485f 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@@ -2,7 +2,6 @@
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import { onMounted, ref, computed, onBeforeMount, nextTick, reactive } from 'vue';
-import { axiosNoError } from 'src/boot/axios';
 
 import FetchData from 'components/FetchData.vue';
 import WorkerTimeHourChip from 'pages/Worker/Card/WorkerTimeHourChip.vue';
@@ -285,11 +284,11 @@ const fetchWeekData = async () => {
         week: selectedWeekNumber.value,
     };
     try {
-        const [{ data: mailData }, { data: countData }] = await Promise.all([
-            axiosNoError.get(`Workers/${route.params.id}/mail`, {
+        const [{ data: mailData }, { data: countData }] = await Promise.allS([
+            axios.get(`Workers/${route.params.id}/mail`, {
                 params: { filter: { where } },
             }),
-            axiosNoError.get('WorkerTimeControlMails/count', { params: { where } }),
+            axios.get('WorkerTimeControlMails/count', { params: { where } }),
         ]);
 
         const mail = mailData[0];