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

refs #6553 changes models #2522

Open
carlossa wants to merge 38 commits from 6553-workerBusiness into dev
pull from: 6553-workerBusiness
merge into: verdnatura:dev
Conversation 0 Commits 38 Files Changed 11 +8 -2
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 024ab8602d - Show all commits

10
modules/worker/back/models/worker.json
View File

@ -106,6 +106,11 @@
"model": "WorkerDepartment", "model": "WorkerDepartment",
"foreignKey": "id" "foreignKey": "id"
}, },
"currentBusiness": {
"type": "belongsTo",
"model": "Business",
"foreignKey": "businessFk"
},
"collegues": { "collegues": {
"type": "hasMany", "type": "hasMany",
"model": "WorkerTeamCollegues", "model": "WorkerTeamCollegues",
@ -344,7 +349,8 @@
"educationLevelFk", "educationLevelFk",
"originCountryFk", "originCountryFk",
"maritalStatus", "maritalStatus",
"SSN" "SSN",
"businessFk"
], ],
"include": [ "include": [
{ {
@ -357,7 +363,7 @@
} }
}, },
{ {
"relation": "business", "relation": "currentBusiness",
"scope": { "scope": {
"fields": [ "fields": [
"id", "id",