diff --git a/hotel_calendar/static/src/js/views/calendar/hotel_calendar_renderer.js b/hotel_calendar/static/src/js/views/calendar/hotel_calendar_renderer.js index 94f7cb35c..065c6ecb5 100644 --- a/hotel_calendar/static/src/js/views/calendar/hotel_calendar_renderer.js +++ b/hotel_calendar/static/src/js/views/calendar/hotel_calendar_renderer.js @@ -53,7 +53,8 @@ var HotelCalendarView = AbstractRenderer.extend({ if (days === 'month') { days = date_begin.daysInMonth(); } - var date_end = date_begin.clone().add(days, 'd').set({'hour': 23, 'minute': 59, 'second': 59}).clone().utc(); + var date_end = date_begin.clone().add(days+1, 'd').set({'hour': 23, 'minute': 59, 'second': 59}).clone().utc(); + return [date_begin, date_end]; }, diff --git a/hotel_calendar/static/src/lib/hcalendar/js/hcalendar.js b/hotel_calendar/static/src/lib/hcalendar/js/hcalendar.js index 1f451aeef..0cfece543 100644 --- a/hotel_calendar/static/src/lib/hcalendar/js/hcalendar.js +++ b/hotel_calendar/static/src/lib/hcalendar/js/hcalendar.js @@ -1792,41 +1792,36 @@ HotelCalendar.prototype = { reserv._html.style.lineHeight = `${divHeight}px`; reserv._html.style.fontSize = `${fontHeight}px`; reserv._html.style.left = `${boundsInit.left-etableOffset.left+2}px`; - reserv._html.style.width = `${(boundsEnd.left-boundsInit.left)+boundsEnd.width-4}px`; + reserv._html.style.width = `${(boundsEnd.left-boundsInit.left)+boundsEnd.width-4}px`; if (reserv._drawModes[0] === 'soft-start') { has_changed = true; reserv._html.style.borderLeftWidth = '3px'; reserv._html.style.borderLeftStyle = 'double'; reserv._html.style.left = `${boundsInit.left-etableOffset.left}px`; reserv._html.style.width = `${(boundsEnd.left-boundsInit.left)+boundsEnd.width-2}px`; - console.log("PASA 11"); } else if (reserv.splitted && reserv.startDate.isSame(reserv.getUserData('realDates')[0], 'day')) { has_changed = true; reserv._html.style.borderLeftWidth = '0'; reserv._html.style.width = `${(boundsEnd.left-boundsInit.left)+boundsEnd.width-2}px`; - console.log("PASA 12"); - } else if (reserv.splitted) { - has_changed = true; - reserv._html.style.left = `${boundsInit.left-etableOffset.left-1}px`; - reserv._html.style.width = `${(boundsEnd.left-boundsInit.left)+boundsEnd.width+2}px`; - console.log("PASA 13"); } + if (reserv._drawModes[1] === 'soft-end') { + has_changed = true; reserv._html.style.borderRightWidth = '3px'; reserv._html.style.borderRightStyle = 'double'; - console.log("PASA 14"); reserv._html.style.width = `${(boundsEnd.left-boundsInit.left)+boundsEnd.width-2}px`; } else if (reserv.splitted && reserv.endDate.isSame(reserv.getUserData('realDates')[1], 'day')) { + has_changed = true; reserv._html.style.borderRightWidth = '0'; reserv._html.style.left = `${boundsInit.left-etableOffset.left-1}px`; reserv._html.style.width = `${(boundsEnd.left-boundsInit.left)+boundsEnd.width-1}px`; - console.log("PASA 15"); - } else if (reserv.splitted && !has_changed) { - reserv._html.style.left = `${boundsInit.left-etableOffset.left-1}px`; - reserv._html.style.width = `${(boundsEnd.left-boundsInit.left)+boundsEnd.width+2}px`; - console.log("PASA 16"); } - console.log(reserv.startDate.format('DD/MM/YYYY')) + + if (reserv.splitted && !has_changed) { + has_changed = true; + reserv._html.style.left = `${boundsInit.left-etableOffset.left-1}px`; + reserv._html.style.width = `${(boundsEnd.left-boundsInit.left)+boundsEnd.width+2}px`; + } } },