ZoneMinder#848 fix time filter logic, also make object detection filt…

…er selectable in timeline, just like in Events
Simpler1 · Aug 23, 2019 · 9e8c42b · 9e8c42b
1 parent f437793
commit 9e8c42b
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 6 deletions.
diff --git a/www/js/EventsGraphsCtrl.js b/www/js/EventsGraphsCtrl.js
@@ -182,7 +182,7 @@ angular.module('zmApp.controllers').controller('zmApp.EventsGraphsCtrl', ['$ioni
 
           var dateString = "";
           if (hrs) {
-            dateString = "/StartTime >=:" + startDate + "/EndTime <=:" + endDate;
+            dateString = "/StartTime <=:" + endDate + "/EndTime >=:" + startDate;
           }
           var url = loginData.apiurl +
             "/events/index/MonitorId:" + monitors[j].Monitor.Id + dateString +

diff --git a/www/js/MomentCtrl.js b/www/js/MomentCtrl.js
@@ -749,7 +749,7 @@ angular.module('zmApp.controllers').controller('zmApp.MomentCtrl', ['$scope', '$
     var ld = NVR.getLogin();
 
     // in API, always sort by StartTime so all monitors are represented
-    var myurl = ld.apiurl + "/events/index/AlarmFrames >=:1" + excludeMonitorsFilter + "/StartTime >=:" + timeFrom + "/StartTime <=:" + timeTo + ".json?sort=" + "StartTime" + "&direction=desc"+$rootScope.authSession;
+    var myurl = ld.apiurl + "/events/index/AlarmFrames >=:1" + excludeMonitorsFilter + "/StartTime <=:" + timeTo + "/EndTime >=:" + timeFrom + ".json?sort=" + "StartTime" + "&direction=desc"+$rootScope.authSession;
     NVR.debug("Retrieving " + myurl);
 
 

diff --git a/www/js/NVR.js b/www/js/NVR.js
@@ -3265,9 +3265,9 @@ angular.module('zmApp.controllers')
           if (monitorId != 0)
             myurl = myurl + "/MonitorId:" + monitorId;
           if (startTime)
-            myurl = myurl + "/StartTime >=:" + startTime;
+            myurl = myurl + "/StartTime <=:" + endTime;
           if (endTime)
-            myurl = myurl + "/EndTime <=:" + endTime;
+            myurl = myurl + "/EndTime >=:" + startTime;
 
           myurl = myurl + "/AlarmFrames >=:" + (loginData.enableAlarmCount ? loginData.minAlarmCount : 0);
 
@@ -3354,9 +3354,9 @@ angular.module('zmApp.controllers')
           if (monitorId != 0)
             myurl = myurl + "/MonitorId:" + monitorId;
           if (startTime)
-            myurl = myurl + "/StartTime >=:" + startTime;
+            myurl = myurl + "/StartTime <=:" + endTime;
           if (endTime)
-            myurl = myurl + "/EndTime <=:" + endTime;
+            myurl = myurl + "/EndTime >=:" + startTime;
 
           myurl = myurl + "/AlarmFrames >=:" + (loginData.enableAlarmCount ? loginData.minAlarmCount : 0);
 
@@ -3374,6 +3374,7 @@ angular.module('zmApp.controllers')
 
 
           debug("getEvents:" + myurl);
+          //console.log ("LOG: "+myurl);
           // Simulated data
 
           // myurl = "https://api.myjson.com/bins/4jx44.json";
@@ -3388,6 +3389,7 @@ angular.module('zmApp.controllers')
 
 
                 myevents = data;
+                console.log (myevents);
 
 
                 d.resolve(myevents);

diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js
@@ -348,6 +348,9 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
         notes: ''
     };
 
+    $scope.lastVideoStateTime = {
+      'time':''
+    };
     $scope.newEvents = '';
 
 
@@ -664,6 +667,19 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
     loginData.followTimeLine = $scope.follow.time;
     NVR.setLogin(loginData);
   };
+
+  $scope.toggleObjectDetectionFilter = function () {
+
+    var ld = NVR.getLogin();
+    ld.objectDetectionFilter = !ld.objectDetectionFilter;
+    NVR.setLogin(ld);
+    NVR.debug ("object detection filter: "+ld.objectDetectionFilter);
+    $scope.loginData = NVR.getLogin();
+    drawGraph(fromDate, toDate, maxItems);
+
+  };
+
+
   //-------------------------------------------------
   // Called with day/week/month
   // so we can redraw the graph

diff --git a/www/templates/timeline-popover.html b/www/templates/timeline-popover.html
@@ -8,6 +8,10 @@
         | translate}}</a>
       <a class="item" ng-href="" ng-click="popover.hide();toggleMinAlarmFrameCount();" ng-if="!loginData.enableAlarmCount">
         {{'kShowAlarmedEvents' | translate}}</a>
+
+        <a class="item" ng-href="" ng-click="popover.hide();toggleObjectDetectionFilter();" > <i ng-if="loginData.objectDetectionFilter" class="ion-record" style="color:green;">&nbsp;</i> {{'kShowObjectDetectionEvents'
+          | translate}}</a>
+
       <a class="item" ng-href="" ng-click="popover.hide();buttonClicked(0);">{{'kMonth' | translate}}</a>
       <a class="item" ng-href="" ng-click=" popover.hide();buttonClicked(1);">
         {{'kWeek' | translate}}