Correct conflicts

3 files changed, 181 insertions, 32 deletions

diff --git a/client/js/services/Compute.js b/client/js/services/Compute.js
index 70359ee..36ddc16 100644
--- a/client/js/services/Compute.js
+++ b/client/js/services/Compute.js
@@ -2,38 +2,139 @@
 mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){
 
 
-	
+	// Init data
 	var data={};
-	data.machines={};
+	data.machines=null;
+	data.axioms={} // Contain static data
+	data.axioms.ram=[128,512,1024,2048,4096];
+	data.axioms.disk=[1,2,5,10,25,50,100,150,200]
+	data.axioms.images={}; // Retrieve after
 	
 
-	// Parser
-	var parseGetMachinesAnswer=function(response, failedToSendRequest){
+	/**
+	 * Parse pullMachines answer
+	 * @param {response} the server response
+	 * @param {boolean} false if the request as been send true else
+	 * @return {requestParserResult} the result of parsing
+	 */
+	var parsePullMachinesAnswer=function(response, failedToSendRequest){
+
+		// Defined return object
+		var requestParserResult={};
+		requestParserResult.status=1;
+		requestParserResult.failReason=null;
+
 		
-	};
+		if (typeof response.data.Servers !== 'undefined') {
+			// Set status code
+			requestParserResult.status=0;
+			data.machines=response.data.Servers;
 
+		}
+		else if(failedToSendRequest){
+			requestParserResult.failReason="Failed to send request";
+		}
+		else{
+			requestParserResult.failReason="Error";
+		}
+		return requestParserResult;
+	};
 
-	// Get Machine
-	var getMachines=function(callback){
 
+	/**
+	 * Retrieve machine list 
+	 * @param {callback} function to call after request complete
+	 */
+	var pullMachines=function(callback){
+		// Send listServers request
 		var result=$http.post('../server/index.php',
-						  $.param({"token" : Identity.profile.token, "task" : "Compute"}));		
+							  $.param({"token" : Identity.getToken(), "task" : "compute", "action":"listServers"}));		
+
+		// Wait and handle the response
+        result.then(function (response){
+			callback(parsePullMachinesAnswer(response, false));
+        },function(response){
+			callback(parsePullMachinesAnswer(response, true));
+        });
+	};
+
+
+	/**
+	 * Parse pullImages answer
+	 * @param {response} the server response
+	 * @param {boolean} false if the request as been send true else
+	 * @return {requestParserResult} the result of parsing
+	 */
+	var parsePullImagesAnswer=function(response, failedToSendRequest){
+
+		// Defined return object
+		var requestParserResult={};
+		requestParserResult.status=1;
+		requestParserResult.failReason=null;
 
 		
+		if (typeof response.data.Images !== 'undefined') {
+			// Set status code
+			requestParserResult.status=0;
+			data.axioms.images=response.data.Images;
+		}
+		else if(failedToSendRequest){
+			requestParserResult.failReason="Failed to send request";
+		}
+		else{
+			requestParserResult.failReason="Error";
+		}
+		return requestParserResult;
 	};
+
+
+
 	
+	/**
+	 * Retrieve machine list 
+	 * @param {callback} function to call after request complete
+	 */
+	var pullImages=function(callback){
+		// Send listServers request
+		var result=$http.post('../server/index.php',
+							  $.param({"token" : Identity.getToken(), "task" : "compute", "action":"listImages"}));		
+
+		// Wait and handle the response
+        result.then(function (response){
+			callback(parsePullImagesAnswer(response, false));
+        },function(response){
+			callback(parsePullImagesAnswer(response, true));
+        });
+	};
 
 
+	/**
+	 * Retrieve all data 
+	 * @param {callback} function to call after request complete
+	 */
 	var pullData=function(callback){
-		// TODO call getMachines etc...
+		var nextFunction=function(response){
+			if(response.status==0){
+				pullMachines(callback);
+			}
+		}
+		pullImages(nextFunction);
 	}
 
-		
+
+	/**
+	 * Get Data
+	 * @return {data} return the data object
+	 */
+	var getData=function(){
+		return data;
+	}
+	
 	// Return services objects
 	return {
-		getMachines: getMachines,
+		pullMachines: pullMachines,
 		pullData: pullData,
-		data:data
+		getData: getData
 	};
 
 	
diff --git a/client/js/services/Identity.js b/client/js/services/Identity.js
index 7604230..db93e97 100644
--- a/client/js/services/Identity.js
+++ b/client/js/services/Identity.js
@@ -1,5 +1,5 @@
 
-mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){
+mainApp.factory('Identity',[ '$http', '$cookies',  function($http, $cookies){
 
 	/* Create profile structure to store informations
 	 * about current session
@@ -9,42 +9,37 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){
     profile.projectname=null;
 	var token=null;
 
+	
 	/* 
 	 * @returns {boolean} Return true if a cookie is found (and load it in profile) false else 
 	 */
 	var isAlreadyLogin=function(){
+
+		// Load cookies
 		var profileInCookie=$cookies.getObject('profile');
 		var tokenPart_0InCookie=$cookies.getObject('token.part_0');
 		var tokenPart_1InCookie=$cookies.getObject('token.part_1');
 
 		
+		// Check if cookie is defined
 		if(typeof profileInCookie !== 'undefined'
 		   && typeof tokenPart_0InCookie !== 'undefined'
 		   && typeof tokenPart_1InCookie !== 'undefined'
 		  ){
+
+			// If yes, put it into variables
 			angular.extend(profile, profileInCookie);
 			token=tokenPart_0InCookie+tokenPart_1InCookie;
-			
+
+			// Return I'm Login
 			return true;
 		}
 
+		// Return I'm not Login
 		return false;
 	}
 
 
-	/*
-     * Get the profile
-	 */
-	var getProfile=function(){
-		return profile;
-	}
-
-	/*
-     * Get the token
-	 */	
-	var getToken=function(){
-		return token;
-	}
 	
 	/*
 	 * Destroy profile cookies
@@ -53,6 +48,12 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){
 		$cookies.remove('profile');
 		$cookies.remove('token.part_0');
 		$cookies.remove('token.part_1');
+		token=null;
+		profile.username=null;
+		profile.projectname=null;
+
+		// Reload Page
+		location.reload();
 	}
 
 	
@@ -64,7 +65,7 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){
 	 */
 	var parseLoginAnswer=function(response, failedToSendRequest){
 		
-
+		// Defined return object
 		var requestParserResult={};
 		requestParserResult.status=1;
 		requestParserResult.failReason=null;
@@ -86,6 +87,10 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){
 			$cookies.putObject('token.part_0', response.data.token.substring(0, middle), {'expires': expireDate});
 			// Save second part of token
 			$cookies.putObject('token.part_1', response.data.token.substring(middle, response.data.token.length), {'expires': expireDate});
+
+			// Put token in var
+			token=response.data.token;
+			
 		}
 		else if(failedToSendRequest){
 			requestParserResult.failReason="Failed to send request";
@@ -93,9 +98,11 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){
 		else{
 			requestParserResult.failReason="Please check your username, password and project name !";
 		}
+
 		
 		return requestParserResult;
 	};
+
 	
 	/**
 	 * Function to connect to OpenStack
@@ -106,25 +113,43 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){
 	 * @param {string} projectname The user project name
 	 * @param {function} function to call when data is avalaible
 	 */
-	var login=function(username, password,projectname, callback){    
+	var login=function(username, password,projectname,callback){    
 		
 		// Set profile information (early)
 		profile.username=username;
 		profile.projectname=projectname;
 		
 		var result=$http.post('../server/index.php',
-						  $.param({"task" : "Authenticate", "user" : username, "password" : password, "project" : projectname}));  
+							  $.param({"task" : "Authenticate", "user" : username, "password" : password, "project" : projectname}));  
 
 		// Wait and handle the response
         result.then(function (response){
-			callback(parseLoginAnswer(response), false);
+			callback(parseLoginAnswer(response, false));
         },function(response){
-			callback(parseLoginAnswer(response), true)
+			callback(parseLoginAnswer(response, true));
         });		
 	};	
 
 
 
+
+	
+	/*
+     * Get the profile
+	 */
+	var getProfile=function(){
+		return profile;
+	}
+
+	/*
+     * Get the token
+	 */	
+	var getToken=function(){
+		return token;
+	}
+
+	
+
 	// Return services objects
 	return {
 		login: login,
diff --git a/client/js/services/Loading.js b/client/js/services/Loading.js
new file mode 100644
index 0000000..db06194
--- /dev/null
+++ b/client/js/services/Loading.js
@@ -0,0 +1,23 @@
+
+mainApp.factory('Loading',[ function(){
+	/**
+	 * Display Loading modal
+	 */
+	var start=function(){
+		$('#loadingModal').modal({backdrop: 'static', keyboard: false});	
+	};
+
+	/**
+	 * Hide Loading modal
+	 */
+	var stop=function(){
+		$('#loadingModal').modal('hide');
+	}
+
+
+	// Service returns
+	return {
+		start:start,
+		stop:stop
+	};
+}]);