diff options
| -rw-r--r-- | www/js/EventsGraphsCtrl.js | 2 | ||||
| -rw-r--r-- | www/js/MomentCtrl.js | 2 | ||||
| -rw-r--r-- | www/js/NVR.js | 10 | ||||
| -rw-r--r-- | www/js/TimelineCtrl.js | 16 | ||||
| -rw-r--r-- | www/templates/timeline-popover.html | 4 |
5 files changed, 28 insertions, 6 deletions
diff --git a/www/js/EventsGraphsCtrl.js b/www/js/EventsGraphsCtrl.js index dd8fe279..c3c69b40 100644 --- 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 index 38edb4e4..186df5cd 100644 --- 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 index b86c4676..3f11869b 100644 --- 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 index 4eae804b..e2305e6f 100644 --- 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 index a16abe93..e43e0605 100644 --- 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;"> </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}} |