verdnatura/salix-front
verdnatura
/
salix-front
2
3
Fork 1
Code Issues Pull Requests 82 Releases Wiki Activity

Merge branch 'dev' into 7356_e2e
gitea/salix-front/pipeline/pr-dev This commit looks good Details

This commit is contained in:
Javier Segarra 2025-04-08 12:09:48 +00:00
parent d3b413fc25 9d2c0bf211
commit a24bc6cc4b
2 changed files with 40 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
src/pages/Worker/Card/WorkerCalendarFilter.vue
View File

@ -166,50 +166,44 @@ const yearList = ref(generateYears());
}} }}
</QCardSection> </QCardSection>
</div> </div>
<QList dense class="list q-gutter-y-sm q-my-lg"> <div dense class="column q-gutter-y-sm q-px-md">
<QItem> <VnSelect
<QItemSection> :label="t('Year')"
<VnSelect v-model="selectedYear"
:label="t('Year')" :options="yearList"
v-model="selectedYear" dense
:options="yearList" filled
dense use-input
filled :is-clearable="false"
use-input />
:is-clearable="false" <VnSelect
/> :label="t('Contract')"
</QItemSection> v-model="selectedBusinessFk"
<QItemSection> :options="contractList"
<VnSelect option-value="businessFk"
:label="t('Contract')" option-label="businessFk"
v-model="selectedBusinessFk" dense
:options="contractList" filled
option-value="businessFk" use-input
option-label="businessFk" :is-clearable="false"
dense >
filled <template #option="scope">
use-input <QItem v-bind="scope.itemProps">
:is-clearable="false" <QItemSection>
> <QItemLabel># {{ scope.opt?.businessFk }}</QItemLabel>
<template #option="scope"> <QItemLabel caption>
<QItem v-bind="scope.itemProps"> {{ toDateFormat(scope.opt?.started) }} -
<QItemSection> {{
<QItemLabel># {{ scope.opt?.businessFk }}</QItemLabel> scope.opt?.ended
<QItemLabel caption> ? toDateFormat(scope.opt?.ended)
{{ toDateFormat(scope.opt?.started) }} - : 'Indef.'
{{ }}
scope.opt?.ended </QItemLabel>
? toDateFormat(scope.opt?.ended) </QItemSection>
: 'Indef.' </QItem>
}} </template>
</QItemLabel> </VnSelect>
</QItemSection> </div>
</QItem>
</template>
</VnSelect>
</QItemSection>
</QItem>
</QList>
<QList dense class="list q-gutter-y-xs q-my-md"> <QList dense class="list q-gutter-y-xs q-my-md">
<QItem v-for="type in absenceTypeList" :key="type.id"> <QItem v-for="type in absenceTypeList" :key="type.id">
<WorkerEventLabel <WorkerEventLabel

3
src/pages/Worker/Card/WorkerPda.vue
View File

@ -234,7 +234,7 @@ function isSigned(row) {
data-cy="workerPda-download" data-cy="workerPda-download"
> >
<QTooltip> <QTooltip>
{{ t('worker.pda.download') }} {{ t('globals.downloadPdf') }}
</QTooltip> </QTooltip>
</QBtn> </QBtn>
</template> </template>
@ -307,4 +307,5 @@ es:
This PDA is already assigned to another user: Este PDA ya está asignado a otro usuario 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? Are you sure you want to send it?: ¿Seguro que quieres enviarlo?
Sign PDA: Firmar PDA Sign PDA: Firmar PDA
PDF sended to signed: PDF enviado para firmar
</i18n> </i18n>