From a4bfa2d5c56f07245815ef7e295e979e117de2c2 Mon Sep 17 00:00:00 2001 From: Arjun Roychowdhury Date: Thu, 19 Nov 2015 15:05:06 -0500 Subject: #100 - respecting sequenceId of ZM Former-commit-id: 22761bf1722628e81682d1a614b1169d7e0d0e6e --- www/js/TimelineCtrl.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'www/js/TimelineCtrl.js') diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js index 09c7bc90..5569c0ca 100644 --- a/www/js/TimelineCtrl.js +++ b/www/js/TimelineCtrl.js @@ -209,6 +209,8 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla console.log("***AFTER ENTER"); var tempMon = message; + + //console.log ("TIMELINE MONITORS: " + JSON.stringify(message)); var ld = ZMDataModel.getLogin(); if (ld.persistMontageOrder) @@ -487,7 +489,9 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla for (var g = 0; g < $scope.monitors.length; g++) { groups.add({ id: $scope.monitors[g].Monitor.Id, - content: ZMDataModel.getMonitorName($scope.monitors[g].Monitor.Id) + //mid: $scope.monitors[g].Monitor.Id, + content: ZMDataModel.getMonitorName($scope.monitors[g].Monitor.Id), + order: $scope.monitors[g].Monitor.Sequence }); ZMDataModel.zmDebug("TimelineCtrl/drawgraph:Adding group " + ZMDataModel.getMonitorName($scope.monitors[g].Monitor.Id)); -- cgit v1.2.3