Correct conflicts

6 files changed, 49 insertions, 30 deletions

diff --git a/client/js/controllers/home/home.js b/client/js/controllers/home/home.js
new file mode 100644
index 0000000..f84f625
--- /dev/null
+++ b/client/js/controllers/home/home.js
@@ -0,0 +1,36 @@
+/**
+ * The home controller
+ * 
+ * @param {$scope} $scope The $scope service from angular
+ */
+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();
+	}
+
+	;
+	if(Compute.getData().machines == null && Identity.isAlreadyLogin()){
+		Loading.start();
+		Compute.pullData(callMeAfterPullData);		
+	}
+
+
+
+	
+	$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);
+	}
+
+
+}]);
diff --git a/client/js/controllers/home/machineDetails.js b/client/js/controllers/home/machineDetails.js
index f84a073..c015eaa 100644
--- a/client/js/controllers/home/machineDetails.js
+++ b/client/js/controllers/home/machineDetails.js
@@ -6,21 +6,25 @@
 mainApp.controller('machineDetailsCtrl', [ '$scope', 'Compute', '$rootScope', '$timeout', function ($scope, Compute, $rootScope, $timeout)
 {
 
+	// Init scope
 	$scope.machine={};
-	$("#waitingForToggleMachine").hide();
+	$scope.machineIsStarting=false; // For loading icon
 
-	$scope.$on('showMachineDetailsEvent', function(eventName ,machine){
+
+	$scope.$on('showMachineDetailsEvent', function(eventName ,machine, axioms){
 		$scope.machine=machine;
+		$scope.axioms=axioms;
 		$('#machineDetailsModal').modal({backdrop: false, keyboard: true});
 	});
 
 
 	$scope.toggleMachineState=function(){
-		$("#waitingForToggleMachine").show();
+		// Display gif
+		$scope.machineIsStarting=true;
 
 		// Fake timeout
 		$timeout(function(){
-		$("#waitingForToggleMachine").hide();	
+			$scope.machineIsStarting=false;
 		}, 3000);
 		$timeout(function(){
 		$scope.machine.online=!$scope.machine.online;
diff --git a/client/js/controllers/home/main.js b/client/js/controllers/home/main.js
deleted file mode 100644
index d93c376..0000000
--- a/client/js/controllers/home/main.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * The home controller
- * 
- * @param {$scope} $scope The $scope service from angular
- */
-mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', function ($scope, Compute, $rootScope)
-{
-
-	var updatePage=function(){
-		// TODO Update graph etc...
-	}
-
-	// Retrieve all Data
-	Compute.pullData(updatePage);
-
-	$scope.raiseShowMachineDetailsEvent=function(){
-		var machine={name: "Machine 1", online:true};
-		$rootScope.$broadcast("showMachineDetailsEvent", machine);		
-	}
-
-
-}]);
diff --git a/client/js/controllers/login.js b/client/js/controllers/login.js
index 1a89563..63cb6d1 100644
--- a/client/js/controllers/login.js
+++ b/client/js/controllers/login.js
@@ -16,10 +16,11 @@ mainApp.controller('loginCtrl', ['$scope','$sce','Identity', function ($scope,$s
 
 	// Manager logout event
 	$scope.$on('logoutEvent', function(){
-		Identity.logout();
 		$('#loginModal').modal({backdrop: 'static', keyboard: false});
 	});
 
+
+	
 	// Hide loading button and message alert
     $('#loadingLoginButton').hide();
     $('#failedToLoginAlert').hide();
diff --git a/client/js/controllers/network/main.js b/client/js/controllers/network/network.js
index 7264aec..7264aec 100644
--- a/client/js/controllers/network/main.js
+++ b/client/js/controllers/network/network.js
diff --git a/client/js/controllers/status.js b/client/js/controllers/status.js
index 940d794..6f398ad 100644
--- a/client/js/controllers/status.js
+++ b/client/js/controllers/status.js
@@ -11,10 +11,10 @@ mainApp.controller('statusCtrl', ['$scope','Identity', '$rootScope', function ($
 
 	// Give profile to model
     $scope.profile=Identity.getProfile();
-
+	
     // Function to logout
-    $scope.raiseLogoutEvent=function(){
-		$rootScope.$broadcast('logoutEvent');
+    $scope.logout=function(){
+		Identity.logout();
 	};
 
 }]);