From ae4e0282310b3ab3fe1d92b24b857bf56ceda09a Mon Sep 17 00:00:00 2001
From: Loic GUEGAN <loic@Manzerbredes.home>
Date: Sun, 17 Apr 2016 20:43:41 +0200
Subject: Add functionnality

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

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

diff --git a/client/js/controllers/image/edit.js b/client/js/controllers/image/edit.js
new file mode 100644
index 0000000..3635e21
--- /dev/null
+++ b/client/js/controllers/image/edit.js
@@ -0,0 +1,13 @@
+/**
+ * The image controller
+ * 
+ * @param {$scope} $scope The $scope service from angular
+ */
+mainApp.controller('editImageCtrl', ['$scope', 'Image', 'Loading', 'Identity', 'upload', function ($scope, Image, Loading, Identity, upload)
+    {
+        $scope.$on('editImageEvent', function (eventName, image) {
+            $scope.image = image;
+            $('#editImageModal').modal('show');
+            console.log(image)
+        });
+    }]);
-- 
cgit v1.2.3


From 5b5f526aa0cce998657c0c4569686ba356ddb77d Mon Sep 17 00:00:00 2001
From: Loic GUEGAN <loic@Manzerbredes.home>
Date: Mon, 18 Apr 2016 13:16:50 +0200
Subject: Correct bug

---
 client/js/controllers/image/edit.js  |  3 ++-
 client/js/controllers/image/image.js |  2 +-
 client/js/services/Image.js          |  4 +++-
 client/partials/image/edit.html      | 21 +++++++++++++--------
 4 files changed, 19 insertions(+), 11 deletions(-)

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

