Merge branch '2040_view_holiday' of verdnatura/salix into dev

modules/worker/back/model-config.json

@@ -8,10 +8,10 @@
     "Holiday": {
         "dataSource": "vn"
     },
-    "HolidayDetail": {
+    "CalendarHolidaysName": {
         "dataSource": "vn"
     },
-    "HolidayType": {
+    "CalendarHolidaysType": {
         "dataSource": "vn"
     },
     "WorkCenter": {

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"
 		}
 	},

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": {

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": {