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

feat: refs #7287 Added changes to use reason in log #2885

Open
guillermo wants to merge 2 commits from 7287-reasonLog into dev
pull from: 7287-reasonLog
merge into: verdnatura:dev
Conversation 0 Commits 2 Files Changed 5 +44 -7
5 changed files with 44 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
db/versions/11199-blackEucalyptus/00-firstScript.sql Normal file
View File

@ -0,0 +1,23 @@
ALTER TABLE account.roleLog ADD reason varchar(255) DEFAULT NULL NULL;
ALTER TABLE account.userLog ADD reason varchar(255) DEFAULT NULL NULL;
ALTER TABLE srt.bufferLog ADD reason varchar(255) DEFAULT NULL NULL;
ALTER TABLE salix.ACLLog ADD reason varchar(255) DEFAULT NULL NULL;
ALTER TABLE vn.entryLog ADD reason varchar(255) DEFAULT NULL NULL;
ALTER TABLE vn.clientLog ADD reason varchar(255) DEFAULT NULL NULL;
ALTER TABLE vn.itemLog ADD reason varchar(255) DEFAULT NULL NULL;
ALTER TABLE vn.shelvingLog ADD reason varchar(255) DEFAULT NULL NULL;
ALTER TABLE vn.workerLog ADD reason varchar(255) DEFAULT NULL NULL;
ALTER TABLE vn.deviceProductionLog ADD reason varchar(255) DEFAULT NULL NULL;
ALTER TABLE vn.zoneLog ADD reason varchar(255) DEFAULT NULL NULL;
ALTER TABLE vn.rateLog ADD reason varchar(255) DEFAULT NULL NULL;
ALTER TABLE vn.ticketLog ADD reason varchar(255) DEFAULT NULL NULL;
ALTER TABLE vn.agencyLog ADD reason varchar(255) DEFAULT NULL NULL;
ALTER TABLE vn.userLog ADD reason varchar(255) DEFAULT NULL NULL;
ALTER TABLE vn.routeLog ADD reason varchar(255) DEFAULT NULL NULL;
ALTER TABLE vn.claimLog ADD reason varchar(255) DEFAULT NULL NULL;
ALTER TABLE vn.productionConfigLog ADD reason varchar(255) DEFAULT NULL NULL;
ALTER TABLE vn.supplierLog ADD reason varchar(255) DEFAULT NULL NULL;
ALTER TABLE vn.invoiceInLog ADD reason varchar(255) DEFAULT NULL NULL;
ALTER TABLE vn.travelLog ADD reason varchar(255) DEFAULT NULL NULL;
ALTER TABLE vn.packingSiteDeviceLog ADD reason varchar(255) DEFAULT NULL NULL;
ALTER TABLE vn.parkingLog ADD reason varchar(255) DEFAULT NULL NULL;

5
db/versions/11199-blackEucalyptus/01-firstScript.sql Normal file
View File

@ -0,0 +1,5 @@
ALTER TABLE vn.ticket
ADD motivation ENUM('clone', 'split') DEFAULT NULL NULL AFTER cmrFk;
ALTER TABLE vn.sale
ADD motivation ENUM('priceFix', 'replaceItem') DEFAULT NULL NULL AFTER total;

4
front/salix/components/log/index.js
View File

@ -40,10 +40,10 @@ export default class Controller extends Section {
'oldInstance', 'oldInstance',
'newInstance', 'newInstance',
'creationDate', 'creationDate',
'description',
'changedModel', 'changedModel',
'changedModelId', 'changedModelId',
'changedModelValue', 'changedModelValue'
'description'
], ],
include: [{ include: [{
relation: 'user', relation: 'user',

14
loopback/common/models/log.json
View File

@ -18,6 +18,12 @@
"type": "string", "type": "string",
"required": true "required": true
}, },
"creationDate": {
"type": "date"
},
"description": {
"type": "string"
},
"changedModel": { "changedModel": {
"type": "string" "type": "string"
}, },
@ -35,16 +41,16 @@
"type": "String", "type": "String",
"mysql": {"columnName": "newInstance"} "mysql": {"columnName": "newInstance"}
}, },
"creationDate": {
"type": "date"
},
"changedModelId": { "changedModelId": {
"type": "string" "type": "string"
}, },
"changedModelValue": { "changedModelValue": {
"type": "string" "type": "string"
}, },
"description": { "summaryId": {
"type":"string"
},
"reason": {
"type": "string" "type": "string"
} }
}, },

5
modules/ticket/back/models/ticket-log.json
View File

@ -43,6 +43,9 @@
}, },
"summaryId": { "summaryId": {
"type":"string" "type":"string"
} },
"reason": {
"type": "string"
}
} }
} }