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

3069-client.shelving #1029

Merged
joan merged 16 commits from 3069-client.shelving into dev 2022-08-05 09:18:56 +00:00
Conversation 1 Commits 16 Files Changed 47 +42 -38
3 changed files with 42 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 771c86ba4b - Show all commits

4
db/changes/10480-june/00-shelving.sql
View File

@ -12,3 +12,7 @@ ALTER TABLE `vn`.`itemShelving` ADD CONSTRAINT itemShelving_fk2 FOREIGN KEY (she
ALTER TABLE `vn`.`shelvingLog` ADD CONSTRAINT shelvingLog_FK_ibfk_1 FOREIGN KEY (originFk) REFERENCES `vn`.`shelving`(code) ON DELETE CASCADE ON UPDATE CASCADE; ALTER TABLE `vn`.`shelvingLog` ADD CONSTRAINT shelvingLog_FK_ibfk_1 FOREIGN KEY (originFk) REFERENCES `vn`.`shelving`(code) ON DELETE CASCADE ON UPDATE CASCADE;
ALTER TABLE `vn`.`smartTag` ADD CONSTRAINT smartTag_FK FOREIGN KEY (shelvingFk) REFERENCES `vn`.`shelving`(code) ON DELETE RESTRICT ON UPDATE CASCADE; ALTER TABLE `vn`.`smartTag` ADD CONSTRAINT smartTag_FK FOREIGN KEY (shelvingFk) REFERENCES `vn`.`shelving`(code) ON DELETE RESTRICT ON UPDATE CASCADE;
ALTER TABLE `vn`.`workerShelving` ADD CONSTRAINT workerShelving_FK_1 FOREIGN KEY (shelvingFk) REFERENCES `vn`.`shelving`(code) ON DELETE RESTRICT ON UPDATE CASCADE; ALTER TABLE `vn`.`workerShelving` ADD CONSTRAINT workerShelving_FK_1 FOREIGN KEY (shelvingFk) REFERENCES `vn`.`shelving`(code) ON DELETE RESTRICT ON UPDATE CASCADE;
ALTER TABLE vn.shelvingLog DROP FOREIGN KEY shelvingLog_FK_ibfk_1;
ALTER TABLE vn.shelvingLog MODIFY COLUMN originFk INT NOT NULL;
ALTER TABLE vn.shelvingLog ADD CONSTRAINT shelvingLog_FK FOREIGN KEY (originFk) REFERENCES vn.shelving(id) ON DELETE CASCADE ON UPDATE CASCADE;

18
modules/shelving/back/models/shelving-log.json
View File

@ -13,7 +13,7 @@
"forceId": false "forceId": false
}, },
"originFk": { "originFk": {
"type": "string", "type": "number",
"required": true "required": true
}, },
"userFk": { "userFk": {
@ -23,26 +23,26 @@
"type": "string", "type": "string",
"required": true "required": true
}, },
"creationDate": {
"type": "date"
},
"description": {
"type": "string"
},
"changedModel": { "changedModel": {
"type": "string" "type": "string"
}, },
"oldInstance": { "oldInstance": {
"type": "string" "type": "object"
}, },
"newInstance": { "newInstance": {
"type": "string" "type": "object"
},
"creationDate": {
"type": "date"
}, },
"changedModelId": { "changedModelId": {
"type": "number" "type": "number"
}, },
"changedModelValue": { "changedModelValue": {
"type": "string" "type": "string"
},
"description": {
"type": "string"
} }
}, },
"relations": { "relations": {

2
modules/shelving/front/log/index.html
View File

@ -1 +1 @@
<vn-log url="ShelvingLogs" origin-id="$ctrl.$params.code"></vn-log> <vn-log url="ShelvingLogs" origin-id="$ctrl.$params.id"></vn-log>