From 7bac0ec4c280746221e60cae0cb5b93caeacb047 Mon Sep 17 00:00:00 2001
From: Pablo <pabloqb@gmail.com>
Date: Fri, 2 Aug 2019 10:12:17 +0200
Subject: [PATCH] [UPD] Task 985 - update total occupation by room classes and
 room types

---
 .../static/src/lib/hcalendar/js/hcalendar.js    | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/hotel_calendar/static/src/lib/hcalendar/js/hcalendar.js b/hotel_calendar/static/src/lib/hcalendar/js/hcalendar.js
index 9ac4953ae..a92c5e16d 100644
--- a/hotel_calendar/static/src/lib/hcalendar/js/hcalendar.js
+++ b/hotel_calendar/static/src/lib/hcalendar/js/hcalendar.js
@@ -602,6 +602,8 @@ HotelCalendar.prototype = {
     // Two-Step filter: Scrollbar mistake
     this.options.room_classes = [];
     this.options.room_types = [];
+    this._roomCapacityTotal = 0;
+    this._roomCapacities = {};
     // 1.1 Filter rooms
     for (var r of this.options.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
         if (this.options.room_classes.indexOf(r.type) === -1) {
             this.options.room_classes.push(r.type);
+            this._roomCapacities[r.type] = 0;
         }
         // 1.3 Filter room types used in pricelist rows
         if (this.options.room_types.indexOf(r._userData.room_type_id) === -1) {
             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 {
         r._html.classList.add('hcal-hidden');
       }
     }
     // Hide all the rows corresponding to occupation and prices
-    $("[id^=ROW_DETAIL_FREE_TYPE]").addClass('hcal-hidden');
-    $("[id^=ROW_DETAIL_PRICE_ROOM]").addClass('hcal-hidden');
-    // TODO: update OCCUPATION
+    $("tr[id^=ROW_DETAIL_FREE_TYPE]").addClass('hcal-hidden');
+    $("tr[id^=ROW_DETAIL_PRICE_ROOM]").addClass('hcal-hidden');
 
     this._calcViewHeight();
 
@@ -911,7 +916,8 @@ HotelCalendar.prototype = {
     if (!day) { return false; }
 
     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;
   },
 
@@ -920,7 +926,8 @@ HotelCalendar.prototype = {
     if (!day) { return false; }
 
     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;
   },