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

5918-worker.time-control_resend #1685

Merged
alexm merged 14 commits from 5918-worker.time-control_resend into dev 2023-10-18 09:10:19 +00:00
Conversation 0 Commits 14 Files Changed 6 +4 -4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9da5c4c1db - Show all commits

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

@ -113,21 +113,21 @@ class Controller extends Section {
}
isMailSended() {
const filter = {
const filterTimeControl = {
where: {
year: this._date.getFullYear(),
week: this.getWeekNumber(this._date)
},
limit: 1
};
this.$http.get('WorkerTimeControlMails', {filter})
this.$http.get('WorkerTimeControlMails', {filterTimeControl})
.then(res => {
if (!res.data.length) {
this.canResend = false;
return;
}
const filter = {
const filterDepartment = {
where: {
workerFk: this.$params.id
},
@ -135,7 +135,7 @@ class Controller extends Section {
relation: 'department'
}
};
this.$http.get('WorkerDepartments', {filter})
this.$http.get('WorkerDepartments', {filterDepartment})
.then(res => {
const department = res.data[0].department;
if (department.isTeleworking) this.canResend = true;