diff options
Diffstat (limited to 'www/js')
| -rw-r--r-- | www/js/MontageHistoryCtrl.js | 60 |
1 files changed, 40 insertions, 20 deletions
diff --git a/www/js/MontageHistoryCtrl.js b/www/js/MontageHistoryCtrl.js index b9d708b9..0c8bf2a0 100644 --- a/www/js/MontageHistoryCtrl.js +++ b/www/js/MontageHistoryCtrl.js @@ -863,10 +863,15 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc }; - $scope.playbackFinished = function(m) { + $scope.skipVideo= function (m,d) { + + $scope.playbackFinished(m,d); + }; + + $scope.playbackFinished = function(m,d) { console.log ("******* VIDEO PLAYBACK FINISHED FOR MONITOR:"+m.Monitor.Id+ " EVENT:" +m.Monitor.eid); - getNextEvent( m.Monitor.eid) + getNextEvent( m.Monitor.eid,d) .then (function (success) { NVR.debug ("next event for monitor:"+m.Monitor.Id+" is "+success.eid); @@ -975,41 +980,56 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc // window.stop(); }; - function getNextEvent(eid) { + function getNextEvent(eid,dirn) { - var d = $q.defer(); // now get event details to show alarm frames var loginData = NVR.getLogin(); var myurl = loginData.apiurl + '/events/' + eid + ".json"; + //console.log (">> 1: getting: "+myurl); var r = { eid:"", - stime:"", + stime:"" }; + $http.get(myurl) - .then( function (success) { - if (success.data.event.Event.NextOfMonitor) { - r.eid = success.data.event.Event.NextOfMonitor; - r.stime = success.data.event.Event.StartTime; + .then( function (succ) { + //console.log (JSON.stringify(succ)); + var target = (dirn == -1) ? succ.data.event.Event.PrevOfMonitor: succ.data.event.Event.NextOfMonitor; + //console.log (">> 2: dirn: "+dirn+" target: "+target); + if (!target) target = 'null'; // fallback incase in some API this doesn't exist; + if (target == 'null') { + r.eid = "-1"; + r.stime = "-1"; d.resolve(r); + return d.promise; } else { + r.eid = target; + // now get time of that event + myurl = loginData.apiurl+'/events/'+target + '.json'; + $http.get (myurl) + .then (function (succ) { + r.stime = succ.data.event.Event.StartTime; + d.resolve(r); + return d.promise; + },function (err) { + NVR.debug ("Error getting start time of neighbor:"+JSON.stringify(err)); + r.stime = "-1"; + d.resolve(r); + return d.promise; + }); + return d.promise; + } + }, function (err) { + NVR.debug ("Error getting neighbors:"+JSON.stringify(err)); r.eid = "-1"; r.stime = "-1"; d.resolve(r); - } - return (d.promise); - }, - function (err) { - NVR.debug ("Error geting neighbors:"+JSON.stringify(err)); - r.eid = "-1"; - r.stime = "-1"; - d.resolve(r); - return (d.promise); - }); - + return d.promise; + }); return (d.promise); } |