verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 58 Releases Wiki Activity

Merge pull request 'years previous to contract error corrected' (#487) from 2675-worker_time_control_year_error into dev
gitea/salix/pipeline/head This commit looks good Details 

Reviewed-on: #487
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
This commit is contained in:
Joan Sanchez 2020-12-21 13:58:40 +00:00
parent 564ca3a511 ec0ae8f07c
commit 2ed7fdd367
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/worker/back/methods/calendar/absences.js
View File

@ -146,7 +146,7 @@ module.exports = Self => {
});
if (currentContract) {
const maxHolidays = currentContract.holidays().days;
const maxHolidays = currentContract.holidays() && currentContract.holidays().days;
calendar.totalHolidays = maxHolidays;
workedDays -= entitlementRate;

2
modules/worker/front/calendar/index.html
View File

@ -26,7 +26,7 @@
<h6 translate>Holidays</h6>
<div>
{{'Used' | translate}} {{$ctrl.calendar.holidaysEnjoyed}}
{{'of' | translate}} {{$ctrl.calendar.totalHolidays}} {{'days' | translate}}
{{'of' | translate}} {{$ctrl.calendar.totalHolidays || 0}} {{'days' | translate}}
</div>
</div>
<div class="vn-pt-md">