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

workers without active contract no longer set calendar and timeControl at fault
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Carlos Jimenez Ruiz 2021-06-30 14:05:16 +02:00
parent 5d38488ac1
commit 4148500c61
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/worker/front/calendar/index.js
View File

@ -91,8 +91,10 @@ class Controller extends Section {
} }
getActiveContract() { getActiveContract() {
this.$http.get(`Workers/${this.worker.id}/activeContract`) this.$http.get(`Workers/${this.worker.id}/activeContract`).then(res => {
.then(res => this.businessId = res.data.businessFk); if (res.data)
this.businessId = res.data.businessFk;
});
} }
getContractHolidays() { getContractHolidays() {

7
modules/worker/front/time-control/index.js
View File

@ -90,7 +90,10 @@ class Controller extends Section {
getActiveContract() { getActiveContract() {
return this.$http.get(`Workers/${this.worker.id}/activeContract`) return this.$http.get(`Workers/${this.worker.id}/activeContract`)
.then(res => this.businessId = res.data.businessFk); .then(res => {
if (res.data)
this.businessId = res.data.businessFk;
});
} }
fetchHours() { fetchHours() {
@ -111,6 +114,8 @@ class Controller extends Section {
} }
getAbsences() { getAbsences() {
if (!this.businessId) return;
const fullYear = this.started.getFullYear(); const fullYear = this.started.getFullYear();
let params = { let params = {
businessFk: this.businessId, businessFk: this.businessId,