diff options
| author | manzerbredes <loic.guegan_secondary@yahoo.fr> | 2016-03-01 16:14:00 +0100 |
|---|---|---|
| committer | manzerbredes <loic.guegan_secondary@yahoo.fr> | 2016-03-01 16:14:00 +0100 |
| commit | d013e9ff44bb925223d94a96a5bcdefee03cdc55 (patch) | |
| tree | 83b295c9c3855a6527a0dac84f25d7a4945c5d0b /client/js/controllers/home | |
| parent | 44bdffd5778e020d7b2fe771ef7551e6665aa61d (diff) | |
| parent | 575b8ea4b611a5bd06c92471ecb8fb31d45c1c45 (diff) | |
Merge branch 'loic' into develop
Diffstat (limited to 'client/js/controllers/home')
| -rw-r--r-- | client/js/controllers/home/main.js | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/client/js/controllers/home/main.js b/client/js/controllers/home/main.js index 4e3bcda..805bc63 100644 --- a/client/js/controllers/home/main.js +++ b/client/js/controllers/home/main.js @@ -10,14 +10,18 @@ mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', function ($s // TODO Update graph etc... } - // Retrieve all Data - Compute.pullData(updatePage); - Compute.getMachines(function(adzda){}); + + $scope.raiseShowMachineDetailsEvent=function(){ - var machine={name: "Machine 1", online:true}; - $rootScope.$broadcast("showMachineDetailsEvent", machine); + var callback=function(){ + var data=Compute.getData(); + console.log(data.machines[Object.keys(data.machines)[0]]); + $rootScope.$broadcast("showMachineDetailsEvent", data.machines[Object.keys(data.machines)[0]]); + + } + Compute.pullMachines(callback); } |