From 15cbbab043541505ddb6dc168b0c9cb5725d43a4 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 8 Apr 2025 08:35:27 +0200
Subject: [PATCH 1/2] fix(WorkerPDA): fix translations
---
src/pages/Worker/Card/WorkerPda.vue | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/pages/Worker/Card/WorkerPda.vue b/src/pages/Worker/Card/WorkerPda.vue
index e7478de1e..590cbc2b2 100644
--- a/src/pages/Worker/Card/WorkerPda.vue
+++ b/src/pages/Worker/Card/WorkerPda.vue
@@ -234,7 +234,7 @@ function isSigned(row) {
data-cy="workerPda-download"
>
<QTooltip>
- {{ t('worker.pda.download') }}
+ {{ t('globals.downloadPdf') }}
</QTooltip>
</QBtn>
</template>
@@ -307,4 +307,5 @@ es:
This PDA is already assigned to another user: Este PDA ya está asignado a otro usuario
Are you sure you want to send it?: ¿Seguro que quieres enviarlo?
Sign PDA: Firmar PDA
+ PDF sended to signed: PDF enviado para firmar
</i18n>
From 123ec41f32819ba5320c540a981818c3de9e75cf Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 8 Apr 2025 13:32:31 +0200
Subject: [PATCH 2/2] fix(WorkerCalendarFilter): fix style year and contract
filter
---
.../Worker/Card/WorkerCalendarFilter.vue | 82 +++++++++----------
1 file changed, 38 insertions(+), 44 deletions(-)
diff --git a/src/pages/Worker/Card/WorkerCalendarFilter.vue b/src/pages/Worker/Card/WorkerCalendarFilter.vue
index f0e2d758a..32edaa6e9 100644
--- a/src/pages/Worker/Card/WorkerCalendarFilter.vue
+++ b/src/pages/Worker/Card/WorkerCalendarFilter.vue
@@ -166,50 +166,44 @@ const yearList = ref(generateYears());
}}
</QCardSection>
</div>
- <QList dense class="list q-gutter-y-sm q-my-lg">
- <QItem>
- <QItemSection>
- <VnSelect
- :label="t('Year')"
- v-model="selectedYear"
- :options="yearList"
- dense
- filled
- use-input
- :is-clearable="false"
- />
- </QItemSection>
- <QItemSection>
- <VnSelect
- :label="t('Contract')"
- v-model="selectedBusinessFk"
- :options="contractList"
- option-value="businessFk"
- option-label="businessFk"
- dense
- filled
- use-input
- :is-clearable="false"
- >
- <template #option="scope">
- <QItem v-bind="scope.itemProps">
- <QItemSection>
- <QItemLabel># {{ scope.opt?.businessFk }}</QItemLabel>
- <QItemLabel caption>
- {{ toDateFormat(scope.opt?.started) }} -
- {{
- scope.opt?.ended
- ? toDateFormat(scope.opt?.ended)
- : 'Indef.'
- }}
- </QItemLabel>
- </QItemSection>
- </QItem>
- </template>
- </VnSelect>
- </QItemSection>
- </QItem>
- </QList>
+ <div dense class="column q-gutter-y-sm q-px-md">
+ <VnSelect
+ :label="t('Year')"
+ v-model="selectedYear"
+ :options="yearList"
+ dense
+ filled
+ use-input
+ :is-clearable="false"
+ />
+ <VnSelect
+ :label="t('Contract')"
+ v-model="selectedBusinessFk"
+ :options="contractList"
+ option-value="businessFk"
+ option-label="businessFk"
+ dense
+ filled
+ use-input
+ :is-clearable="false"
+ >
+ <template #option="scope">
+ <QItem v-bind="scope.itemProps">
+ <QItemSection>
+ <QItemLabel># {{ scope.opt?.businessFk }}</QItemLabel>
+ <QItemLabel caption>
+ {{ toDateFormat(scope.opt?.started) }} -
+ {{
+ scope.opt?.ended
+ ? toDateFormat(scope.opt?.ended)
+ : 'Indef.'
+ }}
+ </QItemLabel>
+ </QItemSection>
+ </QItem>
+ </template>
+ </VnSelect>
+ </div>
<QList dense class="list q-gutter-y-xs q-my-md">
<QItem v-for="type in absenceTypeList" :key="type.id">
<WorkerEventLabel