From 61ea938fbab8944c928a6a24c222f84d0ad61a61 Mon Sep 17 00:00:00 2001 From: Arjun Roychowdhury Date: Thu, 19 Nov 2015 16:57:52 -0500 Subject: #102 - initial commits to handle skipped frameIds due to bulk Former-commit-id: 929b0a9cb81fc4de7c2035518d9c45aa6075d8b9 --- www/js/ModalCtrl.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'www/js/ModalCtrl.js') diff --git a/www/js/ModalCtrl.js b/www/js/ModalCtrl.js index 6bf208a0..2b1c52d7 100644 --- a/www/js/ModalCtrl.js +++ b/www/js/ModalCtrl.js @@ -950,17 +950,19 @@ angular.module('zmApp.controllers').controller('ModalCtrl', ['$scope', '$rootSco // $scope.slider_options.scale=[]; $scope.slider_modal_options.scale = []; - + for (i = 0; i < event.Frame.length; i++) { + if (event.Frame[i].Type == "Alarm") { $scope.slider_modal_options.scale.push({ - val: i + 1, + val: event.Event.FrameId, label: ' ' }); } else { //$scope.slider_options.scale.push(' '); } + } $scope.totalEventTime = Math.round(parseFloat(event.Event.Length)) - 1; -- cgit v1.2.3