Merge pull request 'refs #7529 back models acls' (!2563) from 7529-workerPIT into dev
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2563 Reviewed-by: Alex Moreno <alexm@verdnatura.es>
This commit is contained in:
commit
d46683cd31
|
@ -4008,14 +4008,17 @@ INSERT IGNORE INTO pbx.queueMember
|
||||||
UPDATE vn.department SET pbxQueue = '1000' WHERE name = "CAMARA";
|
UPDATE vn.department SET pbxQueue = '1000' WHERE name = "CAMARA";
|
||||||
UPDATE vn.department SET pbxQueue = '2000' WHERE name = "VENTAS";
|
UPDATE vn.department SET pbxQueue = '2000' WHERE name = "VENTAS";
|
||||||
|
|
||||||
|
INSERT INTO vn.workerRelatives (workerFk, isDescendant, disabilityGradeFk, birthed, adoptionYear, isDependend, isJointCustody, updated)
|
||||||
|
VALUES
|
||||||
|
(1106, 1, NULL, 0, NULL, 0, 0, '2024-10-29 08:42:44.000');
|
||||||
INSERT INTO vn.routeAction (id, name, price, isMainlineDelivered) VALUES(1, 'Pintar traje', 50.00, 0);
|
INSERT INTO vn.routeAction (id, name, price, isMainlineDelivered) VALUES(1, 'Pintar traje', 50.00, 0);
|
||||||
INSERT INTO vn.routeComplement (id, dated, workerFk, price, routeActionFk) VALUES(1, util.VN_CURDATE(), 9, 50.00, 1);
|
INSERT INTO vn.routeComplement (id, dated, workerFk, price, routeActionFk) VALUES(1, util.VN_CURDATE(), 9, 50.00, 1);
|
||||||
|
|
||||||
|
|
||||||
INSERT INTO srt.buffer (id, x, y, `size`, `length`, stateFk, typeFk, isActive, code, stratus, hasWorkerWaiting, reserve, routeFk, dayMinute, lastUnloaded, hasStrapper, typeDefaultFk, motors, editorFk)
|
INSERT INTO srt.buffer (id, x, y, `size`, `length`, stateFk, typeFk, isActive, code, stratus, hasWorkerWaiting, reserve, routeFk, dayMinute, lastUnloaded, hasStrapper, typeDefaultFk, motors, editorFk)
|
||||||
VALUES (0, 0, 0, 0, NULL, 3, 1, 0, 'ENT', 0, 0, NULL, NULL, NULL, NULL, 0, 1, 1, NULL),
|
VALUES (0, 0, 0, 0, NULL, 3, 1, 0, 'ENT', 0, 0, NULL, NULL, NULL, NULL, 0, 1, 1, NULL),
|
||||||
(1, 0, 9900, 0, NULL, 1, 0, 0, 'NOK', 0, 0, NULL, NULL, NULL, NULL, 0, 1, 1, NULL),
|
(1, 0, 9900, 0, NULL, 1, 0, 0, 'NOK', 0, 0, NULL, NULL, NULL, NULL, 0, 1, 1, NULL),
|
||||||
(2, 0, 0, 450, 13000, 1, 0, 1, '01A', 1, 1, NULL, NULL, NULL, NULL, 0, 1, 1, NULL),
|
(2, 0, 0, 450, 13000, 1, 0, 1, '01A', 1, 1, NULL, NULL, NULL, NULL, 0, 1, 1, NULL),
|
||||||
(3, 1400, 0, 450, 13000, 1, 0, 1, '01B', 1, 0, NULL, NULL, NULL, NULL, 0, 1, 1, NULL),
|
(3, 1400, 0, 450, 13000, 1, 0, 1, '01B', 1, 0, NULL, NULL, NULL, NULL, 0, 1, 1, NULL),
|
||||||
(4, 0, 500, 500, 13000, 1, 4, 1, '02A', 2, 1, NULL, NULL, NULL, NULL, 1, 4, 13, NULL),
|
(4, 0, 500, 500, 13000, 1, 4, 1, '02A', 2, 1, NULL, NULL, NULL, NULL, 1, 4, 13, NULL),
|
||||||
(5, 1400, 500, 500, 13000, 1, 4, 1, '02B', 2, 1, NULL, NULL, NULL, NULL, 1, 4, 13, NULL),
|
(5, 1400, 500, 500, 13000, 1, 4, 1, '02B', 2, 1, NULL, NULL, NULL, NULL, 1, 4, 13, NULL),
|
||||||
|
@ -4026,9 +4029,11 @@ INSERT INTO srt.buffer (id, x, y, `size`, `length`, stateFk, typeFk, isActive, c
|
||||||
(10, 0, 2000, 500, 13000, 1, 1, 1, '05A', 5, 0, NULL, NULL, NULL, NULL, 0, 1, 1, NULL);
|
(10, 0, 2000, 500, 13000, 1, 1, 1, '05A', 5, 0, NULL, NULL, NULL, NULL, 0, 1, 1, NULL);
|
||||||
|
|
||||||
|
|
||||||
INSERT IGNORE INTO vn.saySimpleCountry (countryFk, channel)
|
INSERT IGNORE INTO vn.saySimpleCountry (countryFk, channel)
|
||||||
VALUES (19, '1169'),
|
VALUES (19, '1169'),
|
||||||
(8, '1183');
|
(8, '1183');
|
||||||
|
|
||||||
INSERT IGNORE INTO vn.saySimpleConfig (url, defaultChannel)
|
INSERT IGNORE INTO vn.saySimpleConfig (url, defaultChannel)
|
||||||
VALUES ('saysimle-url-mock', 1320);
|
VALUES ('saysimle-url-mock', 1320);INSERT INTO vn.workerIrpf (workerFk,spouseNif,geographicMobilityDate)
|
||||||
|
VALUES
|
||||||
|
(1106,'26493101E','2019-09-20');
|
||||||
|
|
|
@ -0,0 +1,15 @@
|
||||||
|
ALTER TABLE vn.workerRelatives DROP FOREIGN KEY workerRelatives_disabilityGradeFk;
|
||||||
|
ALTER TABLE vn.workerRelatives DROP FOREIGN KEY workerRelatives_workerFk;
|
||||||
|
|
||||||
|
INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
|
||||||
|
VALUES
|
||||||
|
('WorkerRelative','updateAttributes','*','ALLOW','ROLE','hr'),
|
||||||
|
('WorkerRelative','crud','WRITE','ALLOW','ROLE','hr'),
|
||||||
|
('WorkerRelative','findById','*','ALLOW','ROLE','hr'),
|
||||||
|
('WorkerIrpf','updateAttributes','*','ALLOW','ROLE','hr'),
|
||||||
|
('WorkerIrpf','crud','*','ALLOW','ROLE','hr'),
|
||||||
|
('WorkerRelative','findById','*','ALLOW','ROLE','hr'),
|
||||||
|
('DisabilityGrade','updateAttributes','*','ALLOW','ROLE','hr'),
|
||||||
|
('DisabilityGrade','crud','*','ALLOW','ROLE','hr'),
|
||||||
|
('DisabilityGrade','findById','*','ALLOW','ROLE','hr');
|
||||||
|
|
|
@ -125,6 +125,15 @@
|
||||||
"Locker": {
|
"Locker": {
|
||||||
"dataSource": "vn"
|
"dataSource": "vn"
|
||||||
},
|
},
|
||||||
|
"WorkerIrpf": {
|
||||||
|
"dataSource": "vn"
|
||||||
|
},
|
||||||
|
"DisabilityGrade": {
|
||||||
|
"dataSource": "vn"
|
||||||
|
},
|
||||||
|
"WorkerRelative": {
|
||||||
|
"dataSource": "vn"
|
||||||
|
},
|
||||||
"MedicalReview": {
|
"MedicalReview": {
|
||||||
"dataSource": "vn"
|
"dataSource": "vn"
|
||||||
},
|
},
|
||||||
|
|
|
@ -0,0 +1,18 @@
|
||||||
|
{
|
||||||
|
"name": "DisabilityGrade",
|
||||||
|
"base": "VnModel",
|
||||||
|
"options": {
|
||||||
|
"mysql": {
|
||||||
|
"table": "disabilityGrade"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"properties": {
|
||||||
|
"id": {
|
||||||
|
"id": true,
|
||||||
|
"type": "number"
|
||||||
|
},
|
||||||
|
"description": {
|
||||||
|
"type": "string"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,55 @@
|
||||||
|
{
|
||||||
|
"name": "WorkerIrpf",
|
||||||
|
"description": "Model 145 IRPF",
|
||||||
|
"base": "VnModel",
|
||||||
|
"options": {
|
||||||
|
"mysql": {
|
||||||
|
"table": "workerIrpf"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"properties": {
|
||||||
|
"workerFk": {
|
||||||
|
"type": "number",
|
||||||
|
"id": 1,
|
||||||
|
"description": "Identifier"
|
||||||
|
},
|
||||||
|
"spouseNif": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"geographicMobilityDate": {
|
||||||
|
"type": "date"
|
||||||
|
},
|
||||||
|
"disabilityGradeFk": {
|
||||||
|
"type" : "number"
|
||||||
|
},
|
||||||
|
"isDependend": {
|
||||||
|
"type" : "number"
|
||||||
|
},
|
||||||
|
"familySituation": {
|
||||||
|
"type" : "number"
|
||||||
|
},
|
||||||
|
"spousePension": {
|
||||||
|
"type" : "number"
|
||||||
|
},
|
||||||
|
"childPension": {
|
||||||
|
"type" : "number"
|
||||||
|
},
|
||||||
|
"hasHousingPaymentBefore": {
|
||||||
|
"type" : "number"
|
||||||
|
},
|
||||||
|
"hasHousingPaymentAfter": {
|
||||||
|
"type" : "number"
|
||||||
|
},
|
||||||
|
"updated": {
|
||||||
|
"type" : "date"
|
||||||
|
}
|
||||||
|
|
||||||
|
},
|
||||||
|
"relations": {
|
||||||
|
"disabilityGrade": {
|
||||||
|
"type": "belongsTo",
|
||||||
|
"model": "disabilityGrade",
|
||||||
|
"foreignKey": "disabilityGradeFk"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,53 @@
|
||||||
|
{
|
||||||
|
"name": "WorkerRelative",
|
||||||
|
"description": "Model 145 IRPF",
|
||||||
|
"base": "VnModel",
|
||||||
|
"options": {
|
||||||
|
"mysql": {
|
||||||
|
"table": "workerRelatives"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"properties": {
|
||||||
|
"id": {
|
||||||
|
"type": "number",
|
||||||
|
"id": true,
|
||||||
|
"description": "Identifier"
|
||||||
|
},
|
||||||
|
"workerFk": {
|
||||||
|
"type": "number"
|
||||||
|
},
|
||||||
|
"isDescendant": {
|
||||||
|
"type": "number"
|
||||||
|
},
|
||||||
|
"disabilityGradeFk": {
|
||||||
|
"type" : "number"
|
||||||
|
},
|
||||||
|
"birthed": {
|
||||||
|
"type" : "number"
|
||||||
|
},
|
||||||
|
"adoptionYear": {
|
||||||
|
"type" : "number"
|
||||||
|
},
|
||||||
|
"isDependend": {
|
||||||
|
"type" : "boolean"
|
||||||
|
},
|
||||||
|
"isJointCustody": {
|
||||||
|
"type" : "boolean"
|
||||||
|
},
|
||||||
|
"updated": {
|
||||||
|
"type" : "date"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"relations": {
|
||||||
|
"disabilityGrade": {
|
||||||
|
"type": "belongsTo",
|
||||||
|
"model": "disabilityGrade",
|
||||||
|
"foreignKey": "disabilityGradeFk"
|
||||||
|
},
|
||||||
|
"worker": {
|
||||||
|
"type": "belongsTo",
|
||||||
|
"model": "VnUser",
|
||||||
|
"foreignKey": "workerFK"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -132,6 +132,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": [
|
||||||
|
@ -317,4 +327,4 @@
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue