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

3870-models #975

Merged
carlosjr merged 9 commits from 3870-models into dev 2022-05-23 12:42:31 +00:00
Conversation 0 Commits 9 Files Changed 10 +38 -4
4 changed files with 38 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a043c5d346 - Show all commits

14
back/models/machine-worker.json
View File

@ -17,11 +17,17 @@
"machineFk": {
"type": "number"
},
"inTimed": {
"type": "date"
"inTime": {
vicent marked this conversation as resolved Outdated
carlosjr commented 2022-05-20 08:56:19 +00:00
Outdated
Review
Copy Link

in timed, doesn't make sense, inTime can be what you are looking for.

in timed, doesn't make sense, inTime can be what you are looking for.
"type": "date",
"mysql": {
"columnName": "inTimed"
vicent marked this conversation as resolved Outdated
carlosjr commented 2022-05-20 08:58:08 +00:00
Outdated
Review
Copy Link

outTimed doesn't make sense, may be outTime or timeOut is what you are looking for.

outTimed doesn't make sense, may be outTime or timeOut is what you are looking for.
}
},
"outTimed": {
"type": "date"
"outTime": {
"type": "date",
"mysql": {
"columnName": "outTimed"
}
}
}
}

3
modules/worker/back/model-config.json
View File

@ -20,6 +20,9 @@
"EducationLevel": {
"dataSource": "vn"
},
"Sector": {
"dataSource": "vn"
},
"WorkCenter": {
"dataSource": "vn"
},

20
modules/worker/back/models/sector.json Normal file
View File

@ -0,0 +1,20 @@
{
"name": "Sector",
"base": "VnModel",
"options": {
"mysql": {
"table": "sector"
}
},
"properties": {
"id": {
"type": "number",
"id": true,
"description": "Identifier"
},
"description": {
"type": "string",
"required": true
}
}
}

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

@ -84,6 +84,11 @@
"type": "hasMany",
"model": "WorkerTeamCollegues",
"foreignKey": "workerFk"
},
"sector": {
"type": "belongsTo",
"model": "Sector",
"foreignKey": "sectorFk"
}
}
}