From 1c7176e5eb8f2ed98bc04ec133b470cb309d4035 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Sat, 24 Nov 2018 17:39:13 -0500 Subject: integrate object detection mode in event list --- www/js/DataModel.js | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'www/js/DataModel.js') 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; -- cgit v1.2.3