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

Merge pull request #94 from hootel/pr_fix_calendar_issues

Browse Source 
[11.0][FIX] Calendar reservation not draw reservations properly
This commit is contained in:
Darío Lodeiros
2019-03-06 10:14:30 +01:00
committed by GitHub
parent 12a49678a3 19a9a23c73
commit d3164f7a35
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -598,6 +598,8 @@ HotelCalendar.prototype = {
//==== ROOMS
_filterRooms: function() {
// Two-Step filter: Scrollbar mistake
// 1. Filter rooms
for (var r of this.options.rooms) {
r._active = this._in_domain(r, this._domains[HotelCalendar.DOMAIN.ROOMS]);
if (r._active) {
@@ -605,14 +607,21 @@ HotelCalendar.prototype = {
} else {
r._html.classList.add('hcal-hidden');
}
if (r.id in this._reservationsMap) {
for (var reserv of this._reservationsMap[r.id]) {
this._updateReservation(reserv, !r._active);
}
}
}
this._calcViewHeight();
// 2. Update Reservations
_.defer(function(self){
for (var r of self.options.rooms) {
var isHidden = r._html.classList.contains('hcal-hidden');
if (r.id in self._reservationsMap) {
for (var reserv of self._reservationsMap[r.id]) {
self._updateReservation(reserv, isHidden);
}
}
}
}, this);
//_.defer(function(){ this._updateReservationOccupation() }.bind(this));
},