Merge branch 'develop' of https://github.com/manzerbredes/istic-openstack into othmane

1 files changed, 25 insertions, 6 deletions

diff --git a/client/js/controllers/home/main.js b/client/js/controllers/home/main.js
index d25bfad..f84f625 100644
--- a/client/js/controllers/home/main.js
+++ b/client/js/controllers/home/main.js
@@ -3,15 +3,34 @@
  * 
  * @param {$scope} $scope The $scope service from angular
  */
-mainApp.controller('homeCtrl', [ '$scope', 'Compute', function ($scope, Compute)
+mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading','Identity', function ($scope, Compute, $rootScope, Loading, Identity)
 {
 
+	var callMeAfterPullData=function(data){
+		$scope.machines=Compute.getData().machines;
+			Loading.stop();
+	}
 
-	var updatePage=function(){
-		// TODO Update graph etc...
+	;
+	if(Compute.getData().machines == null && Identity.isAlreadyLogin()){
+		Loading.start();
+		Compute.pullData(callMeAfterPullData);		
 	}
 
-	// Retrieve all Data
-	Compute.pullData(updatePage);
-    
+
+
+	
+	$scope.raiseShowMachineDetailsEvent=function(id){
+
+		var callback=function(){
+			Loading.stop();
+			var data=Compute.getData();
+			$rootScope.$broadcast("showMachineDetailsEvent", data.machines[id], data.axioms);		
+	
+		}
+		Loading.start();
+		Compute.pullMachines(callback);
+	}
+
+
 }]);