From 1d92e8422758d655ad4bee5cfa81ea6a70cdf63b Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 7 Jan 2025 09:51:36 +0100
Subject: [PATCH 1/4] fix: claimList order

---
 src/pages/Claim/ClaimList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Claim/ClaimList.vue b/src/pages/Claim/ClaimList.vue
index 6b9fa77a0..9907cad9b 100644
--- a/src/pages/Claim/ClaimList.vue
+++ b/src/pages/Claim/ClaimList.vue
@@ -131,7 +131,7 @@ const STATE_COLOR = {
     <VnTable
         data-key="ClaimList"
         url="Claims/filter"
-        :order="['t.priority ASC', 'created ASC']"
+        :order="['cs.priority ASC', 'created ASC']"
         :columns="columns"
         redirect="claim"
         :right-search="false"

From 13d51bedc9c42fdbb61f8b38b4836d55d819eb2a Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 7 Jan 2025 10:00:29 +0100
Subject: [PATCH 2/4] fix: refs #7936 disable option caption in
 EditTableCellValueForm

---
 src/components/EditTableCellValueForm.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/EditTableCellValueForm.vue b/src/components/EditTableCellValueForm.vue
index 172866191..7d333ecb8 100644
--- a/src/components/EditTableCellValueForm.vue
+++ b/src/components/EditTableCellValueForm.vue
@@ -84,6 +84,7 @@ const closeForm = () => {
                     :options="fieldsOptions"
                     hide-selected
                     option-label="label"
+                    :option-caption="false"
                     v-model="selectedField"
                     data-cy="field-to-edit"
                 />

From 59c755329a07e9091eb7c71cb02642e4e16a410c Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 7 Jan 2025 10:29:37 +0100
Subject: [PATCH 3/4] fix: refs #7936 update VnSelect to conditionally render
 option caption

---
 src/components/EditTableCellValueForm.vue |  1 -
 src/components/common/VnSelect.vue        | 20 ++++++++++++++++----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/components/EditTableCellValueForm.vue b/src/components/EditTableCellValueForm.vue
index 7d333ecb8..172866191 100644
--- a/src/components/EditTableCellValueForm.vue
+++ b/src/components/EditTableCellValueForm.vue
@@ -84,7 +84,6 @@ const closeForm = () => {
                     :options="fieldsOptions"
                     hide-selected
                     option-label="label"
-                    :option-caption="false"
                     v-model="selectedField"
                     data-cy="field-to-edit"
                 />
diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index 58b7667d2..b78c99b8a 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -113,8 +113,15 @@ const $props = defineProps({
 });
 
 const mixinRules = [requiredFieldRule, ...($attrs.rules ?? [])];
-const { optionLabel, optionValue, optionFilter, optionFilterValue, options, modelValue } =
-    toRefs($props);
+const {
+    optionLabel,
+    optionValue,
+    optionCaption,
+    optionFilter,
+    optionFilterValue,
+    options,
+    modelValue,
+} = toRefs($props);
 const myOptions = ref([]);
 const myOptionsOriginal = ref([]);
 const vnSelectRef = ref();
@@ -321,6 +328,11 @@ function handleKeyDown(event) {
         }
     }
 }
+
+function getCaption(opt) {
+    if (optionCaption.value === false) return;
+    return opt[optionCaption.value] || opt[optionValue.value];
+}
 </script>
 
 <template>
@@ -391,8 +403,8 @@ function handleKeyDown(event) {
                     <QItemLabel>
                         {{ opt[optionLabel] }}
                     </QItemLabel>
-                    <QItemLabel caption v-if="optionCaption !== false">
-                        {{ `#${opt[optionCaption] || opt[optionValue]}` }}
+                    <QItemLabel caption v-if="getCaption(opt)">
+                        {{ `#${getCaption(opt)}` }}
                     </QItemLabel>
                 </QItemSection>
             </QItem>

From da0e31b97840fba379f7cfbe9fc09063afc3b16c Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 7 Jan 2025 11:17:56 +0100
Subject: [PATCH 4/4] fix: refs #7323 update getAbsences to handle multiple
 years for absence data

---
 src/pages/Worker/Card/WorkerTimeControl.vue | 27 +++++++++++++++++----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index c480d5bd8..8d54cb810 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@@ -208,13 +208,30 @@ const getWorkedHours = async (from, to) => {
 };
 
 const getAbsences = async () => {
-    const params = {
-        workerFk: route.params.id,
-        businessFk: null,
-        year: startOfWeek.value.getFullYear(),
+    const startYear = startOfWeek.value.getFullYear();
+    const endYear = endOfWeek.value.getFullYear();
+    const defaultParams = { workerFk: route.params.id, businessFk: null };
+
+    const startData = (
+        await axios.get('Calendars/absences', {
+            params: { ...defaultParams, year: startYear },
+        })
+    ).data;
+
+    let endData;
+    if (startYear !== endYear) {
+        endData = (
+            await axios.get('Calendars/absences', {
+                params: { ...defaultParams, year: endYear },
+            })
+        ).data;
+    }
+
+    const data = {
+        holidays: [...(startData?.holidays || []), ...(endData?.holidays || [])],
+        absences: [...(startData?.absences || []), ...(endData?.absences || [])],
     };
 
-    const { data } = await axios.get('Calendars/absences', { params });
     if (data) addEvents(data);
 };