Clean code, add comment etc..

7 files changed, 263 insertions, 244 deletions

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
-	}
 
 
-	
-}]);
+    }]);
diff --git a/client/js/controllers/image/image.js b/client/js/controllers/image/image.js
index d9a9c06..d0578d7 100644
--- a/client/js/controllers/image/image.js
+++ b/client/js/controllers/image/image.js
@@ -4,23 +4,21 @@
  * @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();
-	};
+        // Update view
+        var callMeAfterGetImage = function () {
+            $scope.images = Image.getData().images;
+            Loading.stop();
+        };
 
-	
-	if(Identity.isAlreadyLogin()){
-
-		if(Image.getData().images==null){
-			Loading.start();
-			Image.getImages(callbackTest);
-		}
-		else{
-			callbackTest();
-		}
-
-	}	
-}]);
+        // If user is login try to retrieve data
+        if (Identity.isAlreadyLogin()) {
+            if (Image.getData().images == null) {
+                Loading.start();
+                Image.getImages(callMeAfterGetImage);
+            } else {
+                callMeAfterGetImage();
+            }
+        }
+    }]);
diff --git a/client/js/controllers/image/upload.js b/client/js/controllers/image/upload.js
index d9587d0..6737269 100644
--- a/client/js/controllers/image/upload.js
+++ b/client/js/controllers/image/upload.js
@@ -3,58 +3,60 @@
  * 
  * @param {$scope} $scope The $scope service from angular
  */
-mainApp.controller('uploadImageCtrl', ['$scope', 'Image', 'Loading', 'Identity', 'upload', function ($scope, Image, Loading, Identity,upload)
-{
+mainApp.controller('uploadImageCtrl', ['$scope', 'Image', 'Loading', 'Identity', 'upload', function ($scope, Image, Loading, Identity, upload)
+    {
         /*$scope.uploader = new FileUploader({
-					"token" : Identity.getToken(),
-					"task" : "image",
-					'action':'uploadImage',
-					'id':'6564'
-				});
-        $scope.uploader.url='../server/index.php'
-        $scope.uploader.alias='file_name'
-        $scope.uploader.formData={
-					"token" : Identity.getToken(),
-					"task" : "image",
-					'action':'uploadImage',
-					'id':'6564'
-				}
-	*/
+         "token" : Identity.getToken(),
+         "task" : "image",
+         'action':'uploadImage',
+         'id':'6564'
+         });
+         $scope.uploader.url='../server/index.php'
+         $scope.uploader.alias='file_name'
+         $scope.uploader.formData={
+         "token" : Identity.getToken(),
+         "task" : "image",
+         'action':'uploadImage',
+         'id':'6564'
+         }
+         */
 
-	$scope.doUpload = function () {
-		console.log($('#imageToUpload').prop('files')[0]); 
-		Image.uploadImage($('#imageToUpload').prop('files')[0], function(){alert("done")})
-		/*$("#drop-area-div").dmUploader({
-				extraData: 	{
-				"token" : Identity.getToken(),
-				"task" : "image",
-				'action':'uploadImage',
-				'id':'6564'},
-				url:"../server/index.php"
-		});
-		*/
-		
-		/*upload({
-			url: '../server/index.php',
-			method: 'POST',
-			data: {
-			"token" : Identity.getToken(),
-			"task" : "image",
-			'action':'uploadImage',
-			'id':'6564',
-			"file_name": $scope.myFile, // a jqLite type="file" element, upload() will extract all the files from the input and put them into the FormData object before sending.
-			}
-		}).then(
-			  function (response) {
-				console.log(response.data); // will output whatever you choose to return from the server on a successful upload
-			  },
-			  function (response) {
-				  console.error(response); //  Will return if status code is above 200 and lower than 300, same as $http
-			  }
-		);*/
-    
-    
-	};
-	
-        $scope.token=Identity.getToken();
-}]);
+        $scope.doUpload = function () {
+            console.log($('#imageToUpload').prop('files')[0]);
+            Image.uploadImage($('#imageToUpload').prop('files')[0], function () {
+                alert("done")
+            })
+            /*$("#drop-area-div").dmUploader({
+             extraData: 	{
+             "token" : Identity.getToken(),
+             "task" : "image",
+             'action':'uploadImage',
+             'id':'6564'},
+             url:"../server/index.php"
+             });
+             */
+
+            /*upload({
+             url: '../server/index.php',
+             method: 'POST',
+             data: {
+             "token" : Identity.getToken(),
+             "task" : "image",
+             'action':'uploadImage',
+             'id':'6564',
+             "file_name": $scope.myFile, // a jqLite type="file" element, upload() will extract all the files from the input and put them into the FormData object before sending.
+             }
+             }).then(
+             function (response) {
+             console.log(response.data); // will output whatever you choose to return from the server on a successful upload
+             },
+             function (response) {
+             console.error(response); //  Will return if status code is above 200 and lower than 300, same as $http
+             }
+             );*/
+
+
+        };
+
+        $scope.token = Identity.getToken();
+    }]);
diff --git a/client/js/controllers/network/network.js b/client/js/controllers/network/network.js
index 7264aec..f600f83 100644
--- a/client/js/controllers/network/network.js
+++ b/client/js/controllers/network/network.js
@@ -5,4 +5,5 @@
  */
 mainApp.controller('networkCtrl', function ($scope)
 {
+
 });
