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

10 files changed, 143 insertions, 40 deletions

diff --git a/client/js/app.js b/client/js/app.js
index e2d5b9b..1602e65 100644
--- a/client/js/app.js
+++ b/client/js/app.js
@@ -13,12 +13,16 @@ mainApp.config(['$routeProvider', function($routeProvider){
         
         $routeProvider.
                 when('/home',{
-                    templateUrl: 'partials/home/main.html',
+                    templateUrl: 'partials/home/home.html',
                     controller: 'homeCtrl'
         }).
                 when('/network',{
-                    templateUrl: 'partials/network/main.html',
+                    templateUrl: 'partials/network/network.html',
                     controller: 'networkCtrl'
+		}).
+		        when('/image',{
+                    templateUrl: 'partials/image/image.html',
+                    controller: 'imageCtrl'
         }).otherwise({
             redirectTo: '/home'
         });
diff --git a/client/js/controllers/home/main.js b/client/js/controllers/home/home.js
index f84f625..2b355b1 100644
--- a/client/js/controllers/home/main.js
+++ b/client/js/controllers/home/home.js
@@ -3,22 +3,14 @@
  * 
  * @param {$scope} $scope The $scope service from angular
  */
-mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading','Identity', function ($scope, Compute, $rootScope, Loading, Identity)
+mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading','Identity', 'Image', function ($scope, Compute, $rootScope, Loading, Identity, Image)
 {
 
 	var callMeAfterPullData=function(data){
 		$scope.machines=Compute.getData().machines;
-			Loading.stop();
-	}
-
-	;
-	if(Compute.getData().machines == null && Identity.isAlreadyLogin()){
-		Loading.start();
-		Compute.pullData(callMeAfterPullData);		
-	}
-
-
-
+		Loading.stop();
+	};
+	
 	
 	$scope.raiseShowMachineDetailsEvent=function(id){
 
@@ -26,11 +18,27 @@ mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading','I
 			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(){});
+		  }
+
 }]);
diff --git a/client/js/controllers/home/machineDetails.js b/client/js/controllers/home/machineDetails.js
index 24fac42..371310b 100644
--- a/client/js/controllers/home/machineDetails.js
+++ b/client/js/controllers/home/machineDetails.js
@@ -3,29 +3,32 @@
  * 
  * @param {$scope} $scope The $scope service from angular
  */