diff --git a/client/js/controllers/image/edit.js b/client/js/controllers/image/edit.js
index 3635e21..bab4064 100644
--- a/client/js/controllers/image/edit.js
+++ b/client/js/controllers/image/edit.js
@@ -5,8 +5,9 @@
  */
 mainApp.controller('editImageCtrl', ['$scope', 'Image', 'Loading', 'Identity', 'upload', function ($scope, Image, Loading, Identity, upload)
     {
-        $scope.$on('editImageEvent', function (eventName, image) {
+        $scope.$on('editImageEvent', function (eventName, image,axioms) {
             $scope.image = image;
+            $scope.axioms=axioms;
             $('#editImageModal').modal('show');
             console.log(image)
         });
diff --git a/client/js/controllers/image/image.js b/client/js/controllers/image/image.js
index b74dc76..1702cb3 100644
--- a/client/js/controllers/image/image.js
+++ b/client/js/controllers/image/image.js
@@ -23,7 +23,7 @@ mainApp.controller('imageCtrl', ['$scope', 'Image', 'Loading', 'Identity','$root
         }
         
         $scope.edit=function(image){
-            $rootScope.$broadcast("editImageEvent", image);
+            $rootScope.$broadcast("editImageEvent", image, Image.getData().axioms);
             
         }
     }]);
diff --git a/client/js/services/Image.js b/client/js/services/Image.js
index 795f85e..190bbb6 100644
--- a/client/js/services/Image.js
+++ b/client/js/services/Image.js
@@ -4,7 +4,9 @@ mainApp.factory('Image', ['$http', 'Identity', function ($http, Identity) {
         // Data object
         var data = {};
         data.images = null; // Images
-
+        data.axioms={};
+        data.axioms.protected=[true,false];
+        data.axioms.visibility=["public", "private"];
         /**
          *  Parse uploadImage anwser
          * @param {type} response
diff --git a/client/partials/image/edit.html b/client/partials/image/edit.html
index de7b5a0..1200bcd 100644
--- a/client/partials/image/edit.html
+++ b/client/partials/image/edit.html
@@ -18,15 +18,20 @@
                         <div class="col-sm-10">
                             <p class="form-control-static">{{ image.name}}</p>
                         </div>
-                        <label class="control-label col-sm-2">Protected</label>
-                        <div class="col-sm-10">
-                            <p class="form-control-static">{{ image.protected}}</p>
-                        </div>
-                        <label class="control-label col-sm-2">Visibility</label>
-                        <div class="col-sm-10">
-                            <p class="form-control-static">{{ image.visibility}}</p>
-                        </div>
+
                     </div>
+                    <fieldset class="form-group">
+                        <label class="control-label col-sm-2">Visibility</label>
+                        <select class="col-sm-20" id="visibilitySelected">
+                            <option ng-repeat="visibility in axioms.visibility" ng-selected="image.visibility == visibility">{{ visibility}}</option>
+                        </select>  
+                    </fieldset>
+                    <fieldset class="form-group">
+                        <label class="control-label col-sm-2">Protected</label>
+                        <select class="col-sm-20" id="protectedSelected">
+                            <option ng-repeat="protected in axioms.protected" ng-selected="image.protected == protected">{{ protected}}</option>
+                        </select>
+                    </fieldset>
 
                 </form>
                 <div class="modal-footer"> 
-- 
cgit v1.2.3


From 7a587387aab354e8101dc04ee54c78ab4b036617 Mon Sep 17 00:00:00 2001
From: Loic GUEGAN <loic@Manzerbredes.home>
Date: Wed, 20 Apr 2016 09:10:02 +0200
Subject: Debug

---
 client/js/controllers/image/edit.js | 14 ++++++++++++--
 client/js/services/Image.js         | 30 +++++++++++++++++++++++++++---
 client/partials/image/edit.html     |  8 ++++----
 3 files changed, 43 insertions(+), 9 deletions(-)

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

diff --git a/client/js/controllers/image/edit.js b/client/js/controllers/image/edit.js
index bab4064..14c1949 100644
--- a/client/js/controllers/image/edit.js
+++ b/client/js/controllers/image/edit.js
@@ -5,10 +5,20 @@
  */
 mainApp.controller('editImageCtrl', ['$scope', 'Image', 'Loading', 'Identity', 'upload', function ($scope, Image, Loading, Identity, upload)
     {
-        $scope.$on('editImageEvent', function (eventName, image,axioms) {
+        $scope.$on('editImageEvent', function (eventName, image, axioms) {
             $scope.image = image;
-            $scope.axioms=axioms;
+            $scope.axioms = axioms;
             $('#editImageModal').modal('show');
             console.log(image)
         });
+        $scope.data = {};
+        $scope.data.visibility = "public";
+        $scope.data.protected = false;
+
+        $scope.updateImage = function (image) {
+            image.visibility = $scope.data.visibility;
+            image.protected = $scope.data.protected;
+            Image.updateImage(image, function(){});
+
+        };
     }]);
diff --git a/client/js/services/Image.js b/client/js/services/Image.js
index 190bbb6..4dc835e 100644
--- a/client/js/services/Image.js
+++ b/client/js/services/Image.js
@@ -4,9 +4,9 @@ mainApp.factory('Image', ['$http', 'Identity', function ($http, Identity) {
         // Data object
         var data = {};
         data.images = null; // Images
-        data.axioms={};
-        data.axioms.protected=[true,false];
-        data.axioms.visibility=["public", "private"];
+        data.axioms = {};
+        data.axioms.protected = [true, false];
+        data.axioms.visibility = ["public", "private"];
         /**
          *  Parse uploadImage anwser
          * @param {type} response
@@ -55,6 +55,29 @@ mainApp.factory('Image', ['$http', 'Identity', function ($http, Identity) {
 
         };
 
+        /**
+         * Update image
+         * @param {type} image
+         * @param {type} callback
+         * @returns {undefined}
+         */
+        var updateImage = function (image, callback) {
+
+            var result = $http.post('../server/index.php',
+                    $.param({"token": Identity.getToken(), "task": "image", 'action': 'updateImage', 'id': image.id, 'opt': image}));
+
+            // Wait and handle the response
+            result.then(function (response) {
+                callback();
+            }, function (response) {
+                alert(response)
+            });
+
+
+        };
+
+
+
         /**
          * Upload an image
          * @param {type} fileToUpload
@@ -108,6 +131,7 @@ mainApp.factory('Image', ['$http', 'Identity', function ($http, Identity) {
         // Return services objects
         return {
             getImages: getImages,
+            updateImage: updateImage,
             getData: getData,
             uploadImage: uploadImage
         };
diff --git a/client/partials/image/edit.html b/client/partials/image/edit.html
index 1200bcd..32c6958 100644
--- a/client/partials/image/edit.html
+++ b/client/partials/image/edit.html
@@ -15,20 +15,20 @@
                 <form class="form-horizontal" role="form">
                     <div class="form-group">
                         <label class="control-label col-sm-2">Name</label>
-                        <div class="col-sm-10">
+                        <div class="col-sm-20">
                             <p class="form-control-static">{{ image.name}}</p>
                         </div>
 
                     </div>
                     <fieldset class="form-group">
                         <label class="control-label col-sm-2">Visibility</label>
-                        <select class="col-sm-20" id="visibilitySelected">
+                        <select class="col-sm-20" id="visibilitySelected" ng-model="data.visibility">
                             <option ng-repeat="visibility in axioms.visibility" ng-selected="image.visibility == visibility">{{ visibility}}</option>
                         </select>  
                     </fieldset>
                     <fieldset class="form-group">
                         <label class="control-label col-sm-2">Protected</label>
-                        <select class="col-sm-20" id="protectedSelected">
+                        <select class="col-sm-20" id="protectedSelected" ng-model="data.protected">
                             <option ng-repeat="protected in axioms.protected" ng-selected="image.protected == protected">{{ protected}}</option>
                         </select>
                     </fieldset>
@@ -37,7 +37,7 @@
                 <div class="modal-footer"> 
                     <!--<a href="#" data-dismiss="modal" class="btn btn-default">Close</a>-->
 
-                    <a class="btn btn-lg btn-primary btn-block" data-dismiss="modal" >Apply</a>
+                    <a class="btn btn-lg btn-primary btn-block" ng-click="updateImage(image)" >Apply</a>
                 </div>  
             </div>
 
-- 
cgit v1.2.3


From ef3054bb8fa6c04b283583aaeb3df8bbdbc001df Mon Sep 17 00:00:00 2001
From: Loic GUEGAN <loic@Manzerbredes.home>
Date: Wed, 27 Apr 2016 15:52:58 +0200
Subject: Correct bug

---
 client/js/controllers/image/edit.js | 2 +-
 client/partials/image/edit.html     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/client/js/controllers/image/edit.js b/client/js/controllers/image/edit.js
index 14c1949..9bd4975 100644
--- a/client/js/controllers/image/edit.js
+++ b/client/js/controllers/image/edit.js
@@ -15,7 +15,7 @@ mainApp.controller('editImageCtrl', ['$scope', 'Image', 'Loading', 'Identity', '
         $scope.data.visibility = "public";
         $scope.data.protected = false;
 
-        $scope.updateImage = function (image) {
+        $scope.applyEdition = function (image) {
             image.visibility = $scope.data.visibility;
             image.protected = $scope.data.protected;
             Image.updateImage(image, function(){});
diff --git a/client/partials/image/edit.html b/client/partials/image/edit.html
index 32c6958..4420f52 100644
--- a/client/partials/image/edit.html
+++ b/client/partials/image/edit.html
@@ -16,7 +16,7 @@
                     <div class="form-group">
                         <label class="control-label col-sm-2">Name</label>
                         <div class="col-sm-20">
-                            <p class="form-control-static">{{ image.name}}</p>
+                            <input type="text" value="{{ image.name}}" />
                         </div>
 
                     </div>
@@ -37,7 +37,7 @@
                 <div class="modal-footer"> 
                     <!--<a href="#" data-dismiss="modal" class="btn btn-default">Close</a>-->
 
-                    <a class="btn btn-lg btn-primary btn-block" ng-click="updateImage(image)" >Apply</a>
+                    <a class="btn btn-lg btn-primary btn-block" ng-click="applyEdition(image)" >Apply</a>
                 </div>  
             </div>
 
-- 
cgit v1.2.3