diff --git a/back/models/machine-worker.json b/back/models/machine-worker.json index 61cde223f7..2244a533fa 100644 --- a/back/models/machine-worker.json +++ b/back/models/machine-worker.json @@ -17,11 +17,17 @@ "machineFk": { "type": "number" }, - "inTimed": { - "type": "date" + "inTime": { + "type": "date", + "mysql": { + "columnName": "inTimed" + } }, - "outTimed": { - "type": "date" + "outTime": { + "type": "date", + "mysql": { + "columnName": "outTimed" + } } } } diff --git a/modules/worker/back/model-config.json b/modules/worker/back/model-config.json index c155e331de..c6b984bd21 100644 --- a/modules/worker/back/model-config.json +++ b/modules/worker/back/model-config.json @@ -20,6 +20,9 @@ "EducationLevel": { "dataSource": "vn" }, + "Sector": { + "dataSource": "vn" + }, "WorkCenter": { "dataSource": "vn" }, diff --git a/modules/worker/back/models/sector.json b/modules/worker/back/models/sector.json new file mode 100644 index 0000000000..8bd5e773f3 --- /dev/null +++ b/modules/worker/back/models/sector.json @@ -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 + } + } +} \ No newline at end of file diff --git a/modules/worker/back/models/worker.json b/modules/worker/back/models/worker.json index df75d871e4..0f19ed4ce0 100644 --- a/modules/worker/back/models/worker.json +++ b/modules/worker/back/models/worker.json @@ -84,6 +84,11 @@ "type": "hasMany", "model": "WorkerTeamCollegues", "foreignKey": "workerFk" + }, + "sector": { + "type": "belongsTo", + "model": "Sector", + "foreignKey": "sectorFk" } } } \ No newline at end of file