From 4b9588c189544aee28e36f1fa66a23a7ed5ea27b Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 4 Oct 2024 08:55:48 +0200
Subject: [PATCH 1/7] refactor: refs #7825 modified worker list form to fill
 the field when a bank entity is created

---
 src/pages/Worker/WorkerList.vue | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index f4ae20591..4b7d028e7 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -93,6 +93,11 @@ onBeforeMount(async () => {
     ).data?.payMethodFk;
 });
 
+const handleNewBankEntity = (response, formData) => {
+    bankEntitiesOptions.value = [...bankEntitiesOptions.value, response];
+    formData.bankEntityFk = response.id;
+};
+
 function handleLocation(data, location) {
     const { town, code, provinceFk, countryFk } = location ?? {};
     data.postcode = code;
@@ -319,7 +324,10 @@ async function autofillBic(worker) {
                     >
                         <template #form>
                             <CreateBankEntityForm
-                                @on-data-saved="(data) => bankEntitiesOptions.push(data)"
+                                @on-data-saved="
+                                    (_, requestResponse) =>
+                                        handleNewBankEntity(requestResponse, data)
+                                "
                             />
                         </template>
                         <template #option="scope">

From 0d31adaa4b1cdd85ca24825969d3cc25a44884bc Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 4 Oct 2024 11:29:21 +0200
Subject: [PATCH 2/7] refs #7767 check holiday

---
 src/pages/Worker/Card/WorkerCalendarFilter.vue | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/pages/Worker/Card/WorkerCalendarFilter.vue b/src/pages/Worker/Card/WorkerCalendarFilter.vue
index 2b81b6eaf..95fb2d393 100644
--- a/src/pages/Worker/Card/WorkerCalendarFilter.vue
+++ b/src/pages/Worker/Card/WorkerCalendarFilter.vue
@@ -3,9 +3,11 @@ import WorkerEventLabel from 'pages/Worker/Card/WorkerEventLabel.vue';
 import FetchData from 'components/FetchData.vue';
 import { useI18n } from 'vue-i18n';
 import VnSelect from 'components/common/VnSelect.vue';
+import useNotify from 'src/composables/useNotify';
 import { useRoute } from 'vue-router';
-import { computed, ref } from 'vue';
+import { computed, onMounted, ref } from 'vue';
 import { toDateFormat } from '../../../filters/date';
+const { notify } = useNotify();
 
 const { t } = useI18n();
 const route = useRoute();
@@ -33,6 +35,9 @@ const props = defineProps({
     },
 });
 
+onMounted(async () => {
+    await checkHolidays(props.contractHolidays);
+});
 const emit = defineEmits(['update:businessFk', 'update:year', 'update:absenceType']);
 
 const selectedBusinessFk = computed({
@@ -60,6 +65,16 @@ const generateYears = () => {
     return Array.from({ length: 5 }, (_, i) => String(maxYear - i)) || [];
 };
 
+const checkHolidays = (contractHolidays) => {
+    console.log('contractHolidays', contractHolidays);
+    if (
+        contractHolidays.holidaysEnjoyed > contractHolidays.totalHolidays ||
+        contractHolidays.hoursEnjoyed > contractHolidays.totalHours
+    ) {
+        notify(t('Vacation days have been exceeded'), 'negative');
+    }
+};
+
 const absenceTypeList = ref([]);
 const contractList = ref([]);
 const yearList = ref(generateYears());

From b225f6a4c879cd1151aec64ed3bb0f48cedc2b73 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 14 Oct 2024 13:18:34 +0200
Subject: [PATCH 3/7] refs #7767 fix contractHolidays

---
 .../Worker/Card/WorkerCalendarFilter.vue      | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerCalendarFilter.vue b/src/pages/Worker/Card/WorkerCalendarFilter.vue
index 95fb2d393..cc99cde0e 100644
--- a/src/pages/Worker/Card/WorkerCalendarFilter.vue
+++ b/src/pages/Worker/Card/WorkerCalendarFilter.vue
@@ -5,7 +5,7 @@ import { useI18n } from 'vue-i18n';
 import VnSelect from 'components/common/VnSelect.vue';
 import useNotify from 'src/composables/useNotify';
 import { useRoute } from 'vue-router';
-import { computed, onMounted, ref } from 'vue';
+import { computed, onMounted, ref, watch } from 'vue';
 import { toDateFormat } from '../../../filters/date';
 const { notify } = useNotify();
 
@@ -35,9 +35,13 @@ const props = defineProps({
     },
 });
 
-onMounted(async () => {
-    await checkHolidays(props.contractHolidays);
-});
+watch(
+    () => props.contractHolidays,
+    (newValue) => {
+        checkHolidays(newValue);
+    },
+    { deep: true, immediate: true }
+);
 const emit = defineEmits(['update:businessFk', 'update:year', 'update:absenceType']);
 
 const selectedBusinessFk = computed({
@@ -58,22 +62,23 @@ const selectedAbsenceType = computed({
     },
 });
 
-const generateYears = () => {
+function generateYears() {
     const now = Date.vnNew();
     const maxYear = now.getFullYear() + 1;
 
     return Array.from({ length: 5 }, (_, i) => String(maxYear - i)) || [];
-};
+}
 
-const checkHolidays = (contractHolidays) => {
+function checkHolidays(contractHolidays) {
     console.log('contractHolidays', contractHolidays);
+    if (!contractHolidays) return;
     if (
         contractHolidays.holidaysEnjoyed > contractHolidays.totalHolidays ||
         contractHolidays.hoursEnjoyed > contractHolidays.totalHours
     ) {
         notify(t('Vacation days have been exceeded'), 'negative');
     }
-};
+}
 
 const absenceTypeList = ref([]);
 const contractList = ref([]);

From 8258fbb91ee478798dc56d3b126bb425620b61e1 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 14 Oct 2024 13:24:12 +0200
Subject: [PATCH 4/7] refs #7767 remove onMounted

---
 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 cc99cde0e..963fb05a7 100644
--- a/src/pages/Worker/Card/WorkerCalendarFilter.vue
+++ b/src/pages/Worker/Card/WorkerCalendarFilter.vue
@@ -5,7 +5,7 @@ import { useI18n } from 'vue-i18n';
 import VnSelect from 'components/common/VnSelect.vue';
 import useNotify from 'src/composables/useNotify';
 import { useRoute } from 'vue-router';
-import { computed, onMounted, ref, watch } from 'vue';
+import { computed, ref, watch } from 'vue';
 import { toDateFormat } from '../../../filters/date';
 const { notify } = useNotify();
 

From bc581caa4ebd0b5ab2c9c2fd9f3ded1ef4b1579a Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 15 Oct 2024 07:57:19 +0200
Subject: [PATCH 5/7] fix: refs #7767 console remove

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

diff --git a/src/pages/Worker/Card/WorkerCalendarFilter.vue b/src/pages/Worker/Card/WorkerCalendarFilter.vue
index 963fb05a7..67b7df907 100644
--- a/src/pages/Worker/Card/WorkerCalendarFilter.vue
+++ b/src/pages/Worker/Card/WorkerCalendarFilter.vue
@@ -70,7 +70,6 @@ function generateYears() {
 }
 
 function checkHolidays(contractHolidays) {
-    console.log('contractHolidays', contractHolidays);
     if (!contractHolidays) return;
     if (
         contractHolidays.holidaysEnjoyed > contractHolidays.totalHolidays ||

From 15f171da0fe58dd80b6945c8fc454d925b075bb3 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 15 Oct 2024 13:12:37 +0200
Subject: [PATCH 6/7] perf: refs #7825 create bank entity

---
 src/components/CreateBankEntityForm.vue |  4 ++--
 src/pages/Worker/WorkerList.vue         | 14 ++++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
index 0a3c10f57..a42be6ef8 100644
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@@ -31,8 +31,8 @@ const countriesFilter = {
 
 const countriesOptions = ref([]);
 
-const onDataSaved = (formData, requestResponse) => {
-    emit('onDataSaved', formData, requestResponse);
+const onDataSaved = (...args) => {
+    emit('onDataSaved', ...args);
 };
 
 onMounted(async () => {
diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index 4b7d028e7..99ea609a1 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -29,6 +29,7 @@ const postcodesOptions = ref([]);
 
 const user = useState().getUser();
 const defaultPayMethod = ref();
+const bankEntitiesRef = ref();
 const columns = computed(() => [
     {
         align: 'left',
@@ -93,10 +94,11 @@ onBeforeMount(async () => {
     ).data?.payMethodFk;
 });
 
-const handleNewBankEntity = (response, formData) => {
-    bankEntitiesOptions.value = [...bankEntitiesOptions.value, response];
-    formData.bankEntityFk = response.id;
-};
+async function handleNewBankEntity(data, resp) {
+    await bankEntitiesRef.value.fetch();
+    data.bankEntityFk = resp.id;
+    bankEntitiesOptions.value.push(resp);
+}
 
 function handleLocation(data, location) {
     const { town, code, provinceFk, countryFk } = location ?? {};
@@ -157,6 +159,7 @@ async function autofillBic(worker) {
         auto-load
     />
     <FetchData
+        ref="bankEntitiesRef"
         url="BankEntities"
         @on-fetch="(data) => (bankEntitiesOptions = data)"
         auto-load
@@ -325,8 +328,7 @@ async function autofillBic(worker) {
                         <template #form>
                             <CreateBankEntityForm
                                 @on-data-saved="
-                                    (_, requestResponse) =>
-                                        handleNewBankEntity(requestResponse, data)
+                                    (_, resp) => handleNewBankEntity(data, resp)
                                 "
                             />
                         </template>

From e0c294bce61f055809d52c89a92ad91d1ab4788b Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 16 Oct 2024 09:16:57 +0200
Subject: [PATCH 7/7] test(claimDevelopment): skip intermitent e2e

---
 test/cypress/integration/claim/claimDevelopment.spec.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/cypress/integration/claim/claimDevelopment.spec.js b/test/cypress/integration/claim/claimDevelopment.spec.js
index 81fc33ecd..eb39f340a 100755
--- a/test/cypress/integration/claim/claimDevelopment.spec.js
+++ b/test/cypress/integration/claim/claimDevelopment.spec.js
@@ -33,7 +33,8 @@ describe('ClaimDevelopment', () => {
         cy.saveCard();
     });
 
-    it('should add and remove new line', () => {
+    // TODO: #8112
+    xit('should add and remove new line', () => {
         cy.wait(['@workers', '@workers']);
         cy.addCard();