\ No newline at end of file
diff --git a/client/js/services/Image.js b/client/js/services/Image.js
index 4947a1d..795f85e 100644
--- a/client/js/services/Image.js
+++ b/client/js/services/Image.js
@@ -1,102 +1,114 @@
 
-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.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 form_data = new FormData();                  
-		form_data.append('file', fileToUpload);
-		console.log(fileToUpload);
-		form_data.append("task" , "image");
-		form_data.append("token" , Identity.getToken());
-		form_data.append('action',"uploadImage");
-		form_data.append('id','6564');
-		form_data.append('file_name', fileToUpload);
-
-		$.ajax({
-		url: "../server/index.php", // Url to which the request is send
-		type: "POST",             // Type of request to be send, called as method
-		data: form_data, // Data sent to server, a set of key/value pairs (i.e. form fields and values)
-		file_name:fileToUpload,
-		token : Identity.getToken(),
-		task : "image",
-		action:'uploadImage',
-		id:'6564',
-		contentType: false,       // The content type used when sending data to the server.
-		cache: false,             // To unable request pages to be cached
-		processData:false,        // To send DOMDocument or non processed data file it is set to false
-		success: function(data)   // A function to be called if request succeeds
-			{
-				alert("success");
-			}
-		});
-
-		//var result=$http.post('../server/index.php',
-			//				  $.param({"token" : Identity.getToken(), "task" : "image", 'action':'uploadImage', 'file_name':form_data, '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 {
-		getImages:getImages,
-		getData:getData,
-		uploadImage:uploadImage
-	};
-
-	
-}]);
+mainApp.factory('Image', ['$http', 'Identity', function ($http, Identity) {
+
+        // Data object
+        var data = {};
+        data.images = null; // Images
+
+        /**
+         *  Parse uploadImage anwser
+         * @param {type} response
+         * @param {type} failedToSendRequest
+         * @returns {Image_L2.parseUploadImageAnswer.requestParserResult}
+         */
+        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;
+        };
+
+
+        /**
+         *  Get images
+         * @param {type} callback
+         * @returns {undefined}
+         */
+        var getImages = function (callback) {
+
+            var result = $http.post('../server/index.php',
+                    $.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));
+            });
+
+
+        };
+
+        /**
+         * Upload an image
+         * @param {type} fileToUpload
+         * @param {type} callback
+         * @returns {undefined}
+         */
+        var uploadImage = function (fileToUpload, callback) {
+            var form_data = new FormData();
+            form_data.append('file', fileToUpload);
+            console.log(fileToUpload);
+            form_data.append("task", "image");
+            form_data.append("token", Identity.getToken());
+            form_data.append('action', "uploadImage");
+            form_data.append('id', '6564');
+            form_data.append('file_name', fileToUpload);
+
+            $.ajax({
+                url: "../server/index.php", // Url to which the request is send
+                type: "POST", // Type of request to be send, called as method
+                data: form_data, // Data sent to server, a set of key/value pairs (i.e. form fields and values)
+                file_name: fileToUpload,
+                token: Identity.getToken(),
+                task: "image",
+                action: 'uploadImage',
+                id: '6564',
+                contentType: false, // The content type used when sending data to the server.
+                cache: false, // To unable request pages to be cached
+                processData: false, // To send DOMDocument or non processed data file it is set to false
+                success: function (data)   // A function to be called if request succeeds
+                {
+                    alert("success");
+                }
+            });
+
+            //var result=$http.post('../server/index.php',
+            //				  $.param({"token" : Identity.getToken(), "task" : "image", 'action':'uploadImage', 'file_name':form_data, '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 {
+            getImages: getImages,
+            getData: getData,
+            uploadImage: uploadImage
+        };
+
+
+    }]);
diff --git a/client/js/services/Loading.js b/client/js/services/Loading.js
index db06194..7ea2b42 100644
--- a/client/js/services/Loading.js
+++ b/client/js/services/Loading.js
@@ -1,23 +1,26 @@
+/**
+ * Loading service
+ * @param {type} param1
+ * @param {type} param2
+ */
+mainApp.factory('Loading', [function () {
+        /**
+         * Display Loading modal
+         */
+        var start = function () {
+            $('#loadingModal').modal({backdrop: 'static', keyboard: false});
+        };
 
-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');
+        };
 
-	/**
-	 * Hide Loading modal
-	 */
-	var stop=function(){
-		$('#loadingModal').modal('hide');
-	}
-
-
-	// Service returns
-	return {
-		start:start,
-		stop:stop
-	};
-}]);
+        // Service returns
+        return {
+            start: start,
+            stop: stop
+        };
+    }]);
diff --git a/client/js/services/Network.js b/client/js/services/Network.js
index bd2a24f..a0cd5a4 100644
--- a/client/js/services/Network.js
+++ b/client/js/services/Network.js
@@ -1,27 +1,29 @@
 
