From 96094547dd793868092dda4c2699a839287fa175 Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Sun, 6 Mar 2016 14:51:50 +0100
Subject: Add image view, controller.

---
 client/js/controllers/image/image.js | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 client/js/controllers/image/image.js

(limited to 'client/js/controllers/image/image.js')

diff --git a/client/js/controllers/image/image.js b/client/js/controllers/image/image.js
new file mode 100644
index 0000000..036dec3
--- /dev/null
+++ b/client/js/controllers/image/image.js
@@ -0,0 +1,9 @@
+/**
+ * The image controller
+ * 
+ * @param {$scope} $scope The $scope service from angular
+ */
+mainApp.controller('imageCtrl', function ($scope)
+{
+	$scope.title="Test";
+});
-- 
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/controllers/image/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 3b569b6d008d5b1936ee04948cf5c1cc08790f39 Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Sun, 6 Mar 2016 15:10:34 +0100
Subject: Make some test

---
 client/js/controllers/home/home.js   |  5 +++++
 client/js/controllers/image/image.js | 12 ++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

(limited to 'client/js/controllers/image/image.js')

diff --git a/client/js/controllers/home/home.js b/client/js/controllers/home/home.js
index 18133fa..4402e62 100644
--- a/client/js/controllers/home/home.js
+++ b/client/js/controllers/home/home.js
@@ -16,6 +16,11 @@ mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading','I
 		Loading.start();
 		Compute.pullData(callMeAfterPullData);		
 	}
+	else{
+		if(Identity.isAlreadyLogin()){
+			callMeAfterPullData();
+		}
+	}
 
 	
 	Image.getImages(function(){});
diff --git a/client/js/controllers/image/image.js b/client/js/controllers/image/image.js
index a8346b3..e298fcc 100644
--- a/client/js/controllers/image/image.js
+++ b/client/js/controllers/image/image.js
@@ -3,11 +3,19 @@
  * 
  * @param {$scope} $scope The $scope service from angular
  */
-mainApp.controller('imageCtrl', ['$scope', 'Image', function ($scope, Image)
+mainApp.controller('imageCtrl', ['$scope', 'Image', 'Loading', function ($scope, Image, Loading)
 {
 	var callbackTest=function(){
 		$scope.images=Image.getData().images;
+				Loading.stop();
 	};
 
-	Image.getImages(callbackTest);
+	if(Image.getData().images==null){
+		Loading.start();
+		Image.getImages(callbackTest);
+	}
+	else{
+		callbackTest();
+	}
+	
 }]);
-- 
cgit v1.2.3