From 628ed69bdb3ac48596683cabc9f3fed6ba0abb7e Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Fri, 10 Jan 2025 13:07:01 +0100
Subject: [PATCH 01/19] feat: refs #8304 added remove option to operator

---
 src/pages/Worker/Card/WorkerOperator.vue | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/pages/Worker/Card/WorkerOperator.vue b/src/pages/Worker/Card/WorkerOperator.vue
index cdacc72c0..6faeefe67 100644
--- a/src/pages/Worker/Card/WorkerOperator.vue
+++ b/src/pages/Worker/Card/WorkerOperator.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
-import { ref, computed } from 'vue';
+import { ref, computed, watch } from 'vue';
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
@@ -19,6 +19,7 @@ const trainsData = ref([]);
 const machinesData = ref([]);
 const route = useRoute();
 const routeId = computed(() => route.params.id);
+const selected = ref([]);
 
 const initialData = computed(() => {
     return {
@@ -41,6 +42,21 @@ async function insert() {
     await axios.post('Operators', initialData.value);
     crudModelRef.value.reload();
 }
+
+watch(
+    () => crudModelRef.value?.formData,
+    (formData) => {
+        if (formData && formData.length) {
+            if (JSON.stringify(selected.value) !== JSON.stringify(formData)) {
+                selected.value = formData;
+            }
+        } else if (selected.value.length > 0) {
+            selected.value = [];
+        }
+    },
+    { immediate: true, deep: true }
+);
+
 </script>
 
 <template>
@@ -67,6 +83,7 @@ async function insert() {
             :data-required="{ workerFk: route.params.id }"
             ref="crudModelRef"
             search-url="operator"
+            :selected="selected"
             auto-load
         >
             <template #body="{ rows }">

From 94d2fbb5ca488b82c6815b1de8fcd473bcf1d72e Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Fri, 10 Jan 2025 14:20:35 +0100
Subject: [PATCH 02/19] fix: refs #8304 hide skeleton and table titles when no
 data is available

---
 src/components/common/VnDmsList.vue | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/components/common/VnDmsList.vue b/src/components/common/VnDmsList.vue
index ed3cadc6b..242a6e138 100644
--- a/src/components/common/VnDmsList.vue
+++ b/src/components/common/VnDmsList.vue
@@ -17,7 +17,7 @@ import { useSession } from 'src/composables/useSession';
 const route = useRoute();
 const quasar = useQuasar();
 const { t } = useI18n();
-const rows = ref();
+const rows = ref([]);
 const dmsRef = ref();
 const formDialog = ref({});
 const token = useSession().getTokenMultimedia();
@@ -300,6 +300,7 @@ defineExpose({
         :user-filter="dmsFilter"
         :order="['dmsFk DESC']"
         :auto-load="true"
+        :skeleton="false"
         @on-fetch="setData"
     >
         <template #body>
@@ -310,6 +311,7 @@ defineExpose({
                 hide-bottom
                 row-key="clientFk"
                 :grid="$q.screen.lt.sm"
+                v-if="rows.length"
             >
                 <template #header="props">
                     <QTr :props="props" class="bg">
@@ -388,6 +390,14 @@ defineExpose({
                     </div>
                 </template>
             </QTable>
+            <div 
+                v-else 
+                class="info-row q-pa-md text-center"
+            >
+                <h5>
+                    {{ t('No data to display') }}
+                </h5>
+            </div>
         </template>
     </VnPaginate>
     <QDialog v-model="formDialog.show">

From f1b11636113eb78d478b3e1db3054dc5ebef368f Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Tue, 21 Jan 2025 12:28:18 +0100
Subject: [PATCH 03/19] feat: refs #8304 add justInput prop to VnNotes for
 simplified note handling in workerCalendar

---
 src/components/ui/VnNotes.vue            | 59 ++++++++++++++++++++++--
 src/pages/Worker/Card/WorkerCalendar.vue | 16 ++++++-
 2 files changed, 69 insertions(+), 6 deletions(-)

diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index 1690a94ba..54dc61c5a 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -22,6 +22,7 @@ const $props = defineProps({
     body: { type: Object, default: () => {} },
     addNote: { type: Boolean, default: false },
     selectType: { type: Boolean, default: false },
+    justInput: { type: Boolean, default: false },
 });
 
 const { t } = useI18n();
@@ -29,6 +30,13 @@ const quasar = useQuasar();
 const newNote = reactive({ text: null, observationTypeFk: null });
 const observationTypes = ref([]);
 const vnPaginateRef = ref();
+let originalText;
+
+function handleClick(e) {
+    if (e.shiftKey && e.key === 'Enter') return;
+    if ($props.justInput) update();
+    else insert();
+}
 
 async function insert() {
     if (!newNote.text || ($props.selectType && !newNote.observationTypeFk)) return;
@@ -41,8 +49,37 @@ async function insert() {
     await axios.post($props.url, newBody);
     await vnPaginateRef.value.fetch();
 }
+
+
+async function update() {
+    if(!newNote.text && originalText)
+        quasar
+            .dialog({
+                component: VnConfirm,
+                componentProps: {
+                    title: t('New note is empty'),
+                    message: t('Are you sure remove this note?'),
+                },
+            })
+            .onOk(() => save())
+            .onCancel(() => {
+                newNote.text = originalText;
+            });
+    else save();
+}
+
+async function save() {
+    originalText = newNote.text;
+    const body = $props.body;
+    const newBody = {
+        ...body,
+        ...{ notes: newNote.text },
+    };
+    await axios.patch(`${$props.url}/${$props.body.workerFk}`, newBody);
+}
+
 onBeforeRouteLeave((to, from, next) => {
-    if (newNote.text)
+    if ((newNote.text && !$props.justInput) || (newNote.text !== originalText) && $props.justInput )
         quasar.dialog({
             component: VnConfirm,
             componentProps: {
@@ -61,9 +98,20 @@ onBeforeRouteLeave((to, from, next) => {
         :filter="{ fields: ['id', 'description'] }"
         auto-load
         @on-fetch="(data) => (observationTypes = data)"
+    />    
+    <FetchData
+        v-if="justInput"
+        url="Businesses"
+        :filter="filter"
+        @on-fetch="(data) => (newNote.text = data[0]?.notes, originalText = data[0]?.notes)"
+        auto-load
     />
-    <QCard class="q-pa-xs q-mb-lg full-width" v-if="$props.addNote">
-        <QCardSection horizontal>
+    <QCard 
+        class="q-pa-xs q-mb-lg full-width"
+        v-if="$props.addNote || $props.justInput"
+        :style="$props.justInput ? 'padding-right: 18px; margin-bottom: 2px; box-shadow: none;' : ''"
+    >
+        <QCardSection horizontal v-if="!$props.justInput">
             {{ t('New note') }}
         </QCardSection>
         <QCardSection class="q-px-xs q-my-none q-py-none">
@@ -85,7 +133,7 @@ onBeforeRouteLeave((to, from, next) => {
                     filled
                     size="lg"
                     autogrow
-                    @keyup.enter.stop="insert"
+                    @keyup.enter.stop="handleClick"
                     clearable
                     :required="true"
                 >
@@ -95,7 +143,7 @@ onBeforeRouteLeave((to, from, next) => {
                             icon="save"
                             color="primary"
                             flat
-                            @click="insert"
+                            @click="handleClick"
                             class="q-mb-xs"
                             dense
                             data-cy="saveNote"
@@ -106,6 +154,7 @@ onBeforeRouteLeave((to, from, next) => {
         </QCardSection>
     </QCard>
     <VnPaginate
+        v-if="!$props.justInput"
         :data-key="$props.url"
         :url="$props.url"
         order="created DESC"
diff --git a/src/pages/Worker/Card/WorkerCalendar.vue b/src/pages/Worker/Card/WorkerCalendar.vue
index e9cb793f4..59bd28e75 100644
--- a/src/pages/Worker/Card/WorkerCalendar.vue
+++ b/src/pages/Worker/Card/WorkerCalendar.vue
@@ -2,6 +2,7 @@
 import { nextTick, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
+import { useRouter } from 'vue-router';
 
 import WorkerCalendarFilter from 'pages/Worker/Card/WorkerCalendarFilter.vue';
 import FetchData from 'components/FetchData.vue';
@@ -9,8 +10,8 @@ import WorkerCalendarItem from 'pages/Worker/Card/WorkerCalendarItem.vue';
 
 import { useStateStore } from 'stores/useStateStore';
 import axios from 'axios';
+import VnNotes from 'src/components/ui/VnNotes.vue';
 
-import { useRouter } from 'vue-router';
 const router = useRouter();
 const stateStore = useStateStore();
 const route = useRoute();
@@ -28,6 +29,9 @@ const contractHolidays = ref(null);
 const yearHolidays = ref(null);
 const eventsMap = ref({});
 const festiveEventsMap = ref({});
+const body = {
+    workerFk: route.params.id,
+};
 
 const onFetchActiveContract = (data) => {
     if (!data) return;
@@ -181,6 +185,15 @@ watch([year, businessFk], () => refreshData());
             :year-holidays="yearHolidays"
         />
     </Teleport>
+    <div>
+            <VnNotes
+                :just-input="true"
+                :url="`businesses`"
+                :body="body"
+                :maxlength=10
+                :filter="{ fields: ['id', 'notes'], where: { workerFk: route.params.id }, order: 'started DESC' }"
+            />
+    </div>
     <QPage class="column items-center">
         <QCard v-if="workerIsFreelance">
             <QCardSection class="text-center">
@@ -229,6 +242,7 @@ watch([year, businessFk], () => refreshData());
 }
 </style>
 
+
 <i18n>
 en:
     addAbsencesText: To start adding absences, click an absence type from the right menu and then on the day you want to add an absence

From 83064c381307604adfe7a33688b37d788f6538d5 Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Tue, 21 Jan 2025 14:44:07 +0100
Subject: [PATCH 04/19] feat: refs #8304 add saveUrl prop to VnNotes and
 implement confirm update functionality

---
 src/components/ui/VnNotes.vue            | 19 +++++++++++--------
 src/pages/Worker/Card/WorkerCalendar.vue | 21 +++++++++++++++++----
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index 54dc61c5a..7c8787447 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -16,8 +16,11 @@ import VnSelect from 'components/common/VnSelect.vue';
 import FetchData from 'components/FetchData.vue';
 import VnInput from 'components/common/VnInput.vue';
 
+const emit = defineEmits(['onFetch']);
+
 const $props = defineProps({
     url: { type: String, default: null },
+    saveUrl: {type: String, default: null},
     filter: { type: Object, default: () => {} },
     body: { type: Object, default: () => {} },
     addNote: { type: Boolean, default: false },
@@ -34,7 +37,7 @@ let originalText;
 
 function handleClick(e) {
     if (e.shiftKey && e.key === 'Enter') return;
-    if ($props.justInput) update();
+    if ($props.justInput) confirmAndUpdate();
     else insert();
 }
 
@@ -51,7 +54,7 @@ async function insert() {
 }
 
 
-async function update() {
+function confirmAndUpdate() {
     if(!newNote.text && originalText)
         quasar
             .dialog({
@@ -61,21 +64,21 @@ async function update() {
                     message: t('Are you sure remove this note?'),
                 },
             })
-            .onOk(() => save())
+            .onOk(() => update())
             .onCancel(() => {
                 newNote.text = originalText;
             });
-    else save();
+    else update();
 }
 
-async function save() {
+async function update() {
     originalText = newNote.text;
     const body = $props.body;
     const newBody = {
         ...body,
         ...{ notes: newNote.text },
     };
-    await axios.patch(`${$props.url}/${$props.body.workerFk}`, newBody);
+    await axios.patch(`${$props.saveUrl ?? `${$props.url}/${$props.body.workerFk}`}`, newBody);
 }
 
 onBeforeRouteLeave((to, from, next) => {
@@ -101,9 +104,9 @@ onBeforeRouteLeave((to, from, next) => {
     />    
     <FetchData
         v-if="justInput"
-        url="Businesses"
+        :url="url"
         :filter="filter"
-        @on-fetch="(data) => (newNote.text = data[0]?.notes, originalText = data[0]?.notes)"
+        @on-fetch="(data) => (newNote.text = data[0]?.notes, originalText = data[0]?.notes, emit('onFetch', data))"
         auto-load
     />
     <QCard 
diff --git a/src/pages/Worker/Card/WorkerCalendar.vue b/src/pages/Worker/Card/WorkerCalendar.vue
index 59bd28e75..bf3903a56 100644
--- a/src/pages/Worker/Card/WorkerCalendar.vue
+++ b/src/pages/Worker/Card/WorkerCalendar.vue
@@ -1,8 +1,9 @@
 <script setup>
-import { nextTick, ref, watch } from 'vue';
+import { nextTick, ref, watch, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import { useRouter } from 'vue-router';
+import { useAcl } from 'src/composables/useAcl';
 
 import WorkerCalendarFilter from 'pages/Worker/Card/WorkerCalendarFilter.vue';
 import FetchData from 'components/FetchData.vue';
@@ -16,6 +17,12 @@ const router = useRouter();
 const stateStore = useStateStore();
 const route = useRoute();
 const { t } = useI18n();
+const acl = useAcl();
+const canSeeNotes = computed(() =>
+    acl.hasAny([
+        { model: 'Worker', props: '__get__business', accessType: 'READ' },
+    ])
+);
 const workerIsFreelance = ref();
 const WorkerFreelanceRef = ref();
 const workerCalendarFilterRef = ref(null);
@@ -29,6 +36,7 @@ const contractHolidays = ref(null);
 const yearHolidays = ref(null);
 const eventsMap = ref({});
 const festiveEventsMap = ref({});
+const saveUrl = ref();
 const body = {
     workerFk: route.params.id,
 };
@@ -187,11 +195,16 @@ watch([year, businessFk], () => refreshData());
     </Teleport>
     <div>
             <VnNotes
+                v-if="canSeeNotes"
                 :just-input="true"
-                :url="`businesses`"
+                :url="`Workers/${route.params.id}/business`"
+                :filter="{fields: ['id', 'notes', 'workerFk']}"
+                :save-url="saveUrl"
+                @on-fetch="(data) => {
+                    console.log(data);
+                    saveUrl = `Businesses/${data[0].id}`
+                }"
                 :body="body"
-                :maxlength=10
-                :filter="{ fields: ['id', 'notes'], where: { workerFk: route.params.id }, order: 'started DESC' }"
             />
     </div>
     <QPage class="column items-center">

From 8599974437c753a7793d77c01ac6b090600923a0 Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Wed, 22 Jan 2025 16:29:04 +0100
Subject: [PATCH 05/19] feat: refs #8304 add required prop to VnNotes and
 update related components

---
 src/components/ui/VnNotes.vue             | 14 +++++-----
 src/components/ui/VnSubToolbar.vue        | 33 +++++++++++++++--------
 src/pages/Customer/Card/CustomerNotes.vue |  1 +
 src/pages/Worker/Card/WorkerCalendar.vue  | 26 +++++++++---------
 4 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index 7c8787447..7a635104a 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -26,6 +26,7 @@ const $props = defineProps({
     addNote: { type: Boolean, default: false },
     selectType: { type: Boolean, default: false },
     justInput: { type: Boolean, default: false },
+    required: { type: Boolean, default: false },
 });
 
 const { t } = useI18n();
@@ -53,7 +54,6 @@ async function insert() {
     await vnPaginateRef.value.fetch();
 }
 
-
 function confirmAndUpdate() {
     if(!newNote.text && originalText)
         quasar
@@ -101,7 +101,7 @@ onBeforeRouteLeave((to, from, next) => {
         :filter="{ fields: ['id', 'description'] }"
         auto-load
         @on-fetch="(data) => (observationTypes = data)"
-    />    
+    />
     <FetchData
         v-if="justInput"
         :url="url"
@@ -110,7 +110,7 @@ onBeforeRouteLeave((to, from, next) => {
         auto-load
     />
     <QCard 
-        class="q-pa-xs q-mb-lg full-width"
+        class="q-pa-xs q-mb-lg full-width" 
         v-if="$props.addNote || $props.justInput"
         :style="$props.justInput ? 'padding-right: 18px; margin-bottom: 2px; box-shadow: none;' : ''"
     >
@@ -126,19 +126,19 @@ onBeforeRouteLeave((to, from, next) => {
                     v-model="newNote.observationTypeFk"
                     option-label="description"
                     style="flex: 0.15"
-                    :required="true"
+                    :required="$props.required"
                     @keyup.enter.stop="insert"
                 />
                 <VnInput
                     v-model.trim="newNote.text"
                     type="textarea"
-                    :label="t('Add note here...')"
+                    :label="$props.justInput && newNote.text ? '' : t('Add note here...')"
                     filled
                     size="lg"
                     autogrow
                     @keyup.enter.stop="handleClick"
+                    :required="$props.required"
                     clearable
-                    :required="true"
                 >
                     <template #append>
                         <QBtn
@@ -257,4 +257,6 @@ onBeforeRouteLeave((to, from, next) => {
         New note: Nueva nota
         Save (Enter): Guardar (Intro)
         Observation type: Tipo de observación
+        New note is empty: La nueva nota esta vacia
+        Are you sure remove this note?: Estas seguro de quitar esta nota?
 </i18n>
diff --git a/src/components/ui/VnSubToolbar.vue b/src/components/ui/VnSubToolbar.vue
index 5ded4be00..d61ca87e5 100644
--- a/src/components/ui/VnSubToolbar.vue
+++ b/src/components/ui/VnSubToolbar.vue
@@ -1,8 +1,10 @@
 <script setup>
 import { onMounted, onBeforeUnmount, ref } from 'vue';
 import { useStateStore } from 'stores/useStateStore';
+import { computed } from 'vue';
 
 const stateStore = useStateStore();
+const general = ref(null);
 const actions = ref(null);
 const data = ref(null);
 const opts = { subtree: true, childList: true, attributes: true };
@@ -12,35 +14,44 @@ onMounted(() => {
     stateStore.toggleSubToolbar();
     actions.value = document.querySelector('#st-actions');
     data.value = document.querySelector('#st-data');
+    general.value = document.querySelector('#st-default');
 
-    if (!actions.value && !data.value) return;
+    if (!actions.value && !data.value && !general.value) return;
 
     // Check if there's content to display
     const observer = new MutationObserver(
         () =>
             (hasContent.value =
-                actions.value?.childNodes?.length + data.value?.childNodes?.length)
+                actions.value?.childNodes?.length + data.value?.childNodes?.length + general.value?.childNodes?.length)
     );
     if (actions.value) observer.observe(actions.value, opts);
     if (data.value) observer.observe(data.value, opts);
+    if (general.value) observer.observe(general.value, opts);
 });
 
-onBeforeUnmount(() => stateStore.toggleSubToolbar());
+const generalChildCount = () => {
+    return !!general.value.childNodes.length;
+}
+
+onBeforeUnmount(() => stateStore.toggleSubToolbar() && hasSubToolbar);
 </script>
 
 <template>
     <QToolbar
         id="subToolbar"
-        class="justify-end sticky"
-        v-show="hasContent || $slots['st-actions'] || $slots['st-data']"
+        v-show="hasContent || $slots['st-actions'] || $slots['st-data'] || $slots['st-default']"
+        :class="{'justify-end': !generalChildCount, 'sticky': !generalChildCount}"
     >
-        <slot name="st-data">
-            <div id="st-data"></div>
-        </slot>
-        <QSpace />
-        <slot name="st-actions">
-            <div id="st-actions"></div>
+        <slot>
+            <div :class="{'full-width' : generalChildCount, 'q-px-none': generalChildCount }" id="st-default"></div>
         </slot>
+                <slot name="st-data">
+                    <div id="st-data"></div>
+                </slot>
+                <QSpace />
+                <slot name="st-actions">
+                    <div id="st-actions"></div>
+                </slot>
     </QToolbar>
 </template>
 <style lang="scss" scoped>
diff --git a/src/pages/Customer/Card/CustomerNotes.vue b/src/pages/Customer/Card/CustomerNotes.vue
index b85174696..f85634b2c 100644
--- a/src/pages/Customer/Card/CustomerNotes.vue
+++ b/src/pages/Customer/Card/CustomerNotes.vue
@@ -23,5 +23,6 @@ const noteFilter = computed(() => {
         :body="{ clientFk: route.params.id }"
         style="overflow-y: auto"
         :select-type="true"
+        :required="true"
     />
 </template>
diff --git a/src/pages/Worker/Card/WorkerCalendar.vue b/src/pages/Worker/Card/WorkerCalendar.vue
index bf3903a56..063a4e1ef 100644
--- a/src/pages/Worker/Card/WorkerCalendar.vue
+++ b/src/pages/Worker/Card/WorkerCalendar.vue
@@ -193,20 +193,18 @@ watch([year, businessFk], () => refreshData());
             :year-holidays="yearHolidays"
         />
     </Teleport>
-    <div>
-            <VnNotes
-                v-if="canSeeNotes"
-                :just-input="true"
-                :url="`Workers/${route.params.id}/business`"
-                :filter="{fields: ['id', 'notes', 'workerFk']}"
-                :save-url="saveUrl"
-                @on-fetch="(data) => {
-                    console.log(data);
-                    saveUrl = `Businesses/${data[0].id}`
-                }"
-                :body="body"
-            />
-    </div>
+    <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"
+        />
+    </Teleport>
     <QPage class="column items-center">
         <QCard v-if="workerIsFreelance">
             <QCardSection class="text-center">

From adc9d1630b36236aa8d56465ff98103a426b2b96 Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Wed, 22 Jan 2025 16:32:41 +0100
Subject: [PATCH 06/19] refactor: refs #8304 put year and contract selectors in
 the same line

---
 src/pages/Worker/Card/WorkerCalendarFilter.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerCalendarFilter.vue b/src/pages/Worker/Card/WorkerCalendarFilter.vue
index 67b7df907..4b3cfebfe 100644
--- a/src/pages/Worker/Card/WorkerCalendarFilter.vue
+++ b/src/pages/Worker/Card/WorkerCalendarFilter.vue
@@ -180,8 +180,6 @@ const yearList = ref(generateYears());
                     :is-clearable="false"
                 />
             </QItemSection>
-        </QItem>
-        <QItem>
             <QItemSection>
                 <VnSelect
                     :label="t('Contract')"
@@ -223,7 +221,7 @@ const yearList = ref(generateYears());
             >
                 {{ type.name }}
             </WorkerEventLabel>
-        </QItem>
+    </QItem>
     </QList>
     <QSeparator />
     <QList dense class="list q-my-md no-pointer-events">

From 3a2fca110cd1d7ae3108b9ddcf543fe0e3b58f2e Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Thu, 23 Jan 2025 13:38:19 +0100
Subject: [PATCH 07/19] test: refs #8304 enhance VnNotes.spec.js with
 additional test cases and refactor setup functions

---
 .../common/__tests__/VnNotes.spec.js          | 116 +++++++++++-------
 1 file changed, 69 insertions(+), 47 deletions(-)

diff --git a/src/components/common/__tests__/VnNotes.spec.js b/src/components/common/__tests__/VnNotes.spec.js
index 8f24a7f14..0f5c51327 100644
--- a/src/components/common/__tests__/VnNotes.spec.js
+++ b/src/components/common/__tests__/VnNotes.spec.js
@@ -1,51 +1,62 @@
-import { describe, it, expect, vi, beforeAll, afterEach, beforeEach } from 'vitest';
+import { describe, it, expect, vi, beforeAll, afterEach, beforeEach, afterAll } from 'vitest';
 import { createWrapper, axios } from 'app/test/vitest/helper';
 import VnNotes from 'src/components/ui/VnNotes.vue';
+import vnDate from 'src/boot/vnDate';
 
 describe('VnNotes', () => {
     let vm;
     let wrapper;
     let spyFetch;
     let postMock;
-    let expectedBody;
-    const mockData= {name: 'Tony', lastName: 'Stark', text: 'Test Note', observationTypeFk: 1};
-
-    function generateExpectedBody() {
-        expectedBody = {...vm.$props.body, ...{ text: vm.newNote.text, observationTypeFk: vm.newNote.observationTypeFk }};
-    }
-
-    async function setTestParams(text, observationType, type){
-        vm.newNote.text = text;
-        vm.newNote.observationTypeFk = observationType;
-        wrapper.setProps({ selectType: type });
-    }
-
-    beforeAll(async () => {        
-        vi.spyOn(axios, 'get').mockReturnValue({ data: [] });
+    let patchMock;
+    let expectedInsertBody;
+    let expectedUpdateBody;
 
+    function generateWrapper({url = '/test', body = { name: 'Tony', lastName: 'Stark' }, text = null, observationType = null, selectType = false, saveUrl = null, justInput = false }) {
+        vi.spyOn(axios, 'get').mockResolvedValue({ data: [] });
         wrapper = createWrapper(VnNotes, {
             propsData: {
-                url: '/test',
-                body: { name: 'Tony', lastName: 'Stark' },
-            }
+                url,
+                saveUrl,
+                body,
+                selectType,
+                justInput
+            },
         });
         wrapper = wrapper.wrapper;
         vm = wrapper.vm;
-    });
+        vm.newNote.text = text;
+        vm.newNote.observationTypeFk = observationType;
+    };
+
+    function createSpyFetch() {
+        spyFetch = vi.spyOn(vm.$refs.vnPaginateRef, 'fetch');
+    };
+
+    function generateExpectedBody() {
+        expectedInsertBody = {...vm.$props.body, ...{ text: vm.newNote.text, observationTypeFk: vm.newNote.observationTypeFk }};
+        expectedUpdateBody = {...vm.$props.body, ...{ notes: vm.newNote.text }};
+    }
 
     beforeEach(() => {
-        postMock = vi.spyOn(axios, 'post').mockResolvedValue(mockData);
-        spyFetch = vi.spyOn(vm.vnPaginateRef, 'fetch').mockImplementation(() => vi.fn());
+        postMock = vi.spyOn(axios, 'post');
+        patchMock = vi.spyOn(axios, 'patch');      
     });
 
     afterEach(() => {
         vi.clearAllMocks();
-        expectedBody = {};
+        expectedInsertBody = {};
+        expectedUpdateBody = {};
+    });
+
+    afterAll(() => {
+        vi.restoreAllMocks();
     });
 
     describe('insert', () => {
-        it('should not call axios.post and vnPaginateRef.fetch if newNote.text is null', async () => {
-            await setTestParams( null, null, true );
+        it('should not call axios.post and vnPaginateRef.fetch when newNote.text is null', async () => {
+            generateWrapper({ selectType: true });
+            createSpyFetch();
 
             await vm.insert();
 
@@ -53,8 +64,9 @@ describe('VnNotes', () => {
             expect(spyFetch).not.toHaveBeenCalled();
         });
 
-        it('should not call axios.post and vnPaginateRef.fetch if newNote.text is empty', async () => {
-            await setTestParams( "", null, false );
+        it('should not call axios.post and vnPaginateRef.fetch when newNote.text is empty', async () => {
+            generateWrapper({ text: "" });
+            createSpyFetch();
 
             await vm.insert();
 
@@ -62,8 +74,9 @@ describe('VnNotes', () => {
             expect(spyFetch).not.toHaveBeenCalled();
         });
 
-        it('should not call axios.post and vnPaginateRef.fetch if observationTypeFk is missing and selectType is true', async () => {
-            await setTestParams( "Test Note", null, true );
+        it('should not call axios.post and vnPaginateRef.fetch when observationTypeFk is null and selectType is true', async () => {
+            generateWrapper({ text: "Test Note", selectType: true });
+            createSpyFetch();
 
             await vm.insert();
 
@@ -71,37 +84,46 @@ describe('VnNotes', () => {
             expect(spyFetch).not.toHaveBeenCalled();
         });
 
-        it('should call axios.post and vnPaginateRef.fetch if observationTypeFk is missing and selectType is false', async () => {
-            await setTestParams( "Test Note", null, false );
-
+        it('should call axios.post and vnPaginateRef.fetch when observationTypeFk is missing and selectType is false', async () => {
+            generateWrapper({ text: "Test Note" });
+            createSpyFetch();
             generateExpectedBody();
 
             await vm.insert();
 
-            expect(postMock).toHaveBeenCalledWith(vm.$props.url, expectedBody);
-            expect(spyFetch).toHaveBeenCalled();
-        });
-
-        it('should call axios.post and vnPaginateRef.fetch if observationTypeFk is setted and selectType is false', async () => {            
-            await setTestParams( "Test Note", 1, false );
-
-            generateExpectedBody();
-
-            await vm.insert();
-
-            expect(postMock).toHaveBeenCalledWith(vm.$props.url, expectedBody);
+            expect(postMock).toHaveBeenCalledWith( vm.$props.url, expectedInsertBody );
             expect(spyFetch).toHaveBeenCalled();
         });
 
         it('should call axios.post and vnPaginateRef.fetch when newNote is valid', async () => {
-            await setTestParams( "Test Note", 1, true );
-
+            generateWrapper({ text: "Test Note", observationType: 1, selectType: true });
+            createSpyFetch();
             generateExpectedBody();
             
             await vm.insert();
 
-            expect(postMock).toHaveBeenCalledWith(vm.$props.url, expectedBody);
+            expect(postMock).toHaveBeenCalledWith(vm.$props.url, expectedInsertBody);
             expect(spyFetch).toHaveBeenCalled();
         });
     });
+
+    describe('update', () => {
+        it('should call axios.patch with saveUrl when saveUrl is set and justInput is true', async () => {
+            generateWrapper({ url: '/business', justInput: true, saveUrl: '/saveUrlTest' });
+            generateExpectedBody();
+
+            await vm.update();
+
+            expect(patchMock).toHaveBeenCalledWith(vm.$props.saveUrl, expectedUpdateBody);
+        });
+
+        it('should call axios.patch with url when saveUrl is not set and justInput is true', async () => {
+            generateWrapper({ url: '/business', body: { workerFk: 1110 }, justInput: true });
+            generateExpectedBody();
+
+            await vm.update();
+
+            expect(patchMock).toHaveBeenCalledWith(`${vm.$props.url}/${vm.$props.body.workerFk}`, expectedUpdateBody);
+        });
+    });
 });
\ No newline at end of file

From 6601e2e0ae075e31efcf6a0d6834b30553a6834a Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Thu, 23 Jan 2025 15:33:19 +0100
Subject: [PATCH 08/19] fix: refs #8304 remove unnecessary v-if condition from
 VnDmsList component

---
 src/components/common/VnDmsList.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/common/VnDmsList.vue b/src/components/common/VnDmsList.vue
index c8e9ddbd5..91333a913 100644
--- a/src/components/common/VnDmsList.vue
+++ b/src/components/common/VnDmsList.vue
@@ -311,7 +311,6 @@ defineExpose({
                 hide-bottom
                 row-key="clientFk"
                 :grid="$q.screen.lt.sm"
-                v-if="rows.length"
             >
                 <template #header="props">
                     <QTr :props="props" class="bg">

From 686bacd38a766c30b15afe15d83aba706adb1a3a Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Fri, 24 Jan 2025 08:36:20 +0100
Subject: [PATCH 09/19] refactor: refs #8304 replace Teleport with RightMenu
 for WorkerCalendarFilter component

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

diff --git a/src/pages/Worker/Card/WorkerCalendar.vue b/src/pages/Worker/Card/WorkerCalendar.vue
index de43940b3..5ae48b609 100644
--- a/src/pages/Worker/Card/WorkerCalendar.vue
+++ b/src/pages/Worker/Card/WorkerCalendar.vue
@@ -181,16 +181,18 @@ watch([year, businessFk], () => refreshData());
         ref="WorkerFreelanceRef"
         auto-load
     />
-    <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-default" v-if="stateStore.isSubToolbarShown()">
         <VnNotes
             v-if="canSeeNotes"
@@ -251,7 +253,6 @@ watch([year, businessFk], () => refreshData());
 }
 </style>
 
-
 <i18n>
 en:
     addAbsencesText: To start adding absences, click an absence type from the right menu and then on the day you want to add an absence

From 012b40141412b3264233b894f3a6a5d38bee9e69 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 24 Jan 2025 11:07:39 +0100
Subject: [PATCH 10/19] feat: refs #8304 remove st-default

---
 src/components/ui/VnSubToolbar.vue       | 32 ++++++---------
 src/pages/Worker/Card/WorkerCalendar.vue | 52 ++++++++++++++++--------
 2 files changed, 48 insertions(+), 36 deletions(-)

diff --git a/src/components/ui/VnSubToolbar.vue b/src/components/ui/VnSubToolbar.vue
index d61ca87e5..6555e729a 100644
--- a/src/components/ui/VnSubToolbar.vue
+++ b/src/components/ui/VnSubToolbar.vue
@@ -4,7 +4,6 @@ import { useStateStore } from 'stores/useStateStore';
 import { computed } from 'vue';
 
 const stateStore = useStateStore();
-const general = ref(null);
 const actions = ref(null);
 const data = ref(null);
 const opts = { subtree: true, childList: true, attributes: true };
@@ -14,24 +13,22 @@ onMounted(() => {
     stateStore.toggleSubToolbar();
     actions.value = document.querySelector('#st-actions');
     data.value = document.querySelector('#st-data');
-    general.value = document.querySelector('#st-default');
 
-    if (!actions.value && !data.value && !general.value) return;
+    if (!actions.value && !data.value) return;
 
     // Check if there's content to display
     const observer = new MutationObserver(
         () =>
             (hasContent.value =
-                actions.value?.childNodes?.length + data.value?.childNodes?.length + general.value?.childNodes?.length)
+                actions.value?.childNodes?.length + data.value?.childNodes?.length),
     );
     if (actions.value) observer.observe(actions.value, opts);
     if (data.value) observer.observe(data.value, opts);
-    if (general.value) observer.observe(general.value, opts);
 });
 
-const generalChildCount = () => {
-    return !!general.value.childNodes.length;
-}
+const actionsChildCount = () => {
+    return !!actions.value.childNodes.length;
+};
 
 onBeforeUnmount(() => stateStore.toggleSubToolbar() && hasSubToolbar);
 </script>
@@ -39,19 +36,16 @@ onBeforeUnmount(() => stateStore.toggleSubToolbar() && hasSubToolbar);
 <template>
     <QToolbar
         id="subToolbar"
-        v-show="hasContent || $slots['st-actions'] || $slots['st-data'] || $slots['st-default']"
-        :class="{'justify-end': !generalChildCount, 'sticky': !generalChildCount}"
+        v-show="hasContent || $slots['st-actions'] || $slots['st-data']"
+        class="full-width sticky"
     >
-        <slot>
-            <div :class="{'full-width' : generalChildCount, 'q-px-none': generalChildCount }" id="st-default"></div>
+        <slot name="st-data">
+            <div id="st-data" :class="{ 'full-width': actionsChildCount }"></div>
+        </slot>
+        <QSpace />
+        <slot name="st-actions">
+            <div id="st-actions"></div>
         </slot>
-                <slot name="st-data">
-                    <div id="st-data"></div>
-                </slot>
-                <QSpace />
-                <slot name="st-actions">
-                    <div id="st-actions"></div>
-                </slot>
     </QToolbar>
 </template>
 <style lang="scss" scoped>
diff --git a/src/pages/Worker/Card/WorkerCalendar.vue b/src/pages/Worker/Card/WorkerCalendar.vue
index de43940b3..7b0d9b97f 100644
--- a/src/pages/Worker/Card/WorkerCalendar.vue
+++ b/src/pages/Worker/Card/WorkerCalendar.vue
@@ -11,15 +11,15 @@ import RightMenu from 'src/components/common/RightMenu.vue';
 
 import axios from 'axios';
 import VnNotes from 'src/components/ui/VnNotes.vue';
+import { useStateStore } from 'src/stores/useStateStore';
+const stateStore = useStateStore();
 
 const router = useRouter();
 const route = useRoute();
 const { t } = useI18n();
 const acl = useAcl();
 const canSeeNotes = computed(() =>
-    acl.hasAny([
-        { model: 'Worker', props: '__get__business', accessType: 'READ' },
-    ])
+    acl.hasAny([{ model: 'Worker', props: '__get__business', accessType: 'READ' }]),
 );
 const workerIsFreelance = ref();
 const WorkerFreelanceRef = ref();
@@ -79,7 +79,7 @@ const onFetchAbsences = (data) => {
                     name: holidayName,
                     isFestive: true,
                 },
-                true
+                true,
             );
         });
     }
@@ -158,7 +158,7 @@ watch(
     async () => {
         await nextTick();
         await activeContractRef.value.fetch();
-    }
+    },
 );
 watch([year, businessFk], () => refreshData());
 </script>
@@ -191,17 +191,36 @@ watch([year, businessFk], () => refreshData());
             :year-holidays="yearHolidays"
         />
     </Teleport>
-    <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"
-        />
+    <Teleport to="#st-data" v-if="stateStore.isSubToolbarShown()">
+        <div>
+            <VnNotes
+                :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"
+            />
+            <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"
+            />
+        </div>
     </Teleport>
     <QPage class="column items-center">
         <QCard v-if="workerIsFreelance">
@@ -251,7 +270,6 @@ watch([year, businessFk], () => refreshData());
 }
 </style>
 
-
 <i18n>
 en:
     addAbsencesText: To start adding absences, click an absence type from the right menu and then on the day you want to add an absence

From 71967591d360efc9c256d9572c85d217dfecebbb Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 24 Jan 2025 11:07:53 +0100
Subject: [PATCH 11/19] test: refs #8304 improve test

---
 .../common/__tests__/VnNotes.spec.js          | 77 +++++++++++++------
 1 file changed, 52 insertions(+), 25 deletions(-)

diff --git a/src/components/common/__tests__/VnNotes.spec.js b/src/components/common/__tests__/VnNotes.spec.js
index 0f5c51327..2603bf03c 100644
--- a/src/components/common/__tests__/VnNotes.spec.js
+++ b/src/components/common/__tests__/VnNotes.spec.js
@@ -1,4 +1,13 @@
-import { describe, it, expect, vi, beforeAll, afterEach, beforeEach, afterAll } from 'vitest';
+import {
+    describe,
+    it,
+    expect,
+    vi,
+    beforeAll,
+    afterEach,
+    beforeEach,
+    afterAll,
+} from 'vitest';
 import { createWrapper, axios } from 'app/test/vitest/helper';
 import VnNotes from 'src/components/ui/VnNotes.vue';
 import vnDate from 'src/boot/vnDate';
@@ -11,36 +20,43 @@ describe('VnNotes', () => {
     let patchMock;
     let expectedInsertBody;
     let expectedUpdateBody;
-
-    function generateWrapper({url = '/test', body = { name: 'Tony', lastName: 'Stark' }, text = null, observationType = null, selectType = false, saveUrl = null, justInput = false }) {
+    const defaultOptions = {
+        url: '/test',
+        body: { name: 'Tony', lastName: 'Stark' },
+        selectType: false,
+        saveUrl: null,
+        justInput: false,
+    };
+    function generateWrapper(
+        options = defaultOptions,
+        text = null,
+        observationType = null,
+    ) {
         vi.spyOn(axios, 'get').mockResolvedValue({ data: [] });
         wrapper = createWrapper(VnNotes, {
-            propsData: {
-                url,
-                saveUrl,
-                body,
-                selectType,
-                justInput
-            },
+            propsData: options,
         });
         wrapper = wrapper.wrapper;
         vm = wrapper.vm;
         vm.newNote.text = text;
         vm.newNote.observationTypeFk = observationType;
-    };
+    }
 
     function createSpyFetch() {
         spyFetch = vi.spyOn(vm.$refs.vnPaginateRef, 'fetch');
-    };
+    }
 
     function generateExpectedBody() {
-        expectedInsertBody = {...vm.$props.body, ...{ text: vm.newNote.text, observationTypeFk: vm.newNote.observationTypeFk }};
-        expectedUpdateBody = {...vm.$props.body, ...{ notes: vm.newNote.text }};
+        expectedInsertBody = {
+            ...vm.$props.body,
+            ...{ text: vm.newNote.text, observationTypeFk: vm.newNote.observationTypeFk },
+        };
+        expectedUpdateBody = { ...vm.$props.body, ...{ notes: vm.newNote.text } };
     }
 
     beforeEach(() => {
         postMock = vi.spyOn(axios, 'post');
-        patchMock = vi.spyOn(axios, 'patch');      
+        patchMock = vi.spyOn(axios, 'patch');
     });
 
     afterEach(() => {
@@ -65,7 +81,7 @@ describe('VnNotes', () => {
         });
 
         it('should not call axios.post and vnPaginateRef.fetch when newNote.text is empty', async () => {
-            generateWrapper({ text: "" });
+            generateWrapper(null, '');
             createSpyFetch();
 
             await vm.insert();
@@ -75,7 +91,7 @@ describe('VnNotes', () => {
         });
 
         it('should not call axios.post and vnPaginateRef.fetch when observationTypeFk is null and selectType is true', async () => {
-            generateWrapper({ text: "Test Note", selectType: true });
+            generateWrapper({ selectType: true }, 'Test Note');
             createSpyFetch();
 
             await vm.insert();
@@ -85,21 +101,21 @@ describe('VnNotes', () => {
         });
 
         it('should call axios.post and vnPaginateRef.fetch when observationTypeFk is missing and selectType is false', async () => {
-            generateWrapper({ text: "Test Note" });
+            generateWrapper(null, 'Test Note');
             createSpyFetch();
             generateExpectedBody();
 
             await vm.insert();
 
-            expect(postMock).toHaveBeenCalledWith( vm.$props.url, expectedInsertBody );
+            expect(postMock).toHaveBeenCalledWith(vm.$props.url, expectedInsertBody);
             expect(spyFetch).toHaveBeenCalled();
         });
 
         it('should call axios.post and vnPaginateRef.fetch when newNote is valid', async () => {
-            generateWrapper({ text: "Test Note", observationType: 1, selectType: true });
+            generateWrapper({ selectType: true }, 'Test Note', 1);
             createSpyFetch();
             generateExpectedBody();
-            
+
             await vm.insert();
 
             expect(postMock).toHaveBeenCalledWith(vm.$props.url, expectedInsertBody);
@@ -109,7 +125,11 @@ describe('VnNotes', () => {
 
     describe('update', () => {
         it('should call axios.patch with saveUrl when saveUrl is set and justInput is true', async () => {
-            generateWrapper({ url: '/business', justInput: true, saveUrl: '/saveUrlTest' });
+            generateWrapper({
+                url: '/business',
+                justInput: true,
+                saveUrl: '/saveUrlTest',
+            });
             generateExpectedBody();
 
             await vm.update();
@@ -118,12 +138,19 @@ describe('VnNotes', () => {
         });
 
         it('should call axios.patch with url when saveUrl is not set and justInput is true', async () => {
-            generateWrapper({ url: '/business', body: { workerFk: 1110 }, justInput: true });
+            generateWrapper({
+                url: '/business',
+                body: { workerFk: 1110 },
+                justInput: true,
+            });
             generateExpectedBody();
 
             await vm.update();
 
-            expect(patchMock).toHaveBeenCalledWith(`${vm.$props.url}/${vm.$props.body.workerFk}`, expectedUpdateBody);
+            expect(patchMock).toHaveBeenCalledWith(
+                `${vm.$props.url}/${vm.$props.body.workerFk}`,
+                expectedUpdateBody,
+            );
         });
     });
-});
\ No newline at end of file
+});

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 12/19] 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">

From 5ec1d7d3112400df26df8ea6ab7b22ce96aebae5 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 24 Jan 2025 11:11:52 +0100
Subject: [PATCH 13/19] feat: refs #8304 workerCalendar remove extra VnNotes

---
 src/pages/Worker/Card/WorkerCalendar.vue | 42 ++++++++----------------
 1 file changed, 13 insertions(+), 29 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerCalendar.vue b/src/pages/Worker/Card/WorkerCalendar.vue
index 20071d779..42c1a0423 100644
--- a/src/pages/Worker/Card/WorkerCalendar.vue
+++ b/src/pages/Worker/Card/WorkerCalendar.vue
@@ -194,35 +194,19 @@ watch([year, businessFk], () => refreshData());
         </template>
     </RightMenu>
     <Teleport to="#st-data" v-if="stateStore.isSubToolbarShown()">
-        <div>
-            <VnNotes
-                :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"
-            />
-            <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"
-            />
-        </div>
+        <VnNotes
+            :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"
+        />
     </Teleport>
     <QPage class="column items-center">
         <QCard v-if="workerIsFreelance">

From 74eb2962856c63aa828ef637a115692f3271627b Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Fri, 24 Jan 2025 11:45:54 +0100
Subject: [PATCH 14/19] fix: refs #8304 update VnSubToolbar to correctly toggle
 full-width class based on actionsChildCount

---
 src/components/ui/VnSubToolbar.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/ui/VnSubToolbar.vue b/src/components/ui/VnSubToolbar.vue
index 6555e729a..6e52d2721 100644
--- a/src/components/ui/VnSubToolbar.vue
+++ b/src/components/ui/VnSubToolbar.vue
@@ -40,7 +40,8 @@ onBeforeUnmount(() => stateStore.toggleSubToolbar() && hasSubToolbar);
         class="full-width sticky"
     >
         <slot name="st-data">
-            <div id="st-data" :class="{ 'full-width': actionsChildCount }"></div>
+            <div id="st-data" :class="{ 'full-width': !actionsChildCount() }">
+            </div>
         </slot>
         <QSpace />
         <slot name="st-actions">

From 559bf0db026c365e7a9150af872ed19eb41b5182 Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Fri, 24 Jan 2025 11:56:42 +0100
Subject: [PATCH 15/19] refactor: refs #8304 restore correct classes on
 QToolbar and add null safety in actions.value check

---
 src/components/ui/VnSubToolbar.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/ui/VnSubToolbar.vue b/src/components/ui/VnSubToolbar.vue
index 6e52d2721..006acee59 100644
--- a/src/components/ui/VnSubToolbar.vue
+++ b/src/components/ui/VnSubToolbar.vue
@@ -27,7 +27,7 @@ onMounted(() => {
 });
 
 const actionsChildCount = () => {
-    return !!actions.value.childNodes.length;
+    return !!actions.value?.childNodes?.length;
 };
 
 onBeforeUnmount(() => stateStore.toggleSubToolbar() && hasSubToolbar);
@@ -37,7 +37,7 @@ onBeforeUnmount(() => stateStore.toggleSubToolbar() && hasSubToolbar);
     <QToolbar
         id="subToolbar"
         v-show="hasContent || $slots['st-actions'] || $slots['st-data']"
-        class="full-width sticky"
+        class="justify-end sticky"
     >
         <slot name="st-data">
             <div id="st-data" :class="{ 'full-width': !actionsChildCount() }">

From fceb5dd5fd98fe3c40606f49544435bd23660b7c Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Fri, 24 Jan 2025 14:38:37 +0100
Subject: [PATCH 16/19] refactor: refs #8304 improving attrs handling and
 simplify logic in VnNotes, VnSubToolbar, and WorkerCalendar

---
 src/components/ui/VnNotes.vue                 | 29 ++++++++++++++-----
 src/components/ui/VnSubToolbar.vue            |  4 +--
 src/pages/Customer/Card/CustomerNotes.vue     |  2 +-
 src/pages/Worker/Card/WorkerCalendar.vue      |  1 -
 .../Worker/Card/WorkerCalendarFilter.vue      |  2 +-
 5 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index 7a635104a..51f344af3 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -1,6 +1,6 @@
 <script setup>
 import axios from 'axios';
-import { ref, reactive } from 'vue';
+import { ref, reactive, useAttrs } from 'vue';
 import { onBeforeRouteLeave } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
@@ -18,6 +18,8 @@ import VnInput from 'components/common/VnInput.vue';
 
 const emit = defineEmits(['onFetch']);
 
+const $attrs = useAttrs();
+
 const $props = defineProps({
     url: { type: String, default: null },
     saveUrl: {type: String, default: null},
@@ -26,7 +28,6 @@ const $props = defineProps({
     addNote: { type: Boolean, default: false },
     selectType: { type: Boolean, default: false },
     justInput: { type: Boolean, default: false },
-    required: { type: Boolean, default: false },
 });
 
 const { t } = useI18n();
@@ -64,7 +65,7 @@ function confirmAndUpdate() {
                     message: t('Are you sure remove this note?'),
                 },
             })
-            .onOk(() => update())
+            .onOk(update)
             .onCancel(() => {
                 newNote.text = originalText;
             });
@@ -82,7 +83,7 @@ async function update() {
 }
 
 onBeforeRouteLeave((to, from, next) => {
-    if ((newNote.text && !$props.justInput) || (newNote.text !== originalText) && $props.justInput )
+    if ((newNote.text && !$props.justInput) || (newNote.text !== originalText) && $props.justInput)
         quasar.dialog({
             component: VnConfirm,
             componentProps: {
@@ -93,6 +94,13 @@ onBeforeRouteLeave((to, from, next) => {
         });
     else next();
 });
+
+function fetchData([ data ]) {
+    newNote.text = data?.notes;
+    originalText = data?.notes;
+    emit('onFetch', data);
+}
+
 </script>
 <template>
     <FetchData
@@ -106,13 +114,13 @@ onBeforeRouteLeave((to, from, next) => {
         v-if="justInput"
         :url="url"
         :filter="filter"
-        @on-fetch="(data) => (newNote.text = data[0]?.notes, originalText = data[0]?.notes, emit('onFetch', data))"
+        @on-fetch="fetchData"
         auto-load
     />
     <QCard 
         class="q-pa-xs q-mb-lg full-width" 
+        :class="{ 'just-input': $props.justInput }"
         v-if="$props.addNote || $props.justInput"
-        :style="$props.justInput ? 'padding-right: 18px; margin-bottom: 2px; box-shadow: none;' : ''"
     >
         <QCardSection horizontal v-if="!$props.justInput">
             {{ t('New note') }}
@@ -126,7 +134,7 @@ onBeforeRouteLeave((to, from, next) => {
                     v-model="newNote.observationTypeFk"
                     option-label="description"
                     style="flex: 0.15"
-                    :required="$props.required"
+                    :required="$attrs.required"
                     @keyup.enter.stop="insert"
                 />
                 <VnInput
@@ -137,7 +145,7 @@ onBeforeRouteLeave((to, from, next) => {
                     size="lg"
                     autogrow
                     @keyup.enter.stop="handleClick"
-                    :required="$props.required"
+                    :required="$attrs.required"
                     clearable
                 >
                     <template #append>
@@ -250,6 +258,11 @@ onBeforeRouteLeave((to, from, next) => {
         }
     }
 }
+.just-input {
+    padding-right: 18px;
+    margin-bottom: 2px;
+    box-shadow: none;
+}
 </style>
 <i18n>
     es:
diff --git a/src/components/ui/VnSubToolbar.vue b/src/components/ui/VnSubToolbar.vue
index 006acee59..b671f0ebc 100644
--- a/src/components/ui/VnSubToolbar.vue
+++ b/src/components/ui/VnSubToolbar.vue
@@ -26,9 +26,7 @@ onMounted(() => {
     if (data.value) observer.observe(data.value, opts);
 });
 
-const actionsChildCount = () => {
-    return !!actions.value?.childNodes?.length;
-};
+const actionsChildCount = computed(() => !!actions.value?.childNodes?.length);
 
 onBeforeUnmount(() => stateStore.toggleSubToolbar() && hasSubToolbar);
 </script>
diff --git a/src/pages/Customer/Card/CustomerNotes.vue b/src/pages/Customer/Card/CustomerNotes.vue
index f85634b2c..189b59904 100644
--- a/src/pages/Customer/Card/CustomerNotes.vue
+++ b/src/pages/Customer/Card/CustomerNotes.vue
@@ -23,6 +23,6 @@ const noteFilter = computed(() => {
         :body="{ clientFk: route.params.id }"
         style="overflow-y: auto"
         :select-type="true"
-        :required="true"
+        required
     />
 </template>
diff --git a/src/pages/Worker/Card/WorkerCalendar.vue b/src/pages/Worker/Card/WorkerCalendar.vue
index 42c1a0423..32026dffe 100644
--- a/src/pages/Worker/Card/WorkerCalendar.vue
+++ b/src/pages/Worker/Card/WorkerCalendar.vue
@@ -205,7 +205,6 @@ watch([year, businessFk], () => refreshData());
                 }
             "
             :body="body"
-            :required="false"
         />
     </Teleport>
     <QPage class="column items-center">
diff --git a/src/pages/Worker/Card/WorkerCalendarFilter.vue b/src/pages/Worker/Card/WorkerCalendarFilter.vue
index 4b3cfebfe..48fc4094b 100644
--- a/src/pages/Worker/Card/WorkerCalendarFilter.vue
+++ b/src/pages/Worker/Card/WorkerCalendarFilter.vue
@@ -221,7 +221,7 @@ const yearList = ref(generateYears());
             >
                 {{ type.name }}
             </WorkerEventLabel>
-    </QItem>
+        </QItem>
     </QList>
     <QSeparator />
     <QList dense class="list q-my-md no-pointer-events">

From fb902b54bcda91329780c56143c41e2317025ef0 Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Fri, 31 Jan 2025 09:29:20 +0100
Subject: [PATCH 17/19] refactor: refs #8304 simplify actionsChildCount
 computation and update saveUrl assignment in WorkerCalendar

---
 src/components/ui/VnSubToolbar.vue       | 3 +--
 src/pages/Worker/Card/WorkerCalendar.vue | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/components/ui/VnSubToolbar.vue b/src/components/ui/VnSubToolbar.vue
index b671f0ebc..8d4126d1d 100644
--- a/src/components/ui/VnSubToolbar.vue
+++ b/src/components/ui/VnSubToolbar.vue
@@ -1,7 +1,6 @@
 <script setup>
 import { onMounted, onBeforeUnmount, ref } from 'vue';
 import { useStateStore } from 'stores/useStateStore';
-import { computed } from 'vue';
 
 const stateStore = useStateStore();
 const actions = ref(null);
@@ -26,7 +25,7 @@ onMounted(() => {
     if (data.value) observer.observe(data.value, opts);
 });
 
-const actionsChildCount = computed(() => !!actions.value?.childNodes?.length);
+const actionsChildCount = () => !!actions.value?.childNodes?.length;
 
 onBeforeUnmount(() => stateStore.toggleSubToolbar() && hasSubToolbar);
 </script>
diff --git a/src/pages/Worker/Card/WorkerCalendar.vue b/src/pages/Worker/Card/WorkerCalendar.vue
index 32026dffe..ff0c1ec8b 100644
--- a/src/pages/Worker/Card/WorkerCalendar.vue
+++ b/src/pages/Worker/Card/WorkerCalendar.vue
@@ -201,7 +201,7 @@ watch([year, businessFk], () => refreshData());
             :save-url="saveUrl"
             @on-fetch="
                 (data) => {
-                    saveUrl = `Businesses/${data[0].id}`;
+                    saveUrl = `Businesses/${data.id}`;
                 }
             "
             :body="body"

From 45a77a86f1df864127d16d79281da82bd68d5b96 Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Fri, 31 Jan 2025 10:11:10 +0100
Subject: [PATCH 18/19] refactor: refs #8304 improve required attribute
 handling in VnNotes using computed property

---
 src/components/ui/VnNotes.vue | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index 51f344af3..5b1d6e726 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -1,6 +1,6 @@
 <script setup>
 import axios from 'axios';
-import { ref, reactive, useAttrs } from 'vue';
+import { ref, reactive, useAttrs, computed } from 'vue';
 import { onBeforeRouteLeave } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
@@ -20,6 +20,10 @@ const emit = defineEmits(['onFetch']);
 
 const $attrs = useAttrs();
 
+const isRequired = computed(() => {
+    return Object.keys($attrs).includes('required')
+});
+
 const $props = defineProps({
     url: { type: String, default: null },
     saveUrl: {type: String, default: null},
@@ -134,7 +138,7 @@ function fetchData([ data ]) {
                     v-model="newNote.observationTypeFk"
                     option-label="description"
                     style="flex: 0.15"
-                    :required="$attrs.required"
+                    :required="isRequired"
                     @keyup.enter.stop="insert"
                 />
                 <VnInput
@@ -145,7 +149,7 @@ function fetchData([ data ]) {
                     size="lg"
                     autogrow
                     @keyup.enter.stop="handleClick"
-                    :required="$attrs.required"
+                    :required="isRequired"
                     clearable
                 >
                     <template #append>

From ca01ceacdef91e18602cbee53cd06da744623054 Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Mon, 3 Feb 2025 14:29:44 +0100
Subject: [PATCH 19/19] fix: refs #8304 add visibility condition for notes in
 WorkerCalendar

---
 src/pages/Worker/Card/WorkerCalendar.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Worker/Card/WorkerCalendar.vue b/src/pages/Worker/Card/WorkerCalendar.vue
index ff0c1ec8b..df4616011 100644
--- a/src/pages/Worker/Card/WorkerCalendar.vue
+++ b/src/pages/Worker/Card/WorkerCalendar.vue
@@ -193,7 +193,7 @@ watch([year, businessFk], () => refreshData());
             />
         </template>
     </RightMenu>
-    <Teleport to="#st-data" v-if="stateStore.isSubToolbarShown()">
+    <Teleport to="#st-data" v-if="stateStore.isSubToolbarShown() && canSeeNotes">
         <VnNotes
             :just-input="true"
             :url="`Workers/${route.params.id}/business`"