-mainApp.factory('Network',[ '$http', 'Identity', function($http, Identity){
-
-	var data={};
-	data.networks=null;
-
-var ListId=function(fileToUpload, callback) {
-
-
-		var result=$http.post('../server/index.php',
-							  $.param({"token" : Identity.getToken(), "task" : "network", 'action':'list_network_ids'}));  
-
-		// Wait and handle the response
-        result.then(function (response){
-			callback(parseUploadImageAnswer(response, false));
-        },function(response){
-			callback(parseUploadImageAnswer(response, true));
-        });
-
-		console.log(result)
-		  
-	}
-
-
-}]);
+mainApp.factory('Network', ['$http', 'Identity', function ($http, Identity) {
+
+        // Data object
+        var data = {};
+        data.networks = null; // Networks
+
+        /**
+         * ListId
+         * @param {type} fileToUpload
+         * @param {type} callback
+         * @returns {undefined}
+         */
+        var ListId = function (fileToUpload, callback) {
+            var result = $http.post('../server/index.php',
+                    $.param({"token": Identity.getToken(), "task": "network", 'action': 'list_network_ids'}));
+
+            // Wait and handle the response
+            result.then(function (response) {
+                callback(parseUploadImageAnswer(response, false));
+            }, function (response) {
+                callback(parseUploadImageAnswer(response, true));
+            });
+        };
+
+
+    }]);