Merge branch 'develop' into Eole_Graph

Conflicts:
	client/index.html
	client/js/controllers/home/home.js
	client/partials/home/home.html

2 files changed, 80 insertions, 15 deletions

diff --git a/client/js/controllers/image/image.js b/client/js/controllers/image/image.js
index e298fcc..d0578d7 100644
--- a/client/js/controllers/image/image.js
+++ b/client/js/controllers/image/image.js
@@ -3,19 +3,22 @@
  * 
  * @param {$scope} $scope The $scope service from angular
  */
-mainApp.controller('imageCtrl', ['$scope', 'Image', 'Loading', function ($scope, Image, Loading)
-{
-	var callbackTest=function(){
-		$scope.images=Image.getData().images;
-				Loading.stop();
-	};
+mainApp.controller('imageCtrl', ['$scope', 'Image', 'Loading', 'Identity', function ($scope, Image, Loading, Identity)
+    {
 
-	if(Image.getData().images==null){
-		Loading.start();
-		Image.getImages(callbackTest);
-	}
-	else{
-		callbackTest();
-	}
-	
-}]);
+        // Update view
+        var callMeAfterGetImage = function () {
+            $scope.images = Image.getData().images;
+            Loading.stop();
+        };
+
+        // If user is login try to retrieve data
+        if (Identity.isAlreadyLogin()) {
+            if (Image.getData().images == null) {
+                Loading.start();
+                Image.getImages(callMeAfterGetImage);
+            } else {
+                callMeAfterGetImage();
+            }
+        }
+    }]);
diff --git a/client/js/controllers/image/upload.js b/client/js/controllers/image/upload.js
new file mode 100644
index 0000000..6737269
--- /dev/null
+++ b/client/js/controllers/image/upload.js
@@ -0,0 +1,62 @@
+/**
+ * The image controller
+ * 
+ * @param {$scope} $scope The $scope service from angular
+ */
+mainApp.controller('uploadImageCtrl', ['$scope', 'Image', 'Loading', 'Identity', 'upload', function ($scope, Image, Loading, Identity, upload)
+    {
+        /*$scope.uploader = new FileUploader({
+         "token" : Identity.getToken(),
+         "task" : "image",
+         'action':'uploadImage',
+         'id':'6564'
+         });
+         $scope.uploader.url='../server/index.php'
+         $scope.uploader.alias='file_name'
+         $scope.uploader.formData={
+         "token" : Identity.getToken(),
+         "task" : "image",
+         'action':'uploadImage',
+         'id':'6564'
+         }
+         */
+
+        $scope.doUpload = function () {
+            console.log($('#imageToUpload').prop('files')[0]);
+            Image.uploadImage($('#imageToUpload').prop('files')[0], function () {
+                alert("done")
+            })
+            /*$("#drop-area-div").dmUploader({
+             extraData: 	{
+             "token" : Identity.getToken(),
+             "task" : "image",
+             'action':'uploadImage',
+             'id':'6564'},
+             url:"../server/index.php"
+             });
+             */
+
+            /*upload({
+             url: '../server/index.php',
+             method: 'POST',
+             data: {
+             "token" : Identity.getToken(),
+             "task" : "image",
+             'action':'uploadImage',
+             'id':'6564',
+             "file_name": $scope.myFile, // a jqLite type="file" element, upload() will extract all the files from the input and put them into the FormData object before sending.
+             }
+             }).then(
+             function (response) {
+             console.log(response.data); // will output whatever you choose to return from the server on a successful upload
+             },
+             function (response) {
+             console.error(response); //  Will return if status code is above 200 and lower than 300, same as $http
+             }
+             );*/
+
+
+        };
+
+        $scope.token = Identity.getToken();
+    }]);