-mainApp.controller('machineDetailsCtrl', [ '$scope', 'Compute', '$rootScope', '$timeout', function ($scope, Compute, $rootScope, $timeout)
+mainApp.controller('machineDetailsCtrl', [ '$scope', 'Compute', '$rootScope', '$timeout', 'Identity', function ($scope, Compute, $rootScope, $timeout, Identity)
 {
 
+
+	// Init scope
 	$scope.machine={};
-	$("#waitingForToggleMachine").hide();
+	$scope.machineIsStarting=false; // For loading icon
+
 
 	$scope.$on('showMachineDetailsEvent', function(eventName ,machine, axioms){
 		$scope.machine=machine;
 		$scope.axioms=axioms;
-		console.log(machine);
 		$('#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;
+			$scope.machine.online=!$scope.machine.online;
 
 		}, 3000);
 
@@ -35,7 +38,7 @@ mainApp.controller('machineDetailsCtrl', [ '$scope', 'Compute', '$rootScope', '$
 	$scope.applyModifications=function(){
 		//Todo
 	}
-	
+
 
 	
 }]);
diff --git a/client/js/controllers/image/image.js b/client/js/controllers/image/image.js
new file mode 100644
index 0000000..b0b162b
--- /dev/null
+++ b/client/js/controllers/image/image.js
@@ -0,0 +1,29 @@
+/**
+ * The image controller
+ * 
+ * @param {$scope} $scope The $scope service from angular
+ */
+mainApp.controller('imageCtrl', ['$scope', 'Image', 'Loading', 'Identity', function ($scope, Image, Loading, Identity)
+{
+
+	var callbackTest=function(){
+		$scope.images=Image.getData().images;
+		Loading.stop();
+	};
+
+	$scope.doUpload = function () {
+		Image.uploadImage($scope.myFile,function(){});
+	};
+	
+	if(Identity.isAlreadyLogin()){
+
+		if(Image.getData().images==null){
+			Loading.start();
+			Image.getImages(callbackTest);
+		}
+		else{
+			callbackTest();
+		}
+
+	}	
+}]);
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..b4a5dd9 100644
--- a/client/js/controllers/status.js
+++ b/client/js/controllers/status.js
@@ -9,12 +9,13 @@
 mainApp.controller('statusCtrl', ['$scope','Identity', '$rootScope', function ($scope, Identity, $rootScope)
 {
 
+	
 	// Give profile to model
     $scope.profile=Identity.getProfile();
-
+	
     // Function to logout
-    $scope.raiseLogoutEvent=function(){
-		$rootScope.$broadcast('logoutEvent');
+    $scope.logout=function(){
+		Identity.logout();
 	};
 
 }]);
diff --git a/client/js/services/Identity.js b/client/js/services/Identity.js
index da85ecd..f9d1df4 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
@@ -27,9 +27,12 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){
 		   && typeof tokenPart_1InCookie !== 'undefined'
 		  ){
 
-			// If yes, put it into variables
-			angular.extend(profile, profileInCookie);
-			token=tokenPart_0InCookie+tokenPart_1InCookie;
+			if(token!==null){
+				// If yes, put it into variables
+				angular.extend(profile, profileInCookie);
+				token=tokenPart_0InCookie+tokenPart_1InCookie;
+				
+			}
 
 			// Return I'm Login
 			return true;
@@ -51,6 +54,9 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){
 		token=null;
 		profile.username=null;
 		profile.projectname=null;
+
+		// Reload Page
+		location.reload();
 	}
 
 	
@@ -95,6 +101,7 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){
 		else{
 			requestParserResult.failReason="Please check your username, password and project name !";
 		}
+
 		
 		return requestParserResult;
 	};
diff --git a/client/js/services/Image.js b/client/js/services/Image.js
index 23b33a8..decb5b2 100644
--- a/client/js/services/Image.js
+++ b/client/js/services/Image.js
@@ -1,27 +1,76 @@
 
 mainApp.factory('Image',[ '$http', 'Identity', function($http, Identity){
 
+	var data={};
+	data.images=null;
 
 
 	var parseUploadImageAnswer=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.images=response.data.Images;
+
+		}
+		else if(failedToSendRequest){
+			requestParserResult.failReason="Failed to send request";
+		}
+		else{
+			requestParserResult.failReason="Error";
+		}
+		return requestParserResult;
 	};
 
 
 	var getImages=function(callback){
 
 		var result=$http.post('../server/index.php',
-						  $.param({"token" : Identity.profile.token, "task" : "Image"}));  
+							  $.param({"token" : Identity.getToken(), "task" : "image", 'action':'listImage'}));  
+
+		// Wait and handle the response
+        result.then(function (response){
+			callback(parseUploadImageAnswer(response, false));
+        },function(response){
+			callback(parseUploadImageAnswer(response, true));
+        });
 
-		
 		
 	};
 
+	var uploadImage=function(fileToUpload, callback) {
+
 
+		var result=$http.post('../server/index.php',
+							  $.param({"token" : Identity.getToken(), "task" : "image", 'action':'uploadImage', 'filename':fileToUpload, 'id':'6564'}));  
+
+		// Wait and handle the response
+        result.then(function (response){
+			callback(parseUploadImageAnswer(response, false));
+        },function(response){
+			callback(parseUploadImageAnswer(response, true));
+        });
+
+
+		  
+	}
+
+
+	var getData=function(response){
+		return data;
+	};
 		
 	// Return services objects
 	return {
-		uploadImage: uploadImage
+		getImages:getImages,
+		getData:getData,
+		uploadImage:uploadImage
 	};
 
 	
diff --git a/client/js/services/Loading.js b/client/js/services/Loading.js
index b12aaa0..db06194 100644
--- a/client/js/services/Loading.js
+++ b/client/js/services/Loading.js
@@ -1,22 +1,23 @@
 
-mainApp.factory('Loading',[ '$http', 'Identity', function($http, Identity){
-
-
-
-
+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
 	};
-
-
 }]);