loic/istic-openstack
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean code, add comment etc..

Browse source
This commit is contained in:
Loic GUEGAN 2016-04-17 18:50:05 +02:00
parent 968eda48cc
commit bb1598713c
7 changed files with 251 additions and 232 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
client/js/controllers/home/machineDetails.js
View file

@ -3,42 +3,43 @@
* *
* @param {$scope} $scope The $scope service from angular * @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 // Init scope
$scope.machine={}; $scope.machine = {};
$scope.machineIsStarting=false; // For loading icon $scope.machineIsStarting = false; // For loading icon
// When we need to show details of machine
$scope.$on('showMachineDetailsEvent', function(eventName ,machine, axioms){ $scope.$on('showMachineDetailsEvent', function (eventName, machine, axioms) {
$scope.machine=machine; $scope.machine = machine;
$scope.axioms=axioms; $scope.axioms = axioms;
$('#machineDetailsModal').modal({backdrop: false, keyboard: true}); $('#machineDetailsModal').modal({backdrop: false, keyboard: true});
}); });
// Try to stop or start a machine
$scope.toggleMachineState=function(){ $scope.toggleMachineState = function () {
// Display gif // Display gif
$scope.machineIsStarting=true; $scope.machineIsStarting = true;
// Fake timeout // Fake timeout
$timeout(function(){ $timeout(function () {
$scope.machineIsStarting=false; $scope.machineIsStarting = false;
}, 3000); }, 3000);
$timeout(function(){ $timeout(function () {
$scope.machine.online=!$scope.machine.online; $scope.machine.online = !$scope.machine.online;
}, 3000); }, 3000);
}; };
$scope.applyModifications=function(){ // Apply modifications
$scope.applyModifications = function () {
//Todo //Todo
} };
}]); }]);

24
client/js/controllers/image/image.js
View file

@ -4,23 +4,21 @@
* @param {$scope} $scope The $scope service from angular * @param {$scope} $scope The $scope service from angular
*/ */
mainApp.controller('imageCtrl', ['$scope', 'Image', 'Loading', 'Identity', function ($scope, Image, Loading, Identity) mainApp.controller('imageCtrl', ['$scope', 'Image', 'Loading', 'Identity', function ($scope, Image, Loading, Identity)
{ {
var callbackTest=function(){ // Update view
$scope.images=Image.getData().images; var callMeAfterGetImage = function () {
$scope.images = Image.getData().images;
Loading.stop(); Loading.stop();
}; };
// If user is login try to retrieve data
if(Identity.isAlreadyLogin()){ if (Identity.isAlreadyLogin()) {
if (Image.getData().images == null) {
if(Image.getData().images==null){
Loading.start(); Loading.start();
Image.getImages(callbackTest); Image.getImages(callMeAfterGetImage);
} else {
callMeAfterGetImage();
} }
else{
callbackTest();
} }
}]);
}
}]);

12
client/js/controllers/image/upload.js
View file

