From ec0ae8f07c5f992766b8cf6f1efa9e19421366bc Mon Sep 17 00:00:00 2001 From: carlosjr Date: Mon, 21 Dec 2020 13:52:37 +0100 Subject: [PATCH] years previous to contrar error corrected --- modules/worker/back/methods/calendar/absences.js | 2 +- modules/worker/front/calendar/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/worker/back/methods/calendar/absences.js b/modules/worker/back/methods/calendar/absences.js index 36d71ea81..b84b55843 100644 --- a/modules/worker/back/methods/calendar/absences.js +++ b/modules/worker/back/methods/calendar/absences.js @@ -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; diff --git a/modules/worker/front/calendar/index.html b/modules/worker/front/calendar/index.html index fe61e828e..f10201763 100644 --- a/modules/worker/front/calendar/index.html +++ b/modules/worker/front/calendar/index.html @@ -26,7 +26,7 @@
Holidays
{{'Used' | translate}} {{$ctrl.calendar.holidaysEnjoyed}} - {{'of' | translate}} {{$ctrl.calendar.totalHolidays}} {{'days' | translate}} + {{'of' | translate}} {{$ctrl.calendar.totalHolidays || 0}} {{'days' | translate}}