From 3454c71f0523bd6957e10873d0b95bc191b2f283 Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Sun, 6 Mar 2016 14:42:50 +0100
Subject: Test request

---
 client/js/services/Image.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'client/js/services/Image.js')

diff --git a/client/js/services/Image.js b/client/js/services/Image.js
index 23b33a8..eccd4af 100644
--- a/client/js/services/Image.js
+++ b/client/js/services/Image.js
@@ -4,16 +4,22 @@ mainApp.factory('Image',[ '$http', 'Identity', function($http, Identity){
 
 
 	var parseUploadImageAnswer=function(response, failedToSendRequest){
-		
+		console.log(response.data.Images[0])
 	};
 
 
 	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));
+        });
 
-		
 		
 	};
 
@@ -21,7 +27,7 @@ mainApp.factory('Image',[ '$http', 'Identity', function($http, Identity){
 		
 	// Return services objects
 	return {
-		uploadImage: uploadImage
+		getImages:getImages
 	};
 
 	
-- 
cgit v1.2.3


From b0b2dc9a6451fc1a2d41b255600094da1ece6485 Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Sun, 6 Mar 2016 15:04:47 +0100
Subject: Avalaible images can be display

---
 client/js/controllers/image/image.js | 10 +++++++---
 client/js/services/Image.js          | 29 +++++++++++++++++++++++++++--
 client/partials/image/image.html     |  8 +++++---
 3 files changed, 39 insertions(+), 8 deletions(-)

(limited to 'client/js/services/Image.js')

diff --git a/client/js/controllers/image/image.js b/client/js/controllers/image/image.js
index 036dec3..a8346b3 100644
--- a/client/js/controllers/image/image.js
+++ b/client/js/controllers/image/image.js
@@ -3,7 +3,11 @@
  * 
  * @param {$scope} $scope The $scope service from angular
  */
-mainApp.controller('imageCtrl', function ($scope)
+mainApp.controller('imageCtrl', ['$scope', 'Image', function ($scope, Image)
 {
-	$scope.title="Test";
-});
+	var callbackTest=function(){
+		$scope.images=Image.getData().images;
+	};
+
+	Image.getImages(callbackTest);
+}]);
diff --git a/client/js/services/Image.js b/client/js/services/Image.js
index eccd4af..2e8c56f 100644
--- a/client/js/services/Image.js
+++ b/client/js/services/Image.js
@@ -1,10 +1,31 @@
 
 mainApp.factory('Image',[ '$http', 'Identity', function($http, Identity){
 
+	var data={};
+	data.images=null;
 
 
 	var parseUploadImageAnswer=function(response, failedToSendRequest){
-		console.log(response.data.Images[0])
+
+		// 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;
 	};
 
 
@@ -24,10 +45,14 @@ mainApp.factory('Image',[ '$http', 'Identity', function($http, Identity){
 	};
 
 
+	var getData=function(response){
+		return data;
+	};
 		
 	// Return services objects
 	return {
-		getImages:getImages
+		getImages:getImages,
+		getData:getData
 	};
 
 	
diff --git a/client/partials/image/image.html b/client/partials/image/image.html
index 586f003..8af8af5 100644
--- a/client/partials/image/image.html
+++ b/client/partials/image/image.html
@@ -1,8 +1,10 @@
- <div class="panel panel-default">
+ <div class="panel panel-default" ng-controller="imageCtrl">
     <div class="panel-heading">
-        Image
+        Images disponibles
     </div>
     <div class="panel-body">
-        Main Content
+        <div ng-repeat="image in images">
+			{{image.name}}
+		</div>
     </div>
 </div>
-- 
cgit v1.2.3


From 8ad216dedf017f3d6de047a25d08db3b98e16361 Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Wed, 9 Mar 2016 15:33:52 +0100
Subject: test

---
 client/index.html                    |  2 +-
 client/js/controllers/image/image.js |  6 +++++-
 client/js/services/Image.js          | 20 +++++++++++++++++++-
 client/partials/image/image.html     |  7 +++++++
 4 files changed, 32 insertions(+), 3 deletions(-)

(limited to 'client/js/services/Image.js')

diff --git a/client/index.html b/client/index.html
index a06994c..7ff859d 100644
--- a/client/index.html
+++ b/client/index.html
@@ -66,7 +66,7 @@
     
     <!-- Include JQuery -->
     <script src="./vendors/jquery/jquery-2.2.0.min.js"></script>
-
+	
     <!-- Include Bootstrap -->
     <script src="./vendors/bootstrap/js/bootstrap.min.js"></script>
     
diff --git a/client/js/controllers/image/image.js b/client/js/controllers/image/image.js
index e298fcc..d499acb 100644
--- a/client/js/controllers/image/image.js
+++ b/client/js/controllers/image/image.js
@@ -3,7 +3,7 @@
  * 
  * @param {$scope} $scope The $scope service from angular
  */
-mainApp.controller('imageCtrl', ['$scope', 'Image', 'Loading', function ($scope, Image, Loading)
+mainApp.controller('imageCtrl', ['$scope', 'Image', 'Loading',function ($scope, Image, Loading)
 {
 	var callbackTest=function(){
 		$scope.images=Image.getData().images;
@@ -17,5 +17,9 @@ mainApp.controller('imageCtrl', ['$scope', 'Image', 'Loading', function ($scope,
 	else{
 		callbackTest();
 	}
+
+	$scope.doUpload = function () {
+		Image.uploadImage($scope.myFile,function(){});
+	};
 	
 }]);
diff --git a/client/js/services/Image.js b/client/js/services/Image.js
index 2e8c56f..decb5b2 100644
--- a/client/js/services/Image.js
+++ b/client/js/services/Image.js
@@ -44,6 +44,23 @@ 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'}));  
+
+		// 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;
@@ -52,7 +69,8 @@ mainApp.factory('Image',[ '$http', 'Identity', function($http, Identity){
 	// Return services objects
 	return {
 		getImages:getImages,
-		getData:getData
+		getData:getData,
+		uploadImage:uploadImage
 	};
 
 	
diff --git a/client/partials/image/image.html b/client/partials/image/image.html
index 8af8af5..3f597fb 100644
--- a/client/partials/image/image.html
+++ b/client/partials/image/image.html
@@ -6,5 +6,12 @@
         <div ng-repeat="image in images">
 			{{image.name}}
 		</div>
+		<br />
+
+		<input name="myFile" type="file" />
+		<br />
+		<button type="button" ng-click="doUpload()" class="btn btn-primary">Upload</button>
+
+
     </div>
 </div>
-- 
cgit v1.2.3