2 files changed, 77 insertions, 82 deletions
diff --git a/client/js/controllers/home/home.js b/client/js/controllers/home/home.js
index 10142c9..7880e12 100755
--- a/client/js/controllers/home/home.js
+++ b/client/js/controllers/home/home.js
@@ -3,58 +3,52 @@
  * 
  * @param {$scope} $scope The $scope service from angular
  */
-mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading','Identity', 'Image', function ($scope, Compute, $rootScope, Loading, Identity, Image)
-{
-
-	var callMeAfterPullData=function(data){
-                console.log(data);
-		$scope.machines=Compute.getData().machines;
-		Loading.stop();
-	}
-
-	;
-	if(Compute.getData().machines == null && Identity.isAlreadyLogin()){
-		Loading.start();
-		Compute.pullData(callMeAfterPullData);		
-	}
-	else{
-		if(Identity.isAlreadyLogin()){
-			callMeAfterPullData();
-		}
-	}
-
-
-	Image.getImages(function(){});
-
-
-
-	$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);
-	}
-
-
-
-
-	
-	if(Identity.isAlreadyLogin()){
-		if(Compute.getData().machines == null){
-			Loading.start();
-			Compute.pullData(callMeAfterPullData);		
-		}
-		   else{
-			   if(Identity.isAlreadyLogin()){
-				   callMeAfterPullData();
-			   }
-		   }
-		   Image.getImages(function(){});
-		  }
-
-}]);
+mainApp.controller('homeCtrl', ['$scope', 'Compute', '$rootScope', 'Loading', 'Identity', 'Image', function ($scope, Compute, $rootScope, Loading, Identity, Image)
+    {
+
+        // Function to call after pull all data about machines
+        var callMeAfterPullData = function (data) {
+            $scope.machines = Compute.getData().machines;
+            Loading.stop();
+        };
+
+        // Function to call to try to retrieve data and update the view
+        var tryToRetrieveData = function () {
+            // If no data retrieve about machine and user is logged
+            if (Compute.getData().machines == null && Identity.isAlreadyLogin()) {
+                Loading.start(); // Show loading gif
+                Compute.pullData(callMeAfterPullData); // Retrieve data and call the callback
+            } else {
+                // Else if user is logged and data is already retrieve
+                // simply display data
+                if (Identity.isAlreadyLogin()) {
+                    callMeAfterPullData(); // Display data
+                }
+            }
+        };
+
+
+        // On user login
+        $scope.$on('loginEvent', function () {
+            tryToRetrieveData();
+        });
+
+
+
+        // Function to call from view to display the details of a machine
+        $scope.raiseShowMachineDetailsEvent = function (id) {
+
+            // Stop loading gif and display overlay
+            var callback = function () {
+                Loading.stop();
+                var data = Compute.getData();
+                $rootScope.$broadcast("showMachineDetailsEvent", data.machines[id], data.axioms);
+
+            };
+            Loading.start(); // Show loading gif
+            Compute.pullMachines(callback); // Retrieve machine info and display overlay
+        };
+        
+        // Try to retrieve data for the first time
+        tryToRetrieveData();
+    }]);
diff --git a/client/js/controllers/home/machineDetails.js b/client/js/controllers/home/machineDetails.js
index 371310b..9c8c602 100644
--- a/client/js/controllers/home/machineDetails.js
+++ b/client/js/controllers/home/machineDetails.js
@@ -3,42 +3,43 @@
  * 
  * @param {$scope} $scope The $scope service from angular
  */
-mainApp.controller('machineDetailsCtrl', [ '$scope', 'Compute', '$rootScope', '$timeout', 'Identity', function ($scope, Compute, $rootScope, $timeout, Identity)
-{
+mainApp.controller('machineDetailsCtrl', ['$scope', 'Compute', '$rootScope', '$timeout', 'Identity', function ($scope, Compute, $rootScope, $timeout, Identity)
+    {
 
 
-	// Init scope
-	$scope.machine={};
-	$scope.machineIsStarting=false; // For loading icon
+        // Init scope
+        $scope.machine = {};
+        $scope.machineIsStarting = false; // For loading icon
 
+        // When we need to show details of machine
+        $scope.$on('showMachineDetailsEvent', function (eventName, machine, axioms) {
+            $scope.machine = machine;
+            $scope.axioms = axioms;
+            $('#machineDetailsModal').modal({backdrop: false, keyboard: true});
+        });
 
-	$scope.$on('showMachineDetailsEvent', function(eventName ,machine, axioms){
-		$scope.machine=machine;
-		$scope.axioms=axioms;
-		$('#machineDetailsModal').modal({backdrop: false, keyboard: true});
-	});
+        // Try to stop or start a machine
+        $scope.toggleMachineState = function () {
+            // Display gif
+            $scope.machineIsStarting = true;
 
+            // Fake timeout
+            $timeout(function () {
+                $scope.machineIsStarting = false;
+            }, 3000);
+            $timeout(function () {
+                $scope.machine.online = !$scope.machine.online;
 
-	$scope.toggleMachineState=function(){
-		// Display gif
-		$scope.machineIsStarting=true;
+            }, 3000);
 
-		// Fake timeout
-		$timeout(function(){
-			$scope.machineIsStarting=false;
-		}, 3000);
-		$timeout(function(){
-			$scope.machine.online=!$scope.machine.online;
 
-		}, 3000);
+        };
 
-		
-	};
+        // Apply modifications
+        $scope.applyModifications = function () {
+            //Todo
+        };
 
-	$scope.applyModifications=function(){
-		//Todo
-	}
 
 
-	
-}]);
+    }]);