From a24da015120e02e492721a66d43d16b52269874d Mon Sep 17 00:00:00 2001 From: Arjun Roychowdhury Date: Wed, 4 Nov 2015 14:42:46 -0500 Subject: #48 - Code to handle next/prev for same monitor Id --- www/js/EventCtrl.js | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'www/js') diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index b731d101..8436ed8e 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -1154,10 +1154,21 @@ angular.module('zmApp.controllers') }; $http.get(myurl) .success(function (data) { - neighbors.prev = data.event.Event.Prev ? data.event.Event.Prev : ""; - neighbors.next = data.event.Event.Next ? data.event.Event.Next : ""; + + if ($stateParams.id != "0") // we are viewing only one monitor + { + ZMDataModel.zmDebug ("Getting next event for monitor Id " + $stateParams.id); + neighbors.prev = data.event.Event.PrevOfMonitor ? data.event.Event.PrevOfMonitor : ""; + neighbors.next = data.event.Event.NextOfMonitor ? data.event.Event.NextOfMonitor : ""; + } + else + { + neighbors.prev = data.event.Event.Prev ? data.event.Event.Prev : ""; + neighbors.next = data.event.Event.Next ? data.event.Event.Next : ""; + } ZMDataModel.zmDebug("Neighbor events of " + eid + "are Prev:" + neighbors.prev + " and Next:" + neighbors.next); + d.resolve(neighbors); return (d.promise); -- cgit v1.2.3