audrius/pms
1
0
Fork 1
mirror of https://github.com/OCA/pms.git synced 2025-01-29 00:17:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

[IMP] Calendar Dates & Splitted Calcs

Browse Source
This commit is contained in:
Alexandre Díaz
2019-01-05 21:37:12 +01:00
parent 328883ca83
commit 9f6f712976
2 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
hotel_calendar/static/src/js/views/calendar/hotel_calendar_renderer.js
View File

@@ -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];
},

25
hotel_calendar/static/src/lib/hcalendar/js/hcalendar.js
View File

@@ -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`;
}
}
},