@ -3,8 +3,8 @@
* *
* @param {$scope} $scope The $scope service from angular * @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({ /*$scope.uploader = new FileUploader({
"token" : Identity.getToken(), "token" : Identity.getToken(),
"task" : "image", "task" : "image",
@ -23,7 +23,9 @@ mainApp.controller('uploadImageCtrl', ['$scope', 'Image', 'Loading', 'Identity',
$scope.doUpload = function () { $scope.doUpload = function () {
console.log($('#imageToUpload').prop('files')[0]); console.log($('#imageToUpload').prop('files')[0]);
Image.uploadImage($('#imageToUpload').prop('files')[0], function(){alert("done")}) Image.uploadImage($('#imageToUpload').prop('files')[0], function () {
alert("done")
})
/*$("#drop-area-div").dmUploader({ /*$("#drop-area-div").dmUploader({
extraData: { extraData: {
"token" : Identity.getToken(), "token" : Identity.getToken(),
@ -56,5 +58,5 @@ mainApp.controller('uploadImageCtrl', ['$scope', 'Image', 'Loading', 'Identity',
}; };
$scope.token=Identity.getToken(); $scope.token = Identity.getToken();
}]); }]);

1
client/js/controllers/network/network.js
View file

@ -5,4 +5,5 @@
*/ */
mainApp.controller('networkCtrl', function ($scope) mainApp.controller('networkCtrl', function ($scope)
{ {
}); });

96
client/js/services/Image.js
View file

@ -1,72 +1,87 @@
mainApp.factory('Image',[ '$http', 'Identity', function($http, Identity){ mainApp.factory('Image', ['$http', 'Identity', function ($http, Identity) {
var data={}; // Data object
data.images=null; var data = {};
data.images = null; // Images
/**
var parseUploadImageAnswer=function(response, failedToSendRequest){ * Parse uploadImage anwser
* @param {type} response
* @param {type} failedToSendRequest
* @returns {Image_L2.parseUploadImageAnswer.requestParserResult}
*/
var parseUploadImageAnswer = function (response, failedToSendRequest) {
// Defined return object // Defined return object
var requestParserResult={}; var requestParserResult = {};
requestParserResult.status=1; requestParserResult.status = 1;
requestParserResult.failReason=null; requestParserResult.failReason = null;
if (typeof response.data.Images !== 'undefined') { if (typeof response.data.Images !== 'undefined') {
// Set status code // Set status code
requestParserResult.status=0; requestParserResult.status = 0;
data.images=response.data.Images; data.images = response.data.Images;
} } else if (failedToSendRequest) {
else if(failedToSendRequest){ requestParserResult.failReason = "Failed to send request";
requestParserResult.failReason="Failed to send request"; } else {
} requestParserResult.failReason = "Error";
else{
requestParserResult.failReason="Error";
} }
return requestParserResult; return requestParserResult;
}; };
var getImages=function(callback){ /**
* Get images
* @param {type} callback
* @returns {undefined}
*/
var getImages = function (callback) {
var result=$http.post('../server/index.php', var result = $http.post('../server/index.php',
$.param({"token" : Identity.getToken(), "task" : "image", 'action':'listImage'})); $.param({"token": Identity.getToken(), "task": "image", 'action': 'listImage'}));
// Wait and handle the response // Wait and handle the response
result.then(function (response){ result.then(function (response) {
callback(parseUploadImageAnswer(response, false)); callback(parseUploadImageAnswer(response, false));
},function(response){ }, function (response) {
callback(parseUploadImageAnswer(response, true)); callback(parseUploadImageAnswer(response, true));
}); });
}; };
var uploadImage=function(fileToUpload, callback) { /**
* Upload an image
* @param {type} fileToUpload
* @param {type} callback
* @returns {undefined}
*/
var uploadImage = function (fileToUpload, callback) {
var form_data = new FormData(); var form_data = new FormData();
form_data.append('file', fileToUpload); form_data.append('file', fileToUpload);
console.log(fileToUpload); console.log(fileToUpload);
form_data.append("task" , "image"); form_data.append("task", "image");
form_data.append("token" , Identity.getToken()); form_data.append("token", Identity.getToken());
form_data.append('action',"uploadImage"); form_data.append('action', "uploadImage");
form_data.append('id','6564'); form_data.append('id', '6564');
form_data.append('file_name', fileToUpload); form_data.append('file_name', fileToUpload);
$.ajax({ $.ajax({
url: "../server/index.php", // Url to which the request is send url: "../server/index.php", // Url to which the request is send
type: "POST", // Type of request to be send, called as method 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) data: form_data, // Data sent to server, a set of key/value pairs (i.e. form fields and values)
file_name:fileToUpload, file_name: fileToUpload,
token : Identity.getToken(), token: Identity.getToken(),
task : "image", task: "image",
action:'uploadImage', action: 'uploadImage',
id:'6564', id: '6564',
contentType: false, // The content type used when sending data to the server. contentType: false, // The content type used when sending data to the server.
cache: false, // To unable request pages to be cached cache: false, // To unable request pages to be cached
processData:false, // To send DOMDocument or non processed data file it is set to false 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 success: function (data) // A function to be called if request succeeds
{ {
alert("success"); alert("success");
} }
@ -81,22 +96,19 @@ mainApp.factory('Image',[ '$http', 'Identity', function($http, Identity){
},function(response){ },function(response){
callback(parseUploadImageAnswer(response, true)); callback(parseUploadImageAnswer(response, true));
});*/ });*/
};
var getData = function (response) {
}
var getData=function(response){
return data; return data;
}; };
// Return services objects // Return services objects
return { return {
getImages:getImages, getImages: getImages,
getData:getData, getData: getData,
uploadImage:uploadImage uploadImage: uploadImage
}; };
}]); }]);

21
client/js/services/Loading.js
View file

@ -1,23 +1,26 @@
/**
mainApp.factory('Loading',[ function(){ * Loading service
* @param {type} param1
* @param {type} param2
*/
mainApp.factory('Loading', [function () {
/** /**
* Display Loading modal * Display Loading modal
*/ */
var start=function(){ var start = function () {
$('#loadingModal').modal({backdrop: 'static', keyboard: false}); $('#loadingModal').modal({backdrop: 'static', keyboard: false});
}; };
/** /**
* Hide Loading modal * Hide Loading modal
*/ */
var stop=function(){ var stop = function () {
$('#loadingModal').modal('hide'); $('#loadingModal').modal('hide');
} };
// Service returns // Service returns
return { return {
start:start, start: start,
stop:stop stop: stop
}; };
}]); }]);

32
client/js/services/Network.js
View file

@ -1,27 +1,29 @@
mainApp.factory('Network',[ '$http', 'Identity', function($http, Identity){ mainApp.factory('Network', ['$http', 'Identity', function ($http, Identity) {
var data={}; // Data object
data.networks=null; var data = {};
data.networks = null; // Networks
var ListId=function(fileToUpload, callback) { /**
* ListId
* @param {type} fileToUpload
var result=$http.post('../server/index.php', * @param {type} callback
$.param({"token" : Identity.getToken(), "task" : "network", 'action':'list_network_ids'})); * @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 // Wait and handle the response
result.then(function (response){ result.then(function (response) {
callback(parseUploadImageAnswer(response, false)); callback(parseUploadImageAnswer(response, false));
},function(response){ }, function (response) {
callback(parseUploadImageAnswer(response, true)); callback(parseUploadImageAnswer(response, true));
}); });
};
console.log(result)
}
}]); }]);