From 4f9dae3522f76daed49f9311762ae540f02552c1 Mon Sep 17 00:00:00 2001 From: vicent Date: Tue, 30 May 2023 11:52:04 +0200 Subject: [PATCH] refs #5468 fix: no muestra el id de contrato en worker/calendar --- modules/worker/front/calendar/index.html | 1 + modules/worker/front/calendar/index.js | 8 +++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/worker/front/calendar/index.html b/modules/worker/front/calendar/index.html index c9eacbd82..29540081e 100644 --- a/modules/worker/front/calendar/index.html +++ b/modules/worker/front/calendar/index.html @@ -63,6 +63,7 @@ ng-model="$ctrl.businessId" search-function="{businessFk: $search}" value-field="businessFk" + show-field="businessFk" order="businessFk DESC" limit="5"> diff --git a/modules/worker/front/calendar/index.js b/modules/worker/front/calendar/index.js index 4ca0fc929..a492e8306 100644 --- a/modules/worker/front/calendar/index.js +++ b/modules/worker/front/calendar/index.js @@ -71,10 +71,6 @@ class Controller extends Section { } } - get payedHolidays() { - return this._businessId; - } - buildYearFilter() { const now = Date.vnNew(); now.setFullYear(now.getFullYear() + 1); @@ -96,8 +92,10 @@ class Controller extends Section { getActiveContract() { this.$http.get(`Workers/${this.worker.id}/activeContract`).then(res => { - if (res.data) + if (res.data) { this.businessId = res.data.businessFk; + console.log(this.businessId); + } }); }