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

WorkerCalendar #270

Merged
alexm merged 37 commits from :WorkerCalendar into dev 2024-04-16 12:26:20 +00:00
Conversation 4 Commits 37 Files Changed 13 +39 -19
1 changed files with 39 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 881c6e2f7f - Show all commits

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

@ -94,22 +94,31 @@ const yearList = ref(generateYears());
</QCardSection>
<QCardSection class="column items-center" horizontal>
<span>
{{ t('Used') }} {{ contractHolidays.holidaysEnjoyed || 0 }} {{ t('of') }}
{{ contractHolidays.totalHolidays || 0 }}
{{ t('days') }}
{{
t('usedDays', {
holidaysEnjoyed: contractHolidays.holidaysEnjoyed || 0,
totalHolidays: contractHolidays.totalHolidays || 0,
})
}}
</span>
</QCardSection>
<QCardSection class="column items-center" horizontal>
<span>
{{ t('Spent') }} {{ contractHolidays.hoursEnjoyed || 0 }} {{ t('of') }}
{{ contractHolidays.totalHours || 0 }} {{ t('hours') }}
{{
t('spentHours', {
hoursEnjoyed: contractHolidays.hoursEnjoyed || 0,
totalHours: contractHolidays.totalHours || 0,
})
}}
</span>
</QCardSection>
<QCardSection class="column items-center" horizontal>
<span>
{{ t('Paid holidays') }}
{{ contractHolidays.payedHolidays || 0 }}
{{ t('days') }}
{{
jsegarra marked this conversation as resolved Outdated
jsegarra commented 2024-04-09 06:33:41 +00:00
Outdated
Review
Copy Link

la condicion if está bien?
Porque en el bloque de antes se usaba contractHolidays y ahora yearHolidays

la condicion if está bien? Porque en el bloque de antes se usaba contractHolidays y ahora yearHolidays
wbuezas commented 2024-04-09 12:09:02 +00:00
Outdated
Review
Copy Link

Buena observación, cambie la variable contractHolidays por yearHolidays

Commit: 196679b9e9

Buena observación, cambie la variable `contractHolidays` por `yearHolidays` Commit: https://gitea.verdnatura.es/verdnatura/salix-front/commit/196679b9e987719569eafcf57963510faf0b4121
t('paidHolidays', {
payedHolidays: contractHolidays.payedHolidays || 0,
})
}}
</span>
</QCardSection>
</div>
@ -125,15 +134,21 @@ const yearList = ref(generateYears());
</QCardSection>
<QCardSection class="column items-center" horizontal>
<span>
{{ t('Used') }} {{ yearHolidays.holidaysEnjoyed || 0 }} {{ t('of') }}
{{ yearHolidays.totalHolidays || 0 }} {{ t('days') }}
{{
t('usedDays', {
holidaysEnjoyed: yearHolidays.holidaysEnjoyed || 0,
totalHolidays: yearHolidays.totalHolidays || 0,
})
}}
</span>
</QCardSection>
<QCardSection class="column items-center" horizontal>
jsegarra marked this conversation as resolved Outdated
jsegarra commented 2024-04-09 06:34:15 +00:00
Outdated
Review
Copy Link

valor por defecto puede ir en la declaracion?

valor por defecto puede ir en la declaracion?
wbuezas commented 2024-04-09 12:15:33 +00:00
Outdated
Review
Copy Link

Valores por default movidos.

Commit: 0941d74d52

Valores por default movidos. Commit: https://gitea.verdnatura.es/verdnatura/salix-front/commit/0941d74d528fa910df2061f2f5782c83621ff8e9
<span>
{{ t('Spent') }} {{ yearHolidays.hoursEnjoyed || 0 }} {{ t('of') }}
{{ yearHolidays.totalHours || 0 }} {{ t('hours') }}
</span>
{{
t('spentHours', {
hoursEnjoyed: yearHolidays.hoursEnjoyed || 0,
totalHours: yearHolidays.totalHours || 0,
})
}}
</QCardSection>
</div>
<QList dense class="list q-gutter-y-sm q-my-lg">
@ -219,15 +234,20 @@ const yearList = ref(generateYears());
</style>
<i18n>
en:
spentHours: Spent {hoursEnjoyed} of {totalHours} hours
usedDays: Used {holidaysEnjoyed} of {totalHolidays} days
paidHolidays: Paid holidays {payedHolidays} days
es:
Used: Utilizados
Spent: Utilizadas
Paid holidays: Vacaciones pagadas
of: de
days: días
hours: horas
Year: Año
Contract: Contrato
Festive: Festivo
Current day: Día actual
spentHours: Utilizadas {hoursEnjoyed} de {totalHours} horas
usedDays: Utilizados {holidaysEnjoyed} de {totalHolidays} días
paidHolidays: Vacaciones pagadas {payedHolidays} días
</i18n>