From ec1b3b79603523563139e95b54f4989522e37a45 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 6 Mar 2025 13:08:42 +0100
Subject: [PATCH 1/3] fix: refs #8709 workerCalendar

---
 src/pages/Worker/Card/WorkerCalendar.vue      |  3 +-
 .../Worker/Card/WorkerCalendarFilter.vue      | 35 +++++++++++++++++--
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerCalendar.vue b/src/pages/Worker/Card/WorkerCalendar.vue
index df4616011..ac7f06981 100644
--- a/src/pages/Worker/Card/WorkerCalendar.vue
+++ b/src/pages/Worker/Card/WorkerCalendar.vue
@@ -176,7 +176,8 @@ watch([year, businessFk], () => refreshData());
         auto-load
     />
     <FetchData
-        :url="`Workers/${route.params.id}`"
+        url="Workers/summary"
+        :filter="{ fields: ['id', 'isFreelance'], where: { id: route.params.id } }"
         @on-fetch="(data) => (workerIsFreelance = data.isFreelance)"
         ref="WorkerFreelanceRef"
         auto-load
diff --git a/src/pages/Worker/Card/WorkerCalendarFilter.vue b/src/pages/Worker/Card/WorkerCalendarFilter.vue
index 48fc4094b..f4aac9c15 100644
--- a/src/pages/Worker/Card/WorkerCalendarFilter.vue
+++ b/src/pages/Worker/Card/WorkerCalendarFilter.vue
@@ -7,10 +7,13 @@ import useNotify from 'src/composables/useNotify';
 import { useRoute } from 'vue-router';
 import { computed, ref, watch } from 'vue';
 import { toDateFormat } from '../../../filters/date';
+import VnInput from 'src/components/common/VnInput.vue';
+import FormModelPopup from 'components/FormModelPopup.vue';
 const { notify } = useNotify();
 
 const { t } = useI18n();
 const route = useRoute();
