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

7167-testToMaster_2414 #2244

Merged
alexm merged 643 commits from 7167-testToMaster_2414 into master 2024-04-04 05:32:41 +00:00
Conversation 0 Commits 643 Files Changed 208 +5 -3
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6a78123fca - Show all commits

3
back/methods/machine-worker/updateInTime.js
View File

@ -55,7 +55,8 @@ module.exports = Self => {
outTime: Date.vnNew()
}, myOptions);
if (!isHimSelf) await models.MachineWorker.create({machineFk: machine.id, workerFk: userId}, myOptions);
if (maxHours <= hoursDifference)
await models.MachineWorker.create({machineFk: machine.id, workerFk: userId}, myOptions);
} else
await models.MachineWorker.create({machineFk: machine.id, workerFk: userId}, myOptions);

3
loopback/locale/es.json
View File

@ -340,5 +340,6 @@
"No tickets to invoice": "No hay tickets para facturar",
"No hay tickets para sacar": "No hay tickets para sacar",
"There is no zone for these parameters 999999": "There is no zone for these parameters 999999",
"Esta máquina ya está en uso.": "Esta máquina ya está en uso."
"Esta máquina ya está en uso.": "Esta máquina ya está en uso.",
"This machine is already in use.": "This machine is already in use."
}

2
modules/ticket/back/methods/ticket/specs/setDeleted.spec.js
View File

@ -57,7 +57,7 @@ describe('ticket setDeleted()', () => {
`SELECT COUNT(*) numberRows
FROM vn.sectorCollection`, [], options);
expect(sectorCollection.numberRows).toEqual(0);
expect(sectorCollection.numberRows).toEqual(1);
await tx.rollback();
} catch (e) {