fix: refs #7529 workerPit
gitea/salix/pipeline/pr-dev There was a failure building this commit Details

This commit is contained in:
Carlos Satorres 2024-09-18 12:08:49 +02:00
parent c0ee82fd4f
commit 5da6c09f68
6 changed files with 32 additions and 15 deletions

View File

@ -1,8 +0,0 @@
-- Place your SQL code here
-- Auto-generated SQL script #202406101036
INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
VALUES ('Worker','workerRelatives','*','ALLOW','ROLE','hr');
INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
VALUES ('Worker','workerIrpf','*','ALLOW','ROLE','hr');
INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
VALUES ('Worker','disabilityGrade','*','ALLOW','ROLE','hr');

View File

@ -0,0 +1,15 @@
ALTER TABLE vn.workerRelatives DROP FOREIGN KEY workerRelatives_disabilityGradeFk;
ALTER TABLE vn.workerRelatives DROP FOREIGN KEY workerRelatives_workerFk;
RENAME TABLE `vn`.`workerRelatives` TO `vn`.`workerRelative`;
ALTER TABLE vn.workerRelative ADD CONSTRAINT `workerRelatives_disabilityGradeFk` FOREIGN KEY (`disabilityGradeFk`) REFERENCES `disabilityGrade` (`id`) ON UPDATE CASCADE;
ALTER TABLE vn.workerRelative ADD CONSTRAINT `workerRelatives_workerFk` FOREIGN KEY (`workerFk`) REFERENCES `workerIrpf` (`workerFk`) ON DELETE CASCADE ON UPDATE CASCADE;
INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
VALUES
('Worker','workerRelative','*','ALLOW','ROLE','hr'),
('Worker','workerIrpf','*','ALLOW','ROLE','hr'),
('Worker','disabilityGrade','*','ALLOW','ROLE','hr');

View File

@ -131,7 +131,7 @@
"DisabilityGrade": { "DisabilityGrade": {
"dataSource": "vn" "dataSource": "vn"
}, },
"WorkerRelatives": { "WorkerRelative": {
"dataSource": "vn" "dataSource": "vn"
}, },
"MedicalReview": { "MedicalReview": {

View File

@ -22,7 +22,7 @@
"disabilityGradeFk": { "disabilityGradeFk": {
"type" : "number" "type" : "number"
}, },
"isDependent": { "isDependend": {
"type" : "number" "type" : "number"
}, },
"familySituation": { "familySituation": {

View File

@ -1,10 +1,10 @@
{ {
"name": "WorkerRelatives", "name": "WorkerRelative",
"description": "Model 145 IRPF", "description": "Model 145 IRPF",
"base": "VnModel", "base": "VnModel",
"options": { "options": {
"mysql": { "mysql": {
"table": "workerRelatives" "table": "workerRelative"
} }
}, },
"properties": { "properties": {
@ -31,7 +31,7 @@
"isDependend": { "isDependend": {
"type" : "boolean" "type" : "boolean"
}, },
"islointCustody": { "isJointCustody": {
"type" : "boolean" "type" : "boolean"
}, },
"updated": { "updated": {
@ -46,7 +46,7 @@
}, },
"worker": { "worker": {
"type": "belongsTo", "type": "belongsTo",
"model": "WorkerIrpf", "model": "VnUser",
"foreignKey": "workerFK" "foreignKey": "workerFK"
} }
} }

View File

@ -135,6 +135,16 @@
"type": "hasMany", "type": "hasMany",
"model": "WorkerTimeControlMail", "model": "WorkerTimeControlMail",
"foreignKey": "workerFk" "foreignKey": "workerFk"
},
"irpf": {
"type": "hasMany",
"model": "WorkerIrpf",
"foreignKey": "workerFk"
},
"workerRelative": {
"type": "hasMany",
"model": "WorkerRelative",
"foreignKey": "workerFK"
} }
}, },
"acls": [ "acls": [