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

[UPD] Task 985 - update total occupation by room classes and room types

Browse Source
This commit is contained in:
Pablo
2019-08-02 10:12:17 +02:00
parent d951f99eaa
commit 7bac0ec4c2
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -602,6 +602,8 @@ HotelCalendar.prototype = {
// Two-Step filter: Scrollbar mistake // Two-Step filter: Scrollbar mistake
this.options.room_classes = []; this.options.room_classes = [];
this.options.room_types = []; this.options.room_types = [];
this._roomCapacityTotal = 0;
this._roomCapacities = {};
// 1.1 Filter rooms // 1.1 Filter rooms
for (var r of this.options.rooms) { for (var r of this.options.rooms) {
r._active = this._in_domain(r, this._domains[HotelCalendar.DOMAIN.ROOMS]); r._active = this._in_domain(r, this._domains[HotelCalendar.DOMAIN.ROOMS]);
@@ -610,19 +612,22 @@ HotelCalendar.prototype = {
// 1.2 Filter room classes used in occupation rows // 1.2 Filter room classes used in occupation rows
if (this.options.room_classes.indexOf(r.type) === -1) { if (this.options.room_classes.indexOf(r.type) === -1) {
this.options.room_classes.push(r.type); this.options.room_classes.push(r.type);
this._roomCapacities[r.type] = 0;
} }
// 1.3 Filter room types used in pricelist rows // 1.3 Filter room types used in pricelist rows
if (this.options.room_types.indexOf(r._userData.room_type_id) === -1) { if (this.options.room_types.indexOf(r._userData.room_type_id) === -1) {
this.options.room_types.push(r._userData.room_type_id); this.options.room_types.push(r._userData.room_type_id);
} }
// 1.4 Update total rooms for calculate occupancy
this._roomCapacityTotal += 1;
this._roomCapacities[r.type] += 1;
} else { } else {
r._html.classList.add('hcal-hidden'); r._html.classList.add('hcal-hidden');
} }
} }
// Hide all the rows corresponding to occupation and prices // Hide all the rows corresponding to occupation and prices
$("[id^=ROW_DETAIL_FREE_TYPE]").addClass('hcal-hidden'); $("tr[id^=ROW_DETAIL_FREE_TYPE]").addClass('hcal-hidden');
$("[id^=ROW_DETAIL_PRICE_ROOM]").addClass('hcal-hidden'); $("tr[id^=ROW_DETAIL_PRICE_ROOM]").addClass('hcal-hidden');
// TODO: update OCCUPATION
this._calcViewHeight(); this._calcViewHeight();
@@ -911,7 +916,8 @@ HotelCalendar.prototype = {
if (!day) { return false; } if (!day) { return false; }
var num_rooms = this._roomCapacities[room_type]; var num_rooms = this._roomCapacities[room_type];
num_rooms -= _.reduce(this.getDayRoomTypeReservations(day, room_type), function(memo, r){ return memo + ((r.room && r.room.shared)?r.getTotalPersons(false):1); }, 0); num_rooms -= _.reduce(this.getDayRoomTypeReservations(day, room_type), function(memo, r)
{ var count = ((r.room && r.room.shared)?r.getTotalPersons(false):1); if (r.room._active === false) count = 0; return memo + count; }, 0);
return num_rooms; return num_rooms;
}, },
@@ -920,7 +926,8 @@ HotelCalendar.prototype = {
if (!day) { return false; } if (!day) { return false; }
var num_rooms = this._roomCapacityTotal; var num_rooms = this._roomCapacityTotal;
num_rooms -= _.reduce(this.getReservationsByDay(day, true), function(memo, r){ return memo + ((r.room && r.room.shared)?r.getTotalPersons(false):1); }, 0); num_rooms -= _.reduce(this.getReservationsByDay(day, true), function(memo, r)
{ var count = ((r.room && r.room.shared)?r.getTotalPersons(false):1); if (r.room._active === false) count = 0; return memo + count; }, 0);
return num_rooms; return num_rooms;
}, },