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] 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]) => {