don't add alarm frames if 0

6 files changed, 25 insertions, 10 deletions

diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index b37b5f92..1fdac94a 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -1860,7 +1860,9 @@ angular.module('zmApp.controllers')
       //https://server/zm/api/events/consoleEvents/5%20minute.json
       var ld = NVR.getLogin();
 
-      var af = "/"+"AlarmFrames >=:" + (ld.enableAlarmCount ? ld.minAlarmCount : 0);
+      var af="";
+      if (ld.enableAlarmCount && ld.minAlarmCount )
+        af = "/AlarmFrames >=:" + ld.minAlarmCount ;
 
       if (ld.objectDetectionFilter) {
         af = af + '/'+'Notes REGEXP:detected:';
@@ -2981,7 +2983,7 @@ angular.module('zmApp.controllers')
       if ($rootScope.devWidth > $rootScope.devHeight) {
 
         if (ld.eventViewThumbsSize == 'large') {
-          return calculateAspectRatioFit(mw, mh, 0.9* $rootScope.devWidth, 1.5 * $rootScope.devHeight);
+          return calculateAspectRatioFit(mw, mh, 0.8* $rootScope.devWidth, 1.5 * $rootScope.devHeight);
   
         } else {
           return calculateAspectRatioFit(mw, mh, 0.5 * $rootScope.devWidth, 0.7 * $rootScope.devHeight);
diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js
index c62c2cf6..e91bea99 100644
--- a/www/js/EventModalCtrl.js
+++ b/www/js/EventModalCtrl.js
@@ -1510,7 +1510,8 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
       "/StartTime >:" + currentEvent.Event.StartTime +
       ($scope.followSameMonitor == '1' ? "/"+"MonitorId =:" + currentEvent.Monitor.Id : "") ;
       if ($scope.useFilters) {
-        nextEvent = nextEvent + "/"+"AlarmFrames >=:" + (loginData.enableAlarmCount ? loginData.minAlarmCount : 0);
+        if (loginData.enableAlarmCount && loginData.minAlarmCount)
+          nextEvent = nextEvent + "/"+"AlarmFrames >=:" + loginData.minAlarmCount;
       }
       nextEvent = nextEvent + ".json?sort=StartTime&direction=asc&limit=1"+$rootScope.authSession;
       
@@ -1520,7 +1521,8 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
       ($scope.followSameMonitor == '1' ? "/"+"MonitorId =:"+ currentEvent.Monitor.Id : "");
 
       if ($scope.useFilters) {
-        prevEvent = prevEvent + "/"+"AlarmFrames >=:" + (loginData.enableAlarmCount ? loginData.minAlarmCount : 0);
+        if (loginData.enableAlarmCount && loginData.minAlarmCount)
+          prevEvent = prevEvent + "/"+"AlarmFrames >=:" + loginData.minAlarmCount;
       }
       prevEvent = prevEvent + ".json?sort=StartTime&direction=desc&limit=1"+$rootScope.authSession;
 
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js
index c3500aee..41b38e8c 100644
--- a/www/js/MontageCtrl.js
+++ b/www/js/MontageCtrl.js
@@ -596,7 +596,8 @@ angular.module('zmApp.controllers')
 
         }
        
-        apiurl += "/"+"AlarmFrames >=:" + (ld.enableAlarmCount ? ld.minAlarmCount : 0);
+        if (ld.enableAlarmCount && ld.minAlarmCount)
+          apiurl += "/"+"AlarmFrames >=:" + ld.minAlarmCount;
         if (ld.objectDetectionFilter) {
           apiurl +='/'+'Notes REGEXP:detected:';
         }
diff --git a/www/js/MontageHistoryCtrl.js b/www/js/MontageHistoryCtrl.js
index 50ed1430..53a27b3c 100644
--- a/www/js/MontageHistoryCtrl.js
+++ b/www/js/MontageHistoryCtrl.js
@@ -264,7 +264,11 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
     function getNextSetHistory() {
 
       // grab events that start on or after the time 
-      apiurl = ld.apiurl + "/events/index/"+"StartTime >=:" + TimeObjectFrom + "/"+"AlarmFrames >=:" + (ld.enableAlarmCount ? ld.minAlarmCount : 0) + ".json?sort=StartTime&direction=asc"+$rootScope.authSession;
+      apiurl = ld.apiurl + "/events/index/"+"StartTime >=:" + TimeObjectFrom;
+      if (ld.enableAlarmCount && ld.enableAlarmCount)
+       apiurl+= "/"+"AlarmFrames >=:" + ld.minAlarmCount;
+
+      apiurl+= ".json?sort=StartTime&direction=asc"+$rootScope.authSession;
       NVR.log("Grabbing history using: " + apiurl);
       // make sure there are no more than 5 active streams (noevent is ok)
       $scope.currentLimit = $scope.monLimit;
@@ -357,7 +361,10 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
         for (i = 0; i < $scope.MontageMonitors.length; i++) {
           //console.log("Fair chance check for " + $scope.MontageMonitors[i].Monitor.Name);
           if ($scope.MontageMonitors[i].Monitor.eventUrl == 'img/noimage.png') {
-            var indivGrab = ld.apiurl + "/events/index/MonitorId:" + $scope.MontageMonitors[i].Monitor.Id + "/"+"StartTime >=:" + TimeObjectFrom + "/"+"AlarmFrames >=:" + (ld.enableAlarmCount ? ld.minAlarmCount : 0) + ".json?"+$rootScope.authSession;
+            var indivGrab = ld.apiurl + "/events/index/MonitorId:" + $scope.MontageMonitors[i].Monitor.Id + "/"+"StartTime >=:" + TimeObjectFrom ;
+            if (ld.enableAlarmCount && ld.minAlarmCount)
+              indivGrab += "/"+"AlarmFrames >=:" +  ld.minAlarmCount;
+            indivGrab += ".json?"+$rootScope.authSession;
             NVR.debug("Monitor " + $scope.MontageMonitors[i].Monitor.Id + ":" + $scope.MontageMonitors[i].Monitor.Name + " does not have events, trying " + indivGrab);
             var p = getExpandedEvents(i, indivGrab);
             promises.push(p);
diff --git a/www/js/NVR.js b/www/js/NVR.js
index a3cf0189..3eb477f2 100644
--- a/www/js/NVR.js
+++ b/www/js/NVR.js
@@ -3661,7 +3661,8 @@ angular.module('zmApp.controllers')
           if (endTime)
             myurl = myurl + "/"+"EndTime >=:" + startTime;
 
-          myurl = myurl + "/"+"AlarmFrames >=:" + (loginData.enableAlarmCount ? loginData.minAlarmCount : 0);
+          if (loginData.enableAlarmCount && loginData.minAlarmCount)
+            myurl = myurl + "/"+"AlarmFrames >=:" + loginData.minAlarmCount;
 
           //https:///zm/api/events/index/Notes%20REGEXP:detected%3A.json
           if (loginData.objectDetectionFilter && !noObjectFilter) {
@@ -3752,7 +3753,8 @@ angular.module('zmApp.controllers')
           if (endTime)
             myurl = myurl + "/"+"EndTime >=:" + startTime;
 
-          myurl = myurl + "/"+"AlarmFrames >=:" + (loginData.enableAlarmCount ? loginData.minAlarmCount : 0);
+          if (loginData.enableAlarmCount && loginData.minAlarmCount)
+            myurl = myurl + "/"+"AlarmFrames >=:" + loginData.minAlarmCount;
 
           //console.log ('********* MON FILTER '+monListFilter);
           if (monListFilter) 
diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js
index 82db8b59..ff24615b 100644
--- a/www/js/TimelineCtrl.js
+++ b/www/js/TimelineCtrl.js
@@ -785,7 +785,8 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
     // 
     var completedEvents = ld.apiurl + '/events/index/'+'EndTime >=:' + from;
     // we can add alarmCount as this is really for completed events
-    completedEvents = completedEvents + "/"+"AlarmFrames >=:" + (ld.enableAlarmCount ? ld.minAlarmCount : 0);
+    if (ld.enableAlarmCount && ld.minAlarmCount)
+      completedEvents = completedEvents + "/"+"AlarmFrames >=:" + ld.minAlarmCount;
 
     if (ld.objectDetectionFilter) {
       completedEvents = completedEvents + '/'+ 'Notes REGEXP:"detected:"';