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

8267-devToTest #3270

Merged
alexm merged 131 commits from 8267-devToTest into test 2024-12-03 12:18:21 +00:00
Conversation 0 Commits 131 Files Changed 87 +7 -6
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e0e487859f - Show all commits

6
db/dump/fixtures.before.sql
View File

@ -4007,4 +4007,10 @@ 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.workerIrpf (workerFk,spouseNif,geographicMobilityDate)
VALUES
(1106,'26493101E','2019-09-20');

7
modules/worker/back/models/worker-irpf.json
View File

@ -10,7 +10,7 @@
"properties": { "properties": {
"workerFk": { "workerFk": {
"type": "number", "type": "number",
"id": true, "id": 1,
"description": "Identifier" "description": "Identifier"
}, },
"spouseNif": { "spouseNif": {
@ -50,11 +50,6 @@
"type": "belongsTo", "type": "belongsTo",
"model": "disabilityGrade", "model": "disabilityGrade",
"foreignKey": "disabilityGradeFk" "foreignKey": "disabilityGradeFk"
},
"worker": {
"type": "belongsTo",
"model": "VnUser",
"foreignKey": "workerFK"
} }
} }
} }