From d4d4bed74bdc25aabe28d9af60b484c7b24d909d Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 24 Jan 2025 11:11:02 +0100
Subject: [PATCH] feat: refs #8304 workerCalendar Teleport

---
 src/pages/Worker/Card/WorkerCalendar.vue | 48 ++++++------------------
 1 file changed, 12 insertions(+), 36 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerCalendar.vue b/src/pages/Worker/Card/WorkerCalendar.vue
index 8510f28bc..20071d779 100644
--- a/src/pages/Worker/Card/WorkerCalendar.vue
+++ b/src/pages/Worker/Card/WorkerCalendar.vue
@@ -181,17 +181,18 @@ watch([year, businessFk], () => refreshData());
         ref="WorkerFreelanceRef"
         auto-load
     />
-<<<<<<< HEAD
-    <Teleport to="#right-panel" v-if="stateStore.isHeaderMounted()">
-        <WorkerCalendarFilter
-            ref="workerCalendarFilterRef"
-            v-model:business-fk="businessFk"
-            v-model:year="year"
-            v-model:absence-type="absenceType"
-            :contract-holidays="contractHolidays"
-            :year-holidays="yearHolidays"
-        />
-    </Teleport>
+    <RightMenu>
+        <template #right-panel>
+            <WorkerCalendarFilter
+                ref="workerCalendarFilterRef"
+                v-model:business-fk="businessFk"
+                v-model:year="year"
+                v-model:absence-type="absenceType"
+                :contract-holidays="contractHolidays"
+                :year-holidays="yearHolidays"
+            />
+        </template>
+    </RightMenu>
     <Teleport to="#st-data" v-if="stateStore.isSubToolbarShown()">
         <div>
             <VnNotes
@@ -222,31 +223,6 @@ watch([year, businessFk], () => refreshData());
                 :required="false"
             />
         </div>
-=======
-    <RightMenu>
-        <template #right-panel>
-            <WorkerCalendarFilter
-                ref="workerCalendarFilterRef"
-                v-model:business-fk="businessFk"
-                v-model:year="year"
-                v-model:absence-type="absenceType"
-                :contract-holidays="contractHolidays"
-                :year-holidays="yearHolidays"
-            />
-        </template>
-    </RightMenu>
-    <Teleport to="#st-default" v-if="stateStore.isSubToolbarShown()">
-        <VnNotes
-            v-if="canSeeNotes"
-            :just-input="true"
-            :url="`Workers/${route.params.id}/business`"
-            :filter="{fields: ['id', 'notes', 'workerFk']}"
-            :save-url="saveUrl"
-            @on-fetch="(data) => { saveUrl = `Businesses/${data[0].id}` }"
-            :body="body"
-            :required="false"
-        />
->>>>>>> 864e187a4e9a10cf17c75feb85cd721fd51c6bc6
     </Teleport>
     <QPage class="column items-center">
         <QCard v-if="workerIsFreelance">