From 576d9058a4afb2a179f8c6a338f9b6c08108822b Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Tue, 14 May 2019 13:33:00 -0400 Subject: initial support for tokens #817 --- www/js/TimelineCtrl.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'www/js/TimelineCtrl.js') diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js index 78006f37..13916297 100644 --- a/www/js/TimelineCtrl.js +++ b/www/js/TimelineCtrl.js @@ -746,7 +746,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla // we can add alarmCount as this is really for completed events //completedEvents = completedEvents + "/AlarmFrames >=:" + (ld.enableAlarmCount ? ld.minAlarmCount : 0); - completedEvents = completedEvents + ".json"; + completedEvents = completedEvents + ".json?"+$rootScope.authSession; // now get currently ongoing events // as it turns out various events get stored withn null and never recover @@ -755,7 +755,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla var st = moment(lastTimeForEvent).tz(NVR.getTimeZoneNow()); st = st.subtract(10, 'minutes').locale('en').format("YYYY-MM-DD HH:mm:ss"); - var ongoingEvents = ld.apiurl + '/events/index/StartTime >=:' + st + '/EndTime =:.json'; + var ongoingEvents = ld.apiurl + '/events/index/StartTime >=:' + st + '/EndTime =:.json?'+$rootScope.authSession; //NVR.debug("Getting incremental events using: " + completedEvents); NVR.debug("Completed events API:" + completedEvents); -- cgit v1.2.3 From 5aee4039af90cc6b5c372076daa1d5ada9596075 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Mon, 20 May 2019 10:43:06 -0400 Subject: demote logs --- www/js/TimelineCtrl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'www/js/TimelineCtrl.js') diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js index 13916297..11a61432 100644 --- a/www/js/TimelineCtrl.js +++ b/www/js/TimelineCtrl.js @@ -383,7 +383,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla $timeout(function () { var keyCode = evt.keyCode; - console.log(keyCode + " PRESSED"); + //console.log(keyCode + " PRESSED"); if (keyCode == keyCodes.UP) { -- cgit v1.2.3 From 3b38f53d06d41d3fc9246786d8ee25c422406462 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Mon, 20 May 2019 11:52:24 -0400 Subject: more logs demotion --- www/js/TimelineCtrl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'www/js/TimelineCtrl.js') diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js index 11a61432..f1350f0f 100644 --- a/www/js/TimelineCtrl.js +++ b/www/js/TimelineCtrl.js @@ -1358,7 +1358,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla } $scope.thumbnailClicked = function(event) { - console.log ("Thumb tapped"); + //console.log ("Thumb tapped"); if (!$scope.currentThumbEvent) { // will this ever be? Don't think so NVR.debug ("No thumb rendered"); -- cgit v1.2.3 From 039bae204c5beb4e908bdf69e743f0fd5924493f Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Fri, 24 May 2019 16:05:04 -0400 Subject: honor objdetect settings, show notes --- www/js/TimelineCtrl.js | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'www/js/TimelineCtrl.js') diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js index f1350f0f..193e04ac 100644 --- a/www/js/TimelineCtrl.js +++ b/www/js/TimelineCtrl.js @@ -344,7 +344,8 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla url: '', eid: $translate.instant('kMonNone'), time: $translate.instant('kMonNone'), - monName: $translate.instant('kMonNone') + monName: $translate.instant('kMonNone'), + notes: '' }; $scope.newEvents = ''; @@ -744,7 +745,11 @@ 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); + completedEvents = completedEvents + "/AlarmFrames >=:" + (ld.enableAlarmCount ? ld.minAlarmCount : 0); + + if (ld.objectDetectionFilter) { + completedEvents = completedEvents + '/Notes REGEXP:"detected:"'; + } completedEvents = completedEvents + ".json?"+$rootScope.authSession; @@ -1133,7 +1138,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla // I am waiting for the full data to load before I draw var promises = []; while ((pages <= epData.pageCount) && (iterCount > 0)) { - var promise = NVR.getEvents(0, pages, "none", fromDateNoLang, toDateNoLang, true); + var promise = NVR.getEvents(0, pages, "none", fromDateNoLang, toDateNoLang, false); promises.push(promise); pages++; @@ -1161,6 +1166,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla for (var j = 0; j < data.length; j++) { var myevents = data[j].events; + // console.log ("****************DATA ="+JSON.stringify(data[j])); // console.log ("**********************************"); if (graphIndex > count) { @@ -1175,6 +1181,11 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla var idfound = true; var ld = NVR.getLogin(); + // skip non detections here because we can't query to DB due to page attribute + if (ld.objectDetectionFilter && myevents[i].Event.Notes.indexOf('detected:') == -1) { + continue; + } + if (ld.persistMontageOrder) { idfound = false; @@ -1509,7 +1520,8 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla url: stream, eid: event.Event.Id, time: prettifyTimeSec(event.Event.StartTime), - monName: event.Event.MonitorName + monName: event.Event.MonitorName, + notes: event.Event.Notes }; }); -- cgit v1.2.3 From 5bf531cfd5aa6812dd96bb3aa887187f71f3f560 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Sat, 25 May 2019 10:17:51 -0400 Subject: fix object detect filter --- www/js/TimelineCtrl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'www/js/TimelineCtrl.js') diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js index 193e04ac..d2cc82ea 100644 --- a/www/js/TimelineCtrl.js +++ b/www/js/TimelineCtrl.js @@ -1138,7 +1138,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla // I am waiting for the full data to load before I draw var promises = []; while ((pages <= epData.pageCount) && (iterCount > 0)) { - var promise = NVR.getEvents(0, pages, "none", fromDateNoLang, toDateNoLang, false); + var promise = NVR.getEvents(0, pages, "none", fromDateNoLang, toDateNoLang, true); promises.push(promise); pages++; -- cgit v1.2.3