From 1ff15da8ca4ec1b5e39b2fb1c6cabe016d8eac5f Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 16 Sep 2024 16:33:09 +0200
Subject: [PATCH 1/9] fix: refs #7323 workerList

---
 src/i18n/locale/en.yml            |  5 +++
 src/i18n/locale/es.yml            |  5 +++
 src/pages/Worker/WorkerFilter.vue | 30 ++++++++++-------
 src/pages/Worker/WorkerList.vue   | 53 ++++++++++++++++++++++++++++---
 src/pages/Worker/locale/en.yml    |  5 +++
 src/pages/Worker/locale/es.yml    |  5 +++
 6 files changed, 86 insertions(+), 17 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index f99244d42..3b1cb20fa 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -286,6 +286,7 @@ globals:
     myAccount: My account
     noOne: No one
     params:
+        id: ID
         clientFk: Client id
         salesPersonFk: Sales person
         warehouseFk: Warehouse
@@ -293,6 +294,10 @@ globals:
         from: From
         To: To
         stateFk: State
+        departmentFk: Department
+        email: Email
+        SSN: SSN
+        fi: FI
 errors:
     statusUnauthorized: Access denied
     statusInternalServerError: An internal server error has ocurred
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 360627fda..31010dfb0 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -290,6 +290,7 @@ globals:
     myAccount: Mi cuenta
     noOne: Nadie
     params:
+        id: Id
         clientFk: Id cliente
         salesPersonFk: Comercial
         warehouseFk: Almacén
@@ -297,6 +298,10 @@ globals:
         from: Desde
         To: Hasta
         stateFk: Estado
+        departmentFk: Departamento
+        email: Correo
+        SSN: NSS
+        fi: NIF
 errors:
     statusUnauthorized: Acceso denegado
     statusInternalServerError: Ha ocurrido un error interno del servidor
