diff options
| author | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-11-19 15:05:06 -0500 |
|---|---|---|
| committer | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-11-19 15:05:06 -0500 |
| commit | a4bfa2d5c56f07245815ef7e295e979e117de2c2 (patch) | |
| tree | a8f704c0a0ff8c545bdf08e3a36174aec15e5e40 /www/js | |
| parent | 92e3bef0c9e0f2e8856806028852a23e4a160303 (diff) | |
#100 - respecting sequenceId of ZM
Former-commit-id: 22761bf1722628e81682d1a614b1169d7e0d0e6e
Diffstat (limited to 'www/js')
| -rw-r--r-- | www/js/DataModel.js | 2 | ||||
| -rw-r--r-- | www/js/TimelineCtrl.js | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js index b4779551..c053bde8 100644 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -916,6 +916,8 @@ angular.module('zmApp.controllers') .success(function (data) { console.log("HTTP success got " + JSON.stringify(data.monitors)); monitors = data.monitors; + monitors.sort(function(a,b) + {return parseInt(a.Monitor.Sequence)-parseInt(b.Monitor.Sequence);}); console.log("promise resolved inside HTTP success"); monitorsLoaded = 1; $ionicLoading.hide(); 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)); |