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

Merge branch '2188-holiday_view' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Carlos Jimenez Ruiz 2020-03-12 10:26:54 +00:00 committed by Gitea
parent ac2b04d117 6798f9709c
commit c0a806f751
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/worker/back/methods/holiday/getByWarehouse.js
View File

@ -23,12 +23,12 @@ module.exports = Self => {
beginningYear.setHours(0, 0, 0, 0); beginningYear.setHours(0, 0, 0, 0);
let holidays = await Self.rawSql( let holidays = await Self.rawSql(
`SELECT lh.dated, chn.name, cht.name, w.id `SELECT clh.dated, chn.name, cht.name, w.id
FROM vn.holiday lh FROM vn.calendarHolidays clh
JOIN vn.workCenter w ON w.id = lh.workcenterFk JOIN vn.workCenter w ON w.id = clh.workcenterFk
LEFT JOIN vn.calendarHolidaysName chn ON chn.id = lh.holidayDetailFk LEFT JOIN vn.calendarHolidaysName chn ON chn.id = clh.calendarHolidaysNameFk
LEFT JOIN vn.calendarHolidaysType cht ON cht.id = lh.holidayTypeFk LEFT JOIN vn.calendarHolidaysType cht ON cht.id = clh.calendarHolidaysTypeFk
WHERE w.warehouseFk = ? AND lh.dated >= ?`, [warehouseFk, beginningYear]); WHERE w.warehouseFk = ? AND clh.dated >= ?`, [warehouseFk, beginningYear]);
return holidays.map(holiday => { return holidays.map(holiday => {
holiday.dated = new Date(holiday.dated); holiday.dated = new Date(holiday.dated);

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

@ -5,7 +5,7 @@
"Department": { "Department": {
"dataSource": "vn" "dataSource": "vn"
}, },
"Holiday": { "CalendarHoliday": {
"dataSource": "vn" "dataSource": "vn"
}, },
"CalendarHolidaysName": { "CalendarHolidaysName": {

0
modules/worker/back/models/holiday.js → modules/worker/back/models/calendar-holiday.js
View File

8
modules/worker/back/models/holiday.json → modules/worker/back/models/calendar-holiday.json
View File

@ -1,17 +1,17 @@
{ {
"name": "Holiday", "name": "CalendarHoliday",
"base": "VnModel", "base": "VnModel",
"options": { "options": {
"mysql": { "mysql": {
"table": "holiday" "table": "calendarHolidays"
} }
}, },
"properties": { "properties": {
"holidayDetailFk": { "calendarHolidaysNameFk": {
"id": true, "id": true,
"type": "Number" "type": "Number"
}, },
"holidayTypeFk": { "calendarHolidaysTypeFk": {
"id": true, "id": true,
"type": "Number" "type": "Number"
}, },

2
modules/worker/back/models/work-center.json
View File

@ -23,7 +23,7 @@
}, },
"holidays": { "holidays": {
"type": "hasMany", "type": "hasMany",
"model": "Holiday", "model": "CalendarHoliday",
"foreignKey": "workCenterFk" "foreignKey": "workCenterFk"
} }
}, },