diff --git a/src/pages/Worker/WorkerFilter.vue b/src/pages/Worker/WorkerFilter.vue
index 765241341..61120f448 100644
--- a/src/pages/Worker/WorkerFilter.vue
+++ b/src/pages/Worker/WorkerFilter.vue
@@ -7,7 +7,7 @@ import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 
-const { t } = useI18n();
+const { t, te } = useI18n();
 const props = defineProps({
     dataKey: {
         type: String,
@@ -16,6 +16,11 @@ const props = defineProps({
 });
 
 const departments = ref();
+
+const getLocale = (label) => {
+    const globalLocale = `globals.params.${label}`;
+    return te(globalLocale) ? t(globalLocale) : t(`params.${label}`);
+};
 </script>
 
 <template>
@@ -23,7 +28,7 @@ const departments = ref();
     <VnFilterPanel :data-key="props.dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
-                <strong>{{ t(`params.${tag.label}`) }}: </strong>
+                <strong>{{ getLocale(tag.label) }}: </strong>
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
@@ -64,10 +69,7 @@ const departments = ref();
                 </QItemSection>
             </QItem>
             <QItem>
-                <QItemSection v-if="!departments">
-                    <QSkeleton type="QInput" class="full-width" />
-                </QItemSection>
-                <QItemSection v-if="departments">
+                <QItemSection>
                     <VnSelect
                         :label="t('Department')"
                         v-model="params.departmentFk"
@@ -82,6 +84,16 @@ const departments = ref();
                     />
                 </QItemSection>
             </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput :label="t('SSN')" v-model="params.SSN" is-outlined />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput :label="t('Email')" v-model="params.email" is-outlined />
+                </QItemSection>
+            </QItem>
             <QItem>
                 <QItemSection>
                     <VnInput
@@ -99,23 +111,17 @@ const departments = ref();
 en:
     params:
         search: Contains
-        fi: FI
         firstName: First name
         lastName: Last name
         userName: User
         extension: Extension
-        departmentFk: Department
-        id: ID
 es:
     params:
         search: Contiene
-        fi: NIF
         firstName: Nombre
         lastName: Apellidos
         userName: Usuario
         extension: Extensión
-        departmentFk: Departamento
-        id: ID
     FI: NIF
     First Name: Nombre
     Last Name: Apellidos
diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index b8ef3f9d8..9b6bb8b69 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -39,13 +39,31 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'nickname',
+        name: 'firstName',
         label: t('tableColumns.name'),
         isTitle: true,
         columnFilter: {
             name: 'firstName',
         },
     },
+    {
+        align: 'left',
+        name: 'lastName',
+        label: t('tableColumns.lastName'),
+        isTitle: true,
+        columnFilter: {
+            name: 'lastName',
+        },
+    },
+    {
+        align: 'left',
+        name: 'nickname',
+        label: t('tableColumns.userName'),
+        isTitle: true,
+        columnFilter: {
+            name: 'userName',
+        },
+    },
     {
         align: 'left',
         name: 'departmentFk',
@@ -60,16 +78,41 @@ const columns = computed(() => [
         },
         format: (row, dashIfEmpty) => dashIfEmpty(row.department),
     },
+    {
+        align: 'left',
+        name: 'fi',
+        label: t('tableColumns.fi'),
+        isTitle: true,
+        columnFilter: {
+            name: 'fi',
+        },
+    },
+    {
+        align: 'left',
+        name: 'SSN',
+        label: t('tableColumns.SSN'),
+        isTitle: true,
+        columnFilter: {
+            name: 'SSN',
+        },
+    },
     {
         align: 'left',
         name: 'email',
         label: t('tableColumns.email'),
         cardVisible: true,
         columnFilter: {
-            alias: 'mu',
-            inWhere: true,
+            name: 'email',
+        },
+    },
+    {
+        align: 'left',
+        name: 'extension',
+        label: t('tableColumns.extension'),
+        cardVisible: true,
+        columnFilter: {
+            name: 'extension',
         },
-        hidden: true,
     },
     {
         align: 'right',
@@ -180,7 +223,7 @@ async function autofillBic(worker) {
         default-mode="table"
         redirect="worker"
         :right-search="false"
-        auto-load
+        :order="['id DESC']"
     >
         <template #more-create-dialog="{ data }">
             <div class="q-pa-lg full-width">
diff --git a/src/pages/Worker/locale/en.yml b/src/pages/Worker/locale/en.yml
index 96df37919..7081e8fd0 100644
--- a/src/pages/Worker/locale/en.yml
+++ b/src/pages/Worker/locale/en.yml
@@ -2,5 +2,10 @@ passwordRequirements: 'The password must have at least { length } length charact
 tableColumns:
     id: ID
     name: Name
+    lastName: Last Name
+    userName: User Name
     department: Department
     email: Email
+    fi: FI
+    SSN: SSN
+    extension: Extension
diff --git a/src/pages/Worker/locale/es.yml b/src/pages/Worker/locale/es.yml
index 41812345f..61694dc83 100644
--- a/src/pages/Worker/locale/es.yml
+++ b/src/pages/Worker/locale/es.yml
@@ -7,5 +7,10 @@ passwordRequirements: 'La contraseña debe tener al menos { length } caracteres
 tableColumns:
     id: ID
     name: Nombre
+    lastName: Apellidos
+    userName: Nombre de usuario
     department: Departamento
     email: Email
+    fi: NIF
+    SSN: NSS
+    extension: Extensión

From da7d0326c091b4111296cbd9930a4cd2317a5957 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 16 Sep 2024 17:12:48 +0200
Subject: [PATCH 2/9] fix: refs #7323 workerBalance & arrayData setUserParams

---
 src/components/VnTable/VnTable.vue | 2 +-
 src/composables/useArrayData.js    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index d6008de0b..d71c85338 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -646,7 +646,7 @@ function handleOnDataSaved(_) {
             icon="add"
             shortcut="+"
         />
-        <QTooltip>
+        <QTooltip self="top right">
             {{ createForm?.title }}
         </QTooltip>
     </QPageSticky>
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 651bcefb0..90cf45268 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -113,7 +113,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
             for (const row of response.data) store.data.push(row);
         } else {
             store.data = response.data;
-            if (!document.querySelectorAll('[role="dialog"]').length)
+            if (!document.querySelectorAll('[role="dialog"][aria-modal="true"]').length)
                 updateRouter && updateStateParams();
         }
 

From 41c43fde76c35cf4766b4900e73418f9e5ff6fcc Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 17 Sep 2024 16:08:48 +0200
Subject: [PATCH 3/9] feat: refs #7323 hide log section

---
 src/router/modules/worker.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/router/modules/worker.js b/src/router/modules/worker.js
index b2716474b..7258881be 100644
--- a/src/router/modules/worker.js
+++ b/src/router/modules/worker.js
@@ -168,6 +168,7 @@ export default {
                     meta: {
                         title: 'log',
                         icon: 'vn:History',
+                        acls: [{ model: 'WorkerLog', props: 'find', accessType: 'READ' }],
                     },
                     component: () => import('src/pages/Worker/Card/WorkerLog.vue'),
                 },

From 7bbad14f53c74f7ae64b4f610aa7d24eb89da095 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 23 Sep 2024 11:38:27 +0200
Subject: [PATCH 4/9] feat: refs #7323 delete btn

---
 src/components/VnTable/VnTable.vue        |  2 ++
 src/pages/Worker/Card/WorkerBalance.vue   | 22 +++++++++++++++++-----
 src/pages/Worker/Card/WorkerFormation.vue | 20 ++++++++++++++++++++
 src/pages/Worker/Card/WorkerMedical.vue   | 13 +++++++++++++
 4 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index d87c08395..4aa49ce38 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -472,6 +472,7 @@ function handleOnDataSaved(_) {
                         auto-width
                         class="no-margin q-px-xs"
                         :class="[getColAlign(col), col.columnClass]"
+                        :style="col.style"
                         v-if="col.visible ?? true"
                         @click.ctrl="
                             ($event) =>
@@ -500,6 +501,7 @@ function handleOnDataSaved(_) {
                         :class="getColAlign(col)"
                         class="sticky no-padding"
                         @click="stopEventPropagation($event)"
+                        :style="col.style"
                     >
                         <QBtn
                             v-for="(btn, index) of col.actions"
diff --git a/src/pages/Worker/Card/WorkerBalance.vue b/src/pages/Worker/Card/WorkerBalance.vue
index 037a65eaf..88fc7c1df 100644
--- a/src/pages/Worker/Card/WorkerBalance.vue
+++ b/src/pages/Worker/Card/WorkerBalance.vue
@@ -57,9 +57,21 @@ const columns = computed(() => [
         field: 'concept',
         cardVisible: true,
     },
+    {
+        align: 'right',
+        name: 'tableActions',
+        style: 'max-width: 20px; text-align: initial;',
+        actions: [
+            {
+                title: t('delete'),
+                icon: 'delete',
+                action: async (row) => await tableRef.value.CrudModelRef.remove([row]),
+                isPrimary: true,
+            },
+        ],
+    },
 ]);
 </script>
-
 <template>
     <VnTable
         ref="tableRef"
@@ -69,8 +81,8 @@ const columns = computed(() => [
         save-url="WorkerIncomes/crud"
         :create="{
             urlCreate: 'workerIncomes',
-            title: t('Create workerBalance'),
-            onDataSaved: () => tableRef.reload(),
+            title: t('Create balance'),
+            onDataSaved: () => $refs.tableRef.reload(),
             formInitialData: {
                 workerFk: entityId,
             },
@@ -81,10 +93,10 @@ const columns = computed(() => [
         :right-search="false"
         :is-editable="true"
         :use-model="true"
+        :default-remove="false"
     />
 </template>
-
 <i18n>
     es:
-        Create workerBalance: Crear balance
+        Create balance: Crear balance
 </i18n>
diff --git a/src/pages/Worker/Card/WorkerFormation.vue b/src/pages/Worker/Card/WorkerFormation.vue
index 71c5cba5d..c11dd019e 100644
--- a/src/pages/Worker/Card/WorkerFormation.vue
+++ b/src/pages/Worker/Card/WorkerFormation.vue
@@ -96,10 +96,23 @@ const columns = computed(() => [
         label: t('worker.formation.tableVisibleColumns.hasDiploma'),
         create: true,
     },
+    {
+        align: 'right',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('delete'),
+                icon: 'delete',
+                action: async (row) => await tableRef.value.CrudModelRef.remove([row]),
+                isPrimary: true,
+            },
+        ],
+    },
 ]);
 </script>
 <template>
     <VnTable
+        class="worker-formation"
         ref="tableRef"
         data-key="WorkerFormation"
         :url="`Workers/${entityId}/trainingCourse`"
@@ -120,8 +133,15 @@ const columns = computed(() => [
         :right-search="false"
         :is-editable="true"
         :use-model="true"
+        :default-remove="false"
     />
 </template>
+<style lang="scss" scoped>
+:global(.worker-formation thead > tr > th:nth-child(7)),
+:global(.worker-formation thead > tr > th:nth-child(8)) {
+    max-width: 50px;
+}
+</style>
 <i18n>
 es:
     Create training course: Crear curso de formación
diff --git a/src/pages/Worker/Card/WorkerMedical.vue b/src/pages/Worker/Card/WorkerMedical.vue
index 6bca4ae85..fab1416c9 100644
--- a/src/pages/Worker/Card/WorkerMedical.vue
+++ b/src/pages/Worker/Card/WorkerMedical.vue
@@ -65,6 +65,18 @@ const columns = [
         create: true,
         component: 'input',
     },
+    {
+        align: 'right',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('delete'),
+                icon: 'delete',
+                action: async (row) => await tableRef.value.CrudModelRef.remove([row]),
+                isPrimary: true,
+            },
+        ],
+    },
 ];
 </script>
 <template>
@@ -87,5 +99,6 @@ const columns = [
         :right-search="false"
         :is-editable="true"
         :use-model="true"
+        :default-remove="false"
     />
 </template>

From f809e0fb317de0c4762cb684bc3bb58f870d8958 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 23 Sep 2024 12:55:39 +0200
Subject: [PATCH 5/9] fix: refs #7323 show prev month week color

---
 src/pages/Worker/Card/WorkerTimeControl.vue | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index fbfd4b28d..c6ca9d74a 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@@ -326,16 +326,21 @@ const updateData = async () => {
 };
 
 const getMailStates = async (date) => {
+    const url = `WorkerTimeControls/${route.params.id}/getMailStates`;
+    const month = date.getMonth() + 1;
+    const prevMonth = month == 1 ? 12 : month - 1;
+    let prevMonthStates = [];
+
     const params = {
-        month: date.getMonth() + 1,
+        month,
         year: date.getFullYear(),
     };
 
-    const { data } = await axios.get(
-        `WorkerTimeControls/${route.params.id}/getMailStates`,
-        { params }
-    );
-    workerTimeControlMails.value = data;
+    const curMonthStates = (await axios.get(url, { params })).data;
+    prevMonthStates = (await axios.get(url, { params: { ...params, month: prevMonth } }))
+        .data;
+
+    workerTimeControlMails.value = curMonthStates.concat(prevMonthStates);
 };
 
 const showWorkerTimeForm = (propValue, formType) => {

From e827d3aabfb3b03b39e01593bb2af12b4f443016 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 26 Sep 2024 09:47:54 +0200
Subject: [PATCH 6/9] fix: refs #7323 rollback

---
 src/pages/Worker/WorkerFilter.vue |  5 -----
 src/pages/Worker/WorkerList.vue   | 20 +-------------------
 src/pages/Worker/locale/en.yml    |  2 +-
 src/pages/Worker/locale/es.yml    |  2 +-
 4 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/src/pages/Worker/WorkerFilter.vue b/src/pages/Worker/WorkerFilter.vue
index 61120f448..dfb5659fe 100644
--- a/src/pages/Worker/WorkerFilter.vue
+++ b/src/pages/Worker/WorkerFilter.vue
@@ -84,11 +84,6 @@ const getLocale = (label) => {
                     />
                 </QItemSection>
             </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnInput :label="t('SSN')" v-model="params.SSN" is-outlined />
-                </QItemSection>
-            </QItem>
             <QItem>
                 <QItemSection>
                     <VnInput :label="t('Email')" v-model="params.email" is-outlined />
diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index a5281b651..3ca0d0c24 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -40,7 +40,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'firstName',
-        label: t('tableColumns.name'),
+        label: t('tableColumns.firstName'),
         isTitle: true,
         columnFilter: {
             name: 'firstName',
@@ -78,24 +78,6 @@ const columns = computed(() => [
         },
         format: (row, dashIfEmpty) => dashIfEmpty(row.department),
     },
-    {
-        align: 'left',
-        name: 'fi',
-        label: t('tableColumns.fi'),
-        isTitle: true,
-        columnFilter: {
-            name: 'fi',
-        },
-    },
-    {
-        align: 'left',
-        name: 'SSN',
-        label: t('tableColumns.SSN'),
-        isTitle: true,
-        columnFilter: {
-            name: 'SSN',
-        },
-    },
     {
         align: 'left',
         name: 'email',
diff --git a/src/pages/Worker/locale/en.yml b/src/pages/Worker/locale/en.yml
index 7081e8fd0..865e86e7e 100644
--- a/src/pages/Worker/locale/en.yml
+++ b/src/pages/Worker/locale/en.yml
@@ -1,7 +1,7 @@
 passwordRequirements: 'The password must have at least { length } length characters, {nAlpha} alphabetic characters, {nUpper} capital letters, {nDigits} digits and {nPunct} symbols (Ex: $%&.)\n'
 tableColumns:
     id: ID
-    name: Name
+    firstName: First name
     lastName: Last Name
     userName: User Name
     department: Department
diff --git a/src/pages/Worker/locale/es.yml b/src/pages/Worker/locale/es.yml
index 61694dc83..b3c093ec5 100644
--- a/src/pages/Worker/locale/es.yml
+++ b/src/pages/Worker/locale/es.yml
@@ -6,7 +6,7 @@ External: Externo
 passwordRequirements: 'La contraseña debe tener al menos { length } caracteres de longitud, {nAlpha} caracteres alfabéticos, {nUpper} letras mayúsculas, {nDigits} dígitos y {nPunct} símbolos (Ej: $%&.)'
 tableColumns:
     id: ID
-    name: Nombre
+    firstName: Nombre
     lastName: Apellidos
     userName: Nombre de usuario
     department: Departamento

From c2b52473a12da9e856a3baa1889ba6702286c8fe Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 26 Sep 2024 10:04:16 +0200
Subject: [PATCH 7/9] fix: refs #7323 align tables

---
 src/pages/Monitor/MonitorOrders.vue | 56 +++++++++++++++--------------
 1 file changed, 29 insertions(+), 27 deletions(-)

diff --git a/src/pages/Monitor/MonitorOrders.vue b/src/pages/Monitor/MonitorOrders.vue
index 52d442d0a..853a6edc9 100644
--- a/src/pages/Monitor/MonitorOrders.vue
+++ b/src/pages/Monitor/MonitorOrders.vue
@@ -139,33 +139,35 @@ const openTab = (id) =>
         :disable-option="{ card: true }"
     >
         <template #top-left>
-            <QBtn
-                icon="refresh"
-                size="md"
-                color="primary"
-                dense
-                flat
-                @click="$refs.table.reload()"
-            >
-                <QTooltip>{{ $t('globals.refresh') }}</QTooltip>
-            </QBtn>
-            <QBtn
-                v-if="selectedRows.length"
-                icon="delete"
-                size="md"
-                dense
-                flat
-                color="primary"
-                @click="
-                    openConfirmationModal(
-                        $t('salesOrdersTable.deleteConfirmTitle'),
-                        $t('salesOrdersTable.deleteConfirmMessage'),
-                        removeOrders
-                    )
-                "
-            >
-                <QTooltip>{{ t('salesOrdersTable.delete') }}</QTooltip>
-            </QBtn>
+            <div class="q-mt-sm">
+                <QBtn
+                    icon="refresh"
+                    size="md"
+                    color="primary"
+                    dense
+                    flat
+                    @click="$refs.table.reload()"
+                >
+                    <QTooltip>{{ $t('globals.refresh') }}</QTooltip>
+                </QBtn>
+                <QBtn
+                    v-if="selectedRows.length"
+                    icon="delete"
+                    size="md"
+                    dense
+                    flat
+                    color="primary"
+                    @click="
+                        openConfirmationModal(
+                            $t('salesOrdersTable.deleteConfirmTitle'),
+                            $t('salesOrdersTable.deleteConfirmMessage'),
+                            removeOrders
+                        )
+                    "
+                >
+                    <QTooltip>{{ t('salesOrdersTable.delete') }}</QTooltip>
+                </QBtn>
+            </div>
         </template>
         <template #column-dateSend="{ row }">
             <QTd>

From 18ea23adf16afa52668a4d0750a0024bbe6f0b42 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 26 Sep 2024 15:03:22 +0200
Subject: [PATCH 8/9] refactor: refs #7323 pr request

---
 src/i18n/locale/en.yml                      | 1 +
 src/i18n/locale/es.yml                      | 2 ++
 src/pages/Monitor/MonitorOrders.vue         | 2 +-
 src/pages/Monitor/locale/en.yml             | 1 -
 src/pages/Monitor/locale/es.yml             | 1 -
 src/pages/Worker/Card/WorkerBalance.vue     | 2 +-
 src/pages/Worker/Card/WorkerTimeControl.vue | 7 +++----
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 05ce8dcdf..6134f8c9e 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -303,6 +303,7 @@ globals:
         email: Email
         SSN: SSN
         fi: FI
+    deleteConfirmTitle: Delete selected elements
 errors:
     statusUnauthorized: Access denied
     statusInternalServerError: An internal server error has ocurred
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 7e299f70a..db9e3b578 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -307,6 +307,8 @@ globals:
         email: Correo
         SSN: NSS
         fi: NIF
+    deleteConfirmTitle: Eliminar los elementos seleccionados
+
 errors:
     statusUnauthorized: Acceso denegado
     statusInternalServerError: Ha ocurrido un error interno del servidor
diff --git a/src/pages/Monitor/MonitorOrders.vue b/src/pages/Monitor/MonitorOrders.vue
index 853a6edc9..fac601735 100644
--- a/src/pages/Monitor/MonitorOrders.vue
+++ b/src/pages/Monitor/MonitorOrders.vue
@@ -159,7 +159,7 @@ const openTab = (id) =>
                     color="primary"
                     @click="
                         openConfirmationModal(
-                            $t('salesOrdersTable.deleteConfirmTitle'),
+                            $t('globals.deleteConfirmTitle'),
                             $t('salesOrdersTable.deleteConfirmMessage'),
                             removeOrders
                         )
diff --git a/src/pages/Monitor/locale/en.yml b/src/pages/Monitor/locale/en.yml
index 4cdd245aa..b8082f02a 100644
--- a/src/pages/Monitor/locale/en.yml
+++ b/src/pages/Monitor/locale/en.yml
@@ -15,7 +15,6 @@ salesOrdersTable:
     dateMake: Make date
     client: Client
     salesPerson: Salesperson
-    deleteConfirmTitle: Delete selected elements
     deleteConfirmMessage: All the selected elements will be deleted. Are you sure you want to continue?
     agency: Agency
     import: Import
diff --git a/src/pages/Monitor/locale/es.yml b/src/pages/Monitor/locale/es.yml
index 8087bb444..4ee5b90a9 100644
--- a/src/pages/Monitor/locale/es.yml
+++ b/src/pages/Monitor/locale/es.yml
@@ -15,7 +15,6 @@ salesOrdersTable:
     dateMake: Fecha de realización
     client: Cliente
     salesPerson: Comercial
-    deleteConfirmTitle: Eliminar los elementos seleccionados
     deleteConfirmMessage: Todos los elementos seleccionados serán eliminados. ¿Seguro que quieres continuar?
     agency: Agencia
     import: Importe
diff --git a/src/pages/Worker/Card/WorkerBalance.vue b/src/pages/Worker/Card/WorkerBalance.vue
index 88fc7c1df..c5367a281 100644
--- a/src/pages/Worker/Card/WorkerBalance.vue
+++ b/src/pages/Worker/Card/WorkerBalance.vue
@@ -82,7 +82,7 @@ const columns = computed(() => [
         :create="{
             urlCreate: 'workerIncomes',
             title: t('Create balance'),
-            onDataSaved: () => $refs.tableRef.reload(),
+            onDataSaved: () => tableRef.reload(),
             formInitialData: {
                 workerFk: entityId,
             },
diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index c6ca9d74a..39fb536b6 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@@ -329,16 +329,15 @@ const getMailStates = async (date) => {
     const url = `WorkerTimeControls/${route.params.id}/getMailStates`;
     const month = date.getMonth() + 1;
     const prevMonth = month == 1 ? 12 : month - 1;
-    let prevMonthStates = [];
-
     const params = {
         month,
         year: date.getFullYear(),
     };
 
     const curMonthStates = (await axios.get(url, { params })).data;
-    prevMonthStates = (await axios.get(url, { params: { ...params, month: prevMonth } }))
-        .data;
+    const prevMonthStates = (
+        await axios.get(url, { params: { ...params, month: prevMonth } })
+    ).data;
 
     workerTimeControlMails.value = curMonthStates.concat(prevMonthStates);
 };

From 7eb951ef13b1547f8f373c54868b2b407580c33c Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 26 Sep 2024 15:28:00 +0200
Subject: [PATCH 9/9] fix: refs #7323 use right locale

---
 src/i18n/locale/en.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 7127ab20c..62023886d 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -810,14 +810,14 @@ worker:
         bankEntity: Swift / BIC
     formation:
         tableVisibleColumns:
-            course: Curso
-            startDate: Fecha Inicio
-            endDate: Fecha Fin
-            center: Centro Formación
-            invoice: Factura
-            amount: Importe
-            remark: Bonficado
-            hasDiploma: Diploma
+            course: Course
+            startDate: Start date
+            endDate: End date
+            center: Training center
+            invoice: Invoice
+            amount: Amount
+            remark: Remark
+            hasDiploma: Has diploma
     medical:
         tableVisibleColumns:
             date: Date