diff options
Diffstat (limited to 'www/js')
| -rw-r--r-- | www/js/DataModel.js | 18 | ||||
| -rw-r--r-- | www/js/EventCtrl.js | 19 |
2 files changed, 37 insertions, 0 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js index 2fe14d46..bb8092a6 100644 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -190,6 +190,7 @@ angular.module('zmApp.controllers') 'currentServerVersion': '', 'saveToCloud': true, 'montageReviewCollapse': true, + 'objectDetectionFilter': false, }; @@ -1501,6 +1502,12 @@ angular.module('zmApp.controllers') } + if (typeof loginData.objectDetectionFilter == 'undefined') { + + loginData.objectDetectionFilter = false; + + } + loginData.canSwipeMonitors = true; loginData.forceImageModePath = false; @@ -2649,6 +2656,12 @@ angular.module('zmApp.controllers') myurl = myurl + "/AlarmFrames >=:" + (loginData.enableAlarmCount ? loginData.minAlarmCount : 0); + //https:///zm/api/events/index/Notes%20REGEXP:detected%3A.json + if (loginData.objectDetectionFilter) { + myurl = myurl + '/Notes%20REGEXP:detected%3A'; + } + + myurl = myurl + ".json"; //console.log (">>>>>Constructed URL " + myurl); @@ -2732,6 +2745,11 @@ angular.module('zmApp.controllers') myurl = myurl + "/AlarmFrames >=:" + (loginData.enableAlarmCount ? loginData.minAlarmCount : 0); + //https:///zm/api/events/index/Notes%20REGEXP:detected%3A.json + if (loginData.objectDetectionFilter) { + myurl = myurl + '/Notes%20REGEXP:detected%3A'; + } + myurl = myurl + ".json?&sort=StartTime&direction=desc&page=" + pageId; diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index 8947df19..5f9a77fd 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -1825,6 +1825,12 @@ angular.module('zmApp.controllers') var af = "/AlarmFrames >=:" + (ld.enableAlarmCount ? ld.minAlarmCount : 0); + if (ld.objectDetectionFilter) { + af = af + '/Notes%20REGEXP:detected%3A'; + } + + + var apiurl = ld.apiurl + "/events/consoleEvents/1 hour" + af + ".json"; //NVRDataModel.debug("consoleEvents API:" + apiurl); @@ -2921,6 +2927,17 @@ angular.module('zmApp.controllers') }; + $scope.toggleObjectDetectionFilter = function () { + + var ld = NVRDataModel.getLogin(); + ld.objectDetectionFilter = !ld.objectDetectionFilter; + NVRDataModel.setLogin(ld); + NVRDataModel.debug ("object detection filter: "+ld.objectDetectionFilter); + $scope.loginData = NVRDataModel.getLogin(); + doRefresh(); + + }; + $scope.toggleMinAlarmFrameCount = function () { var ld = NVRDataModel.getLogin(); @@ -3009,6 +3026,8 @@ angular.module('zmApp.controllers') function doRefresh() { // console.log("***Pull to Refresh"); + + NVRDataModel.debug("Reloading monitors"); maxEventsPage = 1; currEventsPage = 1; |