verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 51 Releases Wiki Activity

fixes #4632 Llamar al nuevo método back de guardar firmas de salix #1346

Merged
juan merged 15 commits from 4632-guardarFirmas-salix into dev 2023-03-16 09:53:51 +00:00
Conversation 0 Commits 15 Files Changed 10 +6 -67
5 changed files with 6 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 423ae85212 - Show all commits

3
back/model-config.json
View File

@ -44,9 +44,6 @@
"DmsType": {
"dataSource": "vn"
},
"DmsRecover": {
"dataSource": "vn"
},
"Docuware": {
"dataSource": "vn"
},

37
back/models/dms-recover.json
View File

@ -1,37 +0,0 @@
{
"name": "DmsRecover",
"description": "Documental Managment System Recover",
"base": "VnModel",
"log": {
"showField": "ticketFk"
},
"options": {
"mysql": {
"table": "dmsRecover"
}
},
"properties": {
"id": {
"type": "number",
"id": true,
"description": "Identifier"
},
"ticketFk": {
"type": "number"
},
"sign": {
"type": "string"
},
"created": {
"type": "date"
}
},
"relations": {
"ticket": {
"type": "belongsTo",
"model": "Ticket",
"foreignKey": "ticketFk"
}
}
}

0
db/changes/231001/.gitkeep
View File

2
db/changes/230801/00-delivery.sql → db/changes/231001/00-delivery.sql
View File

@ -1,3 +1,5 @@
DROP TABLE `vn`.`dmsRecover`;
ALTER TABLE `vn`.`delivery` DROP FOREIGN KEY delivery_FK;
ALTER TABLE `vn`.`delivery` DROP COLUMN addressFk;
ALTER TABLE `vn`.`delivery` ADD ticketFk INT NOT NULL;

31
modules/ticket/back/methods/ticket-dms/saveSign.js
View File

@ -51,7 +51,7 @@ module.exports = Self => {
ticketFk: ticketId,
longitude: args.location.Longitude,
latitude: args.location.Latitude,
dated: args.signedTime
dated: args.signedTime || new Date()
}, myOptions);
}
}
@ -67,7 +67,8 @@ module.exports = Self => {
if (!ticketDms) return false;
const ticket = await models.Ticket.findById(ticketId, {fields: ['isSigned']}, myOptions);
if (ticket.isSigned == true) return true;
if (ticket.isSigned == true)
return true;
else
await models.Dms.destroyAll({where: {reference: ticketId}}, myOptions);
@ -108,10 +109,6 @@ module.exports = Self => {
await models.Ticket.uploadFile(ctxUploadFile, id, myOptions);
}
// async function dmsRecover(ticketFk, sign) {
// await models.DmsRecover.create({ticketFk, sign}, myOptions);
// }
try {
for (let i = 0; i < args.tickets.length; i++) {
const ticketState = await models.TicketState.findOne(
@ -120,35 +117,15 @@ module.exports = Self => {
}, myOptions);
juan commented 2023-03-16 06:38:59 +00:00
Outdated
Review
Copy Link

No s'han de gastar ids en el codi

No s'han de gastar ids en el codi
alexandre commented 2023-03-16 06:45:48 +00:00
Outdated
Review
Copy Link

La firma s'ha de guardar sempre independentment del estat del ticket?

La firma s'ha de guardar sempre independentment del estat del ticket?
juan commented 2023-03-16 07:41:33 +00:00
Outdated
Review
Copy Link

Sempre s'ha de guardar, de totes formes me referia a que, en cas de que siga necessari, fer la mateixa comprovació pero sense gastar ids, pots gastar el codi del alertLevel

Sempre s'ha de guardar, de totes formes me referia a que, en cas de que siga necessari, fer la mateixa comprovació pero sense gastar ids, pots gastar el codi del alertLevel
if (ticketState.alertLevel >= 2 && !await gestDocExists(args.tickets[i])) {
if (!args.signedTime) args.signedTime = Date.vnNew();
if (args.location) setLocation(args.tickets[i]);
await createGestDoc(args.tickets[i]);
// if (image) {
// if (!fs.existsSync(dir))
// dmsRecover(args.tickets[i], args.signContent);
// else {
// fs.writeFile(image, args.signContent, 'base64', async function(err) {
// if (err) {
// await tx.rollback();
// throw err.message;
// }
// });
// }
// } else
// dmsRecover(args.tickets[i], args.signContent);
// if (id && fileName) {
// await models.TicketDms.replaceOrCreate({ticketFk: args.tickets[i], dmsFk: id}, myOptions);
await Self.rawSql(`CALL vn.ticket_setState(?, ?)`, [args.tickets[i], 'DELIVERED'], myOptions);
// await models.Dms.updateAll({id}, {file: fileName, contentType: 'image/png'}, myOptions);
// }
}
}
if (tx) await tx.commit();
return 'Sign uploaded correctly';
return 'Signs uploaded correctly';
} catch (e) {
if (tx) await tx.rollback();
throw e;