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

[WIP] Calendar Styles

Browse Source
This commit is contained in:
Dario Lodeiros
2019-01-03 20:15:56 +01:00
parent 30ee50aeae
commit 328883ca83
2 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hotel_calendar/static/src/lib/hcalendar/css/hcalendar.css
View File

@@ -319,8 +319,8 @@
white-space: nowrap;
overflow: hidden;
z-index:8;
line-height: 17px !important;
vertical-align: middle !important;
vertical-align: middle;
display: table-cell;
}
.hcal-reservation:hover {
background-color: #4e97bf;

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

@@ -1784,28 +1784,49 @@ HotelCalendar.prototype = {
var etableOffset = this.etable.getBoundingClientRect();
reserv._html.style.top = `${boundsInit.top-etableOffset.top}px`;
reserv._html.style.top = `${boundsInit.top-etableOffset.top+2}px`;
var divHeight = (boundsEnd.bottom-etableOffset.top-4)-(boundsInit.top-etableOffset.top);
var fontHeight = divHeight/1.1;
if (fontHeight > 12) { fontHeight = 12; }
var fontHeight = 12;
var has_changed = false;
reserv._html.style.height = `${divHeight}px`;
reserv._html.style.lineHeight = `${divHeight+fontHeight/2.0}px`;
reserv._html.style.lineHeight = `${divHeight}px`;
reserv._html.style.fontSize = `${fontHeight}px`;
reserv._html.style.left = `${boundsInit.left-etableOffset.left}px`;
reserv._html.style.width = `${(boundsEnd.left-boundsInit.left)+boundsEnd.width-4}px`;
reserv._html.style.margin = `${2}px`;
reserv._html.style.left = `${boundsInit.left-etableOffset.left+2}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') {
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')) {
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'))
}
},