From 710b45f43ab0ecf3a90142708f060bfe3151f782 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 3 May 2024 14:49:50 +0200
Subject: [PATCH 1/3] refs #6842 isFreelance

---
 src/pages/Worker/Card/WorkerCalendar.vue | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerCalendar.vue b/src/pages/Worker/Card/WorkerCalendar.vue
index 288e78dcf..c0a70571e 100644
--- a/src/pages/Worker/Card/WorkerCalendar.vue
+++ b/src/pages/Worker/Card/WorkerCalendar.vue
@@ -13,7 +13,7 @@ import axios from 'axios';
 const stateStore = useStateStore();
 const route = useRoute();
 const { t } = useI18n();
-
+const workerIsFreelance = ref();
 const workerCalendarFilterRef = ref(null);
 const workerCalendarRef = ref(null);
 const absenceType = ref(null);
@@ -32,6 +32,12 @@ const onFetchActiveContract = (data) => {
     hasWorkCenter.value = Boolean(data?.workCenterFk);
 };
 
+const isFreelance = async () => {
+    const { data } = await axios.get(`Workers/${route.params.id}`);
+
+    workerIsFreelance.value = data.isFreelance;
+};
+
 const addEvent = (day, newEvent, isFestive = false) => {
     const timestamp = new Date(day).getTime();
     let event = eventsMap.value[timestamp];
@@ -128,6 +134,7 @@ const refreshData = () => {
     updateYearHolidays();
     updateContractHolidays();
     getAbsences();
+    isFreelance();
 };
 
 const onDeletedEvent = (timestamp) => {
@@ -151,6 +158,11 @@ watch([year, businessFk], () => refreshData());
         @on-fetch="(data) => (isSubordinate = data)"
         auto-load
     />
+    <FetchData
+        :url="`Workers/${route.params.id}`"
+        @on-fetch="(data) => (workerIsFreelance = data.isFreelance)"
+        auto-load
+    />
     <template v-if="stateStore.isHeaderMounted()">
         <Teleport to="#actions-append">
             <div class="row q-gutter-x-sm">
@@ -181,7 +193,7 @@ watch([year, businessFk], () => refreshData());
         </QScrollArea>
     </QDrawer>
     <QPage class="column items-center">
-        <QCard v-if="!hasWorkCenter">
+        <QCard v-if="workerIsFreelance">
             <QCardSection class="text-center">
                 {{ t('Autonomous worker') }}
             </QCardSection>

From 743faef9567f4c7f942a3ebd1d27b45d0f510aec Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 3 May 2024 15:05:37 +0200
Subject: [PATCH 2/3] fix: #6842 Not update calendar correctly

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

diff --git a/src/pages/Worker/Card/WorkerCalendar.vue b/src/pages/Worker/Card/WorkerCalendar.vue
index c0a70571e..6677cb351 100644
--- a/src/pages/Worker/Card/WorkerCalendar.vue
+++ b/src/pages/Worker/Card/WorkerCalendar.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, watch } from 'vue';
+import { nextTick, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
@@ -10,6 +10,8 @@ import WorkerCalendarItem from 'pages/Worker/Card/WorkerCalendarItem.vue';
 import { useStateStore } from 'stores/useStateStore';
 import axios from 'axios';
 
+import { useRouter } from 'vue-router';
+const router = useRouter();
 const stateStore = useStateStore();
 const route = useRoute();
 const { t } = useI18n();
@@ -143,12 +145,21 @@ const onDeletedEvent = (timestamp) => {
     if (festiveEventsMap.value[timestamp])
         eventsMap.value[timestamp] = festiveEventsMap.value[timestamp];
 };
+const activeContractRef = ref(null);
 
+watch(
+    () => router.currentRoute.value.params.id,
+    async () => {
+        await nextTick();
+        await activeContractRef.value.fetch();
+    }
+);
 watch([year, businessFk], () => refreshData());
 </script>
 
 <template>
     <FetchData
+        ref="activeContractRef"
         :url="`Workers/${route.params.id}/activeContract`"
         @on-fetch="onFetchActiveContract"
         auto-load
diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue
index 6f05fcdfb..922c31d99 100644
--- a/src/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@@ -36,7 +36,6 @@ const filter = computed(() => {
 });
 
 const sip = ref(null);
-
 watch(
     () => [worker.value?.sip?.extension, state.get('extension')],
     ([newWorkerSip, newStateExtension], [oldWorkerSip, oldStateExtension]) => {

From ac0993aa11e40a72126ac232d713269ab706c9f0 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 7 May 2024 10:20:26 +0200
Subject: [PATCH 3/3] refs #6842 pr changes

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

diff --git a/src/pages/Worker/Card/WorkerCalendar.vue b/src/pages/Worker/Card/WorkerCalendar.vue
index 6677cb351..2e525aa30 100644
--- a/src/pages/Worker/Card/WorkerCalendar.vue
+++ b/src/pages/Worker/Card/WorkerCalendar.vue
@@ -16,6 +16,7 @@ const stateStore = useStateStore();
 const route = useRoute();
 const { t } = useI18n();
 const workerIsFreelance = ref();
+const WorkerFreelanceRef = ref();
 const workerCalendarFilterRef = ref(null);
 const workerCalendarRef = ref(null);
 const absenceType = ref(null);
@@ -34,12 +35,6 @@ const onFetchActiveContract = (data) => {
     hasWorkCenter.value = Boolean(data?.workCenterFk);
 };
 
-const isFreelance = async () => {
-    const { data } = await axios.get(`Workers/${route.params.id}`);
-
-    workerIsFreelance.value = data.isFreelance;
-};
-
 const addEvent = (day, newEvent, isFestive = false) => {
     const timestamp = new Date(day).getTime();
     let event = eventsMap.value[timestamp];
@@ -136,7 +131,7 @@ const refreshData = () => {
     updateYearHolidays();
     updateContractHolidays();
     getAbsences();
-    isFreelance();
+    WorkerFreelanceRef.value.fetch();
 };
 
 const onDeletedEvent = (timestamp) => {
@@ -172,6 +167,7 @@ watch([year, businessFk], () => refreshData());
     <FetchData
         :url="`Workers/${route.params.id}`"
         @on-fetch="(data) => (workerIsFreelance = data.isFreelance)"
+        ref="WorkerFreelanceRef"
         auto-load
     />
     <template v-if="stateStore.isHeaderMounted()">