verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 60 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() { isMailSended() {
const filter = { const filterTimeControl = {
where: { where: {
year: this._date.getFullYear(), year: this._date.getFullYear(),
week: this.getWeekNumber(this._date) week: this.getWeekNumber(this._date)
vicent marked this conversation as resolved Outdated
jgallego commented 2023-08-24 12:33:16 +00:00
Outdated
Review
Copy Link

ací al final no pugueres posar el workerFk?

ací al final no pugueres posar el workerFk?
vicent commented 2023-08-24 12:35:30 +00:00
Outdated
Review
Copy Link

Teu havia possat en la nota de ahir:

No se envía el workerFk, pq puede que ese workerFk no tenga ningún registro. Se ha solucionado poniendo un limit 1 en la petición.

Just lo que soluciona esta tarea es poder enviar el registro horario aunq no se li haja enviat la ninguna volta.

Teu havia possat en la nota de ahir: No se envía el workerFk, pq puede que ese workerFk no tenga ningún registro. Se ha solucionado poniendo un limit 1 en la petición. Just lo que soluciona esta tarea es poder enviar el registro horario aunq no se li haja enviat la ninguna volta.
}, },
vicent marked this conversation as resolved Outdated
jgallego commented 2023-08-23 09:09:58 +00:00
Outdated
Review
Copy Link

enviar el workerFk

enviar el workerFk
vicent commented 2023-08-24 07:05:44 +00:00
Outdated
Review
Copy Link

No se envía el workerFk, pq puede que ese workerFk no tenga ningún registro. Se ha solucionado poniendo un limit 1 en la petición.

No se envía el workerFk, pq puede que ese workerFk no tenga ningún registro. Se ha solucionado poniendo un limit 1 en la petición.
limit: 1 limit: 1
}; };
this.$http.get('WorkerTimeControlMails', {filter}) this.$http.get('WorkerTimeControlMails', {filterTimeControl})
.then(res => { .then(res => {
if (!res.data.length) { if (!res.data.length) {
this.canResend = false; this.canResend = false;
return; return;
} }
const filter = { const filterDepartment = {
where: { where: {
workerFk: this.$params.id workerFk: this.$params.id
}, },
@ -135,7 +135,7 @@ class Controller extends Section {
relation: 'department' relation: 'department'
} }
}; };
this.$http.get('WorkerDepartments', {filter}) this.$http.get('WorkerDepartments', {filterDepartment})
.then(res => { .then(res => {
const department = res.data[0].department; const department = res.data[0].department;
if (department.isTeleworking) this.canResend = true; if (department.isTeleworking) this.canResend = true;