+const holidayDialogRef = ref(false);
 
 const props = defineProps({
     businessFk: {
@@ -40,8 +43,11 @@ watch(
     (newValue) => {
         checkHolidays(newValue);
     },
-    { deep: true, immediate: true }
+    { deep: true, immediate: true },
 );
+function openDialog() {
+    holidayDialogRef.value = true;
+}
 const emit = defineEmits(['update:businessFk', 'update:year', 'update:absenceType']);
 
 const selectedBusinessFk = computed({
@@ -83,7 +89,6 @@ const absenceTypeList = ref([]);
 const contractList = ref([]);
 const yearList = ref(generateYears());
 </script>
-
 <template>
     <FetchData
         url="AbsenceTypes"
@@ -96,7 +101,23 @@ const yearList = ref(generateYears());
         @on-fetch="(data) => (contractList = data)"
         auto-load
     />
-
+    <QDialog v-model="holidayDialogRef" :maximized="true" :class="['vn-row', 'wrap']">
+        <FormModelPopup
+            :url-update="`Holidays/${route.params.id}/updatePayedHolidays`"
+            model="travel"
+            :title="t('paidHolidays')"
+            :form-initial-data="{ id: route.params.id }"
+            @on-data-saved="fetchDataRef.fetch()"
+        >
+            <template #form-inputs="{ data }">
+                <VnInput
+                    v-model="contractHolidays.payedHolidays"
+                    :label="t('paidHolidays')"
+                    type="number"
+                />
+            </template>
+        </FormModelPopup>
+    </QDialog>
     <div
         v-if="contractHolidays"
         class="q-pa-md q-mb-md q-ma-md color-vn-text"
@@ -134,6 +155,14 @@ const yearList = ref(generateYears());
                         payedHolidays: contractHolidays.payedHolidays || 0,
                     })
                 }}
+                <QBtn
+                    style="max-width: 20%"
+                    flat
+                    icon="edit"
+                    @click="openDialog()"
+                    :title="t('paidHolidays')"
+                    color="primary"
+                />
             </span>
         </QCardSection>
     </div>
-- 
2.40.1


From fa9aa351935b731231cd50aa5b386ae0704707e5 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 13 Mar 2025 10:31:21 +0100
Subject: [PATCH 2/3] fix: refs #8709 business

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

diff --git a/src/pages/Worker/Card/WorkerCalendarFilter.vue b/src/pages/Worker/Card/WorkerCalendarFilter.vue
index f4aac9c15..b301d851f 100644
--- a/src/pages/Worker/Card/WorkerCalendarFilter.vue
+++ b/src/pages/Worker/Card/WorkerCalendarFilter.vue
@@ -103,7 +103,7 @@ const yearList = ref(generateYears());
     />
     <QDialog v-model="holidayDialogRef" :maximized="true" :class="['vn-row', 'wrap']">
         <FormModelPopup
-            :url-update="`Holidays/${route.params.id}/updatePayedHolidays`"
+            :url-update="`Business/${route.params.id}`"
             model="travel"
             :title="t('paidHolidays')"
             :form-initial-data="{ id: route.params.id }"
-- 
2.40.1


From bd54f5448348246cacb6df70d463334532c001b7 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 17 Mar 2025 15:09:50 +0100
Subject: [PATCH 3/3] fix: refs #8709 workerCalendar

---
 .../Worker/Card/WorkerCalendarFilter.vue      | 45 +++++++++++++++----
 1 file changed, 36 insertions(+), 9 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerCalendarFilter.vue b/src/pages/Worker/Card/WorkerCalendarFilter.vue
index b301d851f..e37b42e63 100644
--- a/src/pages/Worker/Card/WorkerCalendarFilter.vue
+++ b/src/pages/Worker/Card/WorkerCalendarFilter.vue
@@ -9,6 +9,29 @@ import { computed, ref, watch } from 'vue';
 import { toDateFormat } from '../../../filters/date';
 import VnInput from 'src/components/common/VnInput.vue';
 import FormModelPopup from 'components/FormModelPopup.vue';
+import axios from 'axios';
+
+const newPayedHolidays = ref(0);
+
+function openDialog() {
+    holidayDialogRef.value = true;
+}
+
+async function updatePayedHolidays() {
+    try {
+        await axios.patch(`/api/business/${selectedBusinessFk.value}`, {
+            payedHolidays: newPayedHolidays.value,
+        });
+
+        notify(t('Paid holidays updated successfully'), 'positive');
+        holidayDialogRef.value = false;
+        emit('refreshData'); // Si necesitas actualizar la vista
+    } catch (error) {
+        notify(t('Error updating paid holidays'), 'negative');
+        console.error('Update Error:', error);
+    }
+}
+
 const { notify } = useNotify();
 
 const { t } = useI18n();
@@ -45,9 +68,7 @@ watch(
     },
     { deep: true, immediate: true },
 );
-function openDialog() {
-    holidayDialogRef.value = true;
-}
+
 const emit = defineEmits(['update:businessFk', 'update:year', 'update:absenceType']);
 
 const selectedBusinessFk = computed({
@@ -74,7 +95,9 @@ function generateYears() {
 
     return Array.from({ length: 5 }, (_, i) => String(maxYear - i)) || [];
 }
-
+const onDataSaved = (formData, requestResponse) => {
+    emit('onDataSaved', formData, requestResponse);
+};
 function checkHolidays(contractHolidays) {
     if (!contractHolidays) return;
     if (
@@ -103,15 +126,19 @@ const yearList = ref(generateYears());
     />
     <QDialog v-model="holidayDialogRef" :maximized="true" :class="['vn-row', 'wrap']">
         <FormModelPopup
-            :url-update="`Business/${route.params.id}`"
-            model="travel"
+            :url-update="`Business/${props.businessFk}`"
+            model="Business"
             :title="t('paidHolidays')"
-            :form-initial-data="{ id: route.params.id }"
-            @on-data-saved="fetchDataRef.fetch()"
+            :form-initial-data="{
+                id: props.businessFk,
+                payedHolidays: contractHolidays.payedHolidays,
+            }"
+            @on-data-saved="onDataSaved"
         >
             <template #form-inputs="{ data }">
+                {{ data }}
                 <VnInput
-                    v-model="contractHolidays.payedHolidays"
+                    v-model="data.payedHolidays"
                     :label="t('paidHolidays')"
                     type="number"
                 />
-- 
2.40.1