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

Merge branch 'dev' into 2663-route_dragdrop
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Carlos Jimenez Ruiz 2020-12-21 14:02:05 +00:00
parent 35dc2a533b 2ed7fdd367
commit be1a317df8
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">