From 50ee781e9c01def669fb7a38d145d544b50c37ad Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Fri, 12 Apr 2019 08:27:06 -0400
Subject: #806 allow viewing events for caught up montage, auto expand sidebar
 option on load

---
 www/js/MontageCtrl.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'www/js/MontageCtrl.js')

diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js
index 3871d42c..4a5e03e6 100644
--- a/www/js/MontageCtrl.js
+++ b/www/js/MontageCtrl.js
@@ -595,7 +595,7 @@ angular.module('zmApp.controllers')
   
       };
 
-    function getEventStatus(monitor) {
+    function getEventStatus(monitor, expandSidebar) {
         ld = NVR.getLogin();
 
       //  https:///zm/api/events/index/MonitorId=:2.json?sort=StartTime&direction=desc&limit=1
@@ -634,6 +634,9 @@ angular.module('zmApp.controllers')
             var mid = monitor.Monitor.Id;
             if (res.events.length == 0) res = undefined;
             monitor.Monitor.lastEvent = res;
+            if (monitor.Monitor.lastEvent && expandSidebar) {
+                monitor.Monitor.showSidebar = true;
+            }
 
         },
         function (err) {
@@ -643,7 +646,7 @@ angular.module('zmApp.controllers')
 
     }
 
-    function loadEventStatus() {
+    function loadEventStatus(expandSidebars) {
        // console.log ("LOADING EVENT STATUS");
 
        if (!NVR.getLogin().enableMontageOverlays) {
@@ -655,7 +658,7 @@ angular.module('zmApp.controllers')
             if ($scope.MontageMonitors[i].Monitor.Enabled == 0 ||
             $scope.MontageMonitors[i].Monitor.listDisplay == 'noshow' ||
             $scope.MontageMonitors[i].Monitor.Function == 'None') continue;
-            getEventStatus($scope.MontageMonitors[i]);
+            getEventStatus($scope.MontageMonitors[i], expandSidebars);
 
         }
 
@@ -1390,7 +1393,7 @@ angular.module('zmApp.controllers')
         //  console.log ("Refreshing Image...");
       }.bind(this), zm.alarmStatusTime);
 
-      loadEventStatus();
+      loadEventStatus(true);
       intervalHandleEventStatus = $interval(function () {
         loadEventStatus();
         //  console.log ("Refreshing Image...");
@@ -2210,7 +2213,7 @@ angular.module('zmApp.controllers')
         //  console.log ("Refreshing Image...");
       }.bind(this), zm.alarmStatusTime);
 
-      loadEventStatus();
+      loadEventStatus(true);
       intervalHandleEventStatus = $interval(function () {
         loadEventStatus();
         //  console.log ("Refreshing Image...");
-- 
cgit v1.2.3