diff options
Diffstat (limited to 'client/js/services')
| -rw-r--r-- | client/js/services/Compute.js | 10 | ||||
| -rw-r--r-- | client/js/services/Identity.js | 16 | ||||
| -rw-r--r-- | client/js/services/Image.js | 37 | ||||
| -rw-r--r-- | client/js/services/Network.js | 27 | ||||
| -rw-r--r-- | client/js/services/Test.js | 8 |
5 files changed, 84 insertions, 14 deletions
diff --git a/client/js/services/Compute.js b/client/js/services/Compute.js index 36ddc16..2bf28d8 100644 --- a/client/js/services/Compute.js +++ b/client/js/services/Compute.js @@ -32,7 +32,7 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){ } else if(failedToSendRequest){ - requestParserResult.failReason="Failed to send request"; + requestParserResult.failReason="Failed to send PullMachine request"; } else{ requestParserResult.failReason="Error"; @@ -79,7 +79,7 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){ data.axioms.images=response.data.Images; } else if(failedToSendRequest){ - requestParserResult.failReason="Failed to send request"; + requestParserResult.failReason="Failed to send PullImage request"; } else{ requestParserResult.failReason="Error"; @@ -101,8 +101,11 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){ // Wait and handle the response result.then(function (response){ + alert(Identity.getToken()); + callback(parsePullImagesAnswer(response, false)); },function(response){ + callback(parsePullImagesAnswer(response, true)); }); }; @@ -117,6 +120,9 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){ if(response.status==0){ pullMachines(callback); } + else{ + callback(response); + } } pullImages(nextFunction); } diff --git a/client/js/services/Identity.js b/client/js/services/Identity.js index f9d1df4..73e5d86 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', '$rootScope', function($http, $cookies, $rootScope){ /* Create profile structure to store informations * about current session @@ -27,17 +27,19 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){ && typeof tokenPart_1InCookie !== 'undefined' ){ - if(token!==null){ + //if(token!==null){ // If yes, put it into variables angular.extend(profile, profileInCookie); token=tokenPart_0InCookie+tokenPart_1InCookie; - - } + //} // Return I'm Login return true; } - + + // Show the login overlay + $rootScope.$broadcast("logoutEvent"); + // Return I'm not Login return false; } @@ -56,7 +58,9 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){ profile.projectname=null; // Reload Page - location.reload(); + //location.reload(); + $rootScope.$broadcast("logoutEvent"); + } diff --git a/client/js/services/Image.js b/client/js/services/Image.js index decb5b2..d6c9fed 100644 --- a/client/js/services/Image.js +++ b/client/js/services/Image.js @@ -45,17 +45,42 @@ mainApp.factory('Image',[ '$http', 'Identity', function($http, Identity){ }; var uploadImage=function(fileToUpload, callback) { - - - var result=$http.post('../server/index.php', - $.param({"token" : Identity.getToken(), "task" : "image", 'action':'uploadImage', 'filename':fileToUpload, 'id':'6564'})); + 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){ + /* result.then(function (response){ callback(parseUploadImageAnswer(response, false)); },function(response){ callback(parseUploadImageAnswer(response, true)); - }); + });*/ diff --git a/client/js/services/Network.js b/client/js/services/Network.js new file mode 100644 index 0000000..bd2a24f --- /dev/null +++ b/client/js/services/Network.js @@ -0,0 +1,27 @@ + +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) + + } + + +}]); + + diff --git a/client/js/services/Test.js b/client/js/services/Test.js new file mode 100644 index 0000000..f12c6b9 --- /dev/null +++ b/client/js/services/Test.js @@ -0,0 +1,8 @@ +var app = angular.module('mainApp',[]); +app.controller('hassan', function($scope,$http){ + $http.get('http://127.0.0.1/database.json').success(function(response){ + $scope.persons = response.records; +}); + + +}); |