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

hotFix(sendMail): hasToRefill
gitea/salix/pipeline/pr-master This commit looks good Details

This commit is contained in:
Alex Moreno 2024-02-20 12:13:49 +01:00
parent 231ebf78d7
commit ab9c952afc
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/worker/back/methods/worker-time-control/sendMail.js
View File

@ -137,7 +137,8 @@ module.exports = Self => {
tb.type, tb.type,
tb.businessFk, tb.businessFk,
tb.permissionRate, tb.permissionRate,
d.isTeleworking d.isTeleworking,
d.hasToRefill
FROM tmp.timeBusinessCalculate tb FROM tmp.timeBusinessCalculate tb
JOIN account.user u ON u.id = tb.userFk JOIN account.user u ON u.id = tb.userFk
JOIN department d ON d.id = tb.departmentFk JOIN department d ON d.id = tb.departmentFk
@ -149,8 +150,7 @@ module.exports = Self => {
FROM tmp.timeControlError tce FROM tmp.timeControlError tce
JOIN vn.workerTimeControl wtc ON wtc.id = tce.id JOIN vn.workerTimeControl wtc ON wtc.id = tce.id
)sub ON sub.userFk = tb.userFk )sub ON sub.userFk = tb.userFk
WHERE d.hasToRefill WHERE sub.userFK IS NULL
AND sub.userFK IS NULL
AND IFNULL(?, u.id) = u.id AND IFNULL(?, u.id) = u.id
AND b.companyCodeFk = 'VNL' AND b.companyCodeFk = 'VNL'
AND w.businessFk AND w.businessFk
@ -175,7 +175,7 @@ module.exports = Self => {
myOptions.transaction = tx; myOptions.transaction = tx;
try { try {
workerFk = day.workerFk; workerFk = day.workerFk;
if (day.timeWorkDecimal > 0 && day.timeWorkedDecimal == null if (day.hasToRefill && day.timeWorkDecimal > 0 && day.timeWorkedDecimal == null
&& (day.permissionRate == null ? true : day.permissionRate)) { && (day.permissionRate == null ? true : day.permissionRate)) {
if (day.timeTable == null) { if (day.timeTable == null) {
const timed = new Date(day.dated); const timed = new Date(day.dated);