summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--client/js/controllers/image/image.js10
-rw-r--r--client/js/services/Image.js29
-rw-r--r--client/partials/image/image.html8
3 files changed, 39 insertions, 8 deletions
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>