From 89dc8e27e037a856474fef9c0363f88d14e58107 Mon Sep 17 00:00:00 2001 From: Bernat Exposito Domenech Date: Tue, 4 Feb 2020 11:20:05 +0100 Subject: [PATCH] update models --- modules/worker/back/model-config.json | 4 ++-- .../{holiday-detail.json => calendar-holidays-name.json} | 6 +++--- .../{holiday-type.json => calendar-holidays-type.json} | 4 ++-- modules/worker/back/models/holiday.json | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) rename modules/worker/back/models/{holiday-detail.json => calendar-holidays-name.json} (79%) rename modules/worker/back/models/{holiday-type.json => calendar-holidays-type.json} (84%) diff --git a/modules/worker/back/model-config.json b/modules/worker/back/model-config.json index 4948231b9..5b9136f68 100644 --- a/modules/worker/back/model-config.json +++ b/modules/worker/back/model-config.json @@ -8,10 +8,10 @@ "Holiday": { "dataSource": "vn" }, - "HolidayDetail": { + "CalendarHolidaysName": { "dataSource": "vn" }, - "HolidayType": { + "CalendarHolidaysType": { "dataSource": "vn" }, "WorkCenter": { diff --git a/modules/worker/back/models/holiday-detail.json b/modules/worker/back/models/calendar-holidays-name.json similarity index 79% rename from modules/worker/back/models/holiday-detail.json rename to modules/worker/back/models/calendar-holidays-name.json index 86874a02e..d04ef9c74 100644 --- a/modules/worker/back/models/holiday-detail.json +++ b/modules/worker/back/models/calendar-holidays-name.json @@ -1,9 +1,9 @@ { - "name": "HolidayDetail", + "name": "CalendarHolidaysName", "base": "VnModel", "options": { "mysql": { - "table": "holidayDetail" + "table": "calendarHolidaysName" } }, "properties": { @@ -11,7 +11,7 @@ "id": true, "type": "Number" }, - "description": { + "name": { "type": "String" } }, diff --git a/modules/worker/back/models/holiday-type.json b/modules/worker/back/models/calendar-holidays-type.json similarity index 84% rename from modules/worker/back/models/holiday-type.json rename to modules/worker/back/models/calendar-holidays-type.json index 6e40a62c7..a83dbc13c 100644 --- a/modules/worker/back/models/holiday-type.json +++ b/modules/worker/back/models/calendar-holidays-type.json @@ -1,9 +1,9 @@ { - "name": "HolidayType", + "name": "CalendarHolidaysType", "base": "VnModel", "options": { "mysql": { - "table": "holidayType" + "table": "calendarHolidaysType" } }, "properties": { diff --git a/modules/worker/back/models/holiday.json b/modules/worker/back/models/holiday.json index 678910f0a..a820c0d51 100644 --- a/modules/worker/back/models/holiday.json +++ b/modules/worker/back/models/holiday.json @@ -22,12 +22,12 @@ "relations": { "detail": { "type": "belongsTo", - "model": "HolidayDetail", + "model": "CalendarHolidaysName", "foreignKey": "holidayDetailFk" }, "type": { "type": "belongsTo", - "model": "HolidayType", + "model": "CalendarHolidaysType", "foreignKey": "holidayTypeFk" }, "workCenter": {