diff options
Diffstat (limited to 'www/js/TimelineCtrl.js')
| -rw-r--r-- | www/js/TimelineCtrl.js | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js index 78006f37..d2cc82ea 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 = ''; @@ -383,7 +384,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) { @@ -744,9 +745,13 @@ 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); - completedEvents = completedEvents + ".json"; + if (ld.objectDetectionFilter) { + completedEvents = completedEvents + '/Notes REGEXP:"detected:"'; + } + + 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 +760,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); @@ -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; @@ -1358,7 +1369,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"); @@ -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 }; }); |