Fix ordering issues

js/controller/BoardController.js

@@ -88,9 +88,10 @@ app.controller('BoardController', function ($rootScope, $scope, $stateParams, St
 
 	// filter cards here, as ng-sortable will not work nicely with html-inline filters
 	$scope.filterData = function (order, text) {
+		console.log("filter data");
 		if ($scope.stacks === undefined)
 			return;
-    angular.copy($scope.stackservice.data, $scope.stacks);
+		angular.copy(StackService.getAll(), $scope.stacks);
 		angular.forEach($scope.stacks, function (value, key) {
 			var cards = [];
 			cards = $filter('cardSearchFilter')(value.cards, text);
@@ -125,7 +126,6 @@ app.controller('BoardController', function ($rootScope, $scope, $stateParams, St
 	});
 
 
-
 	BoardService.searchUsers('%25');
 
 	$scope.searchForUser = function (search) {
@@ -152,6 +152,7 @@ app.controller('BoardController', function ($rootScope, $scope, $stateParams, St
 			'type': 'plain',
 		};
 		CardService.create(newCard).then(function (data) {
+			// FIXME: called here reorders
 			$scope.stackservice.addCard(data);
 			$scope.newCard.title = "";
 		});
@@ -203,28 +204,35 @@ app.controller('BoardController', function ($rootScope, $scope, $stateParams, St
 	}
 
 
-
 	// settings for card sorting
 	$scope.sortOptions = {
 		itemMoved: function (event) {
+			console.log('itemMoved');
 			// TODO: Implement reodering here (set new order of all cards in stack)
 			event.source.itemScope.modelValue.status = event.dest.sortableScope.$parent.column;
 			var order = event.dest.index;
 			var card = event.source.itemScope.c;
 			var newStack = event.dest.sortableScope.$parent.s.id;
+			var oldStack = card.stackId;
 			card.stackId = newStack;
 			CardService.update(card);
 			CardService.reorder(card, order).then(function (data) {
-        StackService.data[newStack].addCard(card);
+				StackService.addCard(card);
+				StackService.reorder(card, order);
+				StackService.deleteCard({
+					id: card.id,
+					stackId: oldStack
+				});
 			});
 		},
 		orderChanged: function (event) {
-      // TODO: Implement reordering here (set new order of all cards in stack)
-      // then maybe also call $scope.filterData('order')?
 			var order = event.dest.index;
 			var card = event.source.itemScope.c;
 			var stack = event.dest.sortableScope.$parent.s.id;
-      CardService.reorder(card, order);
+			CardService.reorder(card, order).then(function (data) {
+				StackService.reorder(card, order);
+				$scope.refreshData();
+			});
 		},
 		scrollableContainer: '#board',
 		containerPositioning: 'relative',

js/public/app.js

@@ -182,9 +182,10 @@ app.controller('BoardController', ["$rootScope", "$scope", "$stateParams", "Stat
 
 	// filter cards here, as ng-sortable will not work nicely with html-inline filters
 	$scope.filterData = function (order, text) {
+		console.log("filter data");
 		if ($scope.stacks === undefined)
 			return;
-    angular.copy($scope.stackservice.data, $scope.stacks);
+		angular.copy(StackService.getAll(), $scope.stacks);
 		angular.forEach($scope.stacks, function (value, key) {
 			var cards = [];
 			cards = $filter('cardSearchFilter')(value.cards, text);
@@ -219,7 +220,6 @@ app.controller('BoardController', ["$rootScope", "$scope", "$stateParams", "Stat
 	});
 
 
-
 	BoardService.searchUsers('%25');
 
 	$scope.searchForUser = function (search) {
@@ -246,6 +246,7 @@ app.controller('BoardController', ["$rootScope", "$scope", "$stateParams", "Stat
 			'type': 'plain',
 		};
 		CardService.create(newCard).then(function (data) {
+			// FIXME: called here reorders
 			$scope.stackservice.addCard(data);
 			$scope.newCard.title = "";
 		});
@@ -297,28 +298,35 @@ app.controller('BoardController', ["$rootScope", "$scope", "$stateParams", "Stat
 	}
 
 
-
 	// settings for card sorting
 	$scope.sortOptions = {
 		itemMoved: function (event) {
+			console.log('itemMoved');
 			// TODO: Implement reodering here (set new order of all cards in stack)
 			event.source.itemScope.modelValue.status = event.dest.sortableScope.$parent.column;
 			var order = event.dest.index;
 			var card = event.source.itemScope.c;
 			var newStack = event.dest.sortableScope.$parent.s.id;
+			var oldStack = card.stackId;
 			card.stackId = newStack;
 			CardService.update(card);
 			CardService.reorder(card, order).then(function (data) {
-        StackService.data[newStack].addCard(card);
+				StackService.addCard(card);
+				StackService.reorder(card, order);
+				StackService.deleteCard({
+					id: card.id,
+					stackId: oldStack
+				});
 			});
 		},
 		orderChanged: function (event) {
-      // TODO: Implement reordering here (set new order of all cards in stack)
-      // then maybe also call $scope.filterData('order')?
 			var order = event.dest.index;
 			var card = event.source.itemScope.c;
 			var stack = event.dest.sortableScope.$parent.s.id;
-      CardService.reorder(card, order);
+			CardService.reorder(card, order).then(function (data) {
+				StackService.reorder(card, order);
+				$scope.refreshData();
+			});
 		},
 		scrollableContainer: '#board',
 		containerPositioning: 'relative',
@@ -387,8 +395,10 @@ app.controller('CardController', ["$scope", "$rootScope", "$routeParams", "$loca
         });
     };
     $scope.cardUpdate = function(card) {
-        CardService.update(CardService.getCurrent());
+        CardService.update(CardService.getCurrent()).then(function(data) {
             $scope.status.cardEditDescription = false;
+            $('#card-description .save-indicator').fadeIn(500).fadeOut(1000);
+        });
     }
 
     $scope.labelAssign = function(element, model) {
@@ -1024,7 +1034,6 @@ app.factory('CardService', ["ApiService", "$http", "$q", function(ApiService, $h
         var deferred = $q.defer();
         var self = this;
         $http.put(this.baseUrl + '/' + card.id + '/reorder', {cardId: card.id, order: order, stackId: card.stackId}).then(function (response) {
-            card.order = order;
             deferred.resolve(response.data);
         }, function (error) {
             deferred.reject('Error while update ' + self.endpoint);
@@ -1135,8 +1144,38 @@ app.factory('StackService', ["ApiService", "$http", "$q", function(ApiService, $
     };
 
     StackService.prototype.addCard = function(entity) {
+        console.log(this.data);
+        if(!this.data[entity.stackId].cards) {
+            this.data[entity.stackId].cards = [];
+        }
         this.data[entity.stackId].cards.push(entity);
+        console.log(this.data);
     };
+
+    StackService.prototype.reorder = function(entity, order) {
+        // assign new order
+        for(var i=0, j=0;i<this.data[entity.stackId].cards.length;i++) {
+            if(this.data[entity.stackId].cards[i].id === entity.id) {
+                console.log(this.data[entity.stackId].cards[i].title + " " + order);
+                this.data[entity.stackId].cards[i].order = order;
+            }
+            if(j === order) {
+                j++;
+            }
+            if(this.data[entity.stackId].cards[i].id !== entity.id) {
+                this.data[entity.stackId].cards[i].order = j++;
+            }
+        }
+        // sort array by order
+        this.data[entity.stackId].cards.sort(function(a,b) {
+            if (a.order < b.order)
+                return -1;
+            if (a.order > b.order)
+                return 1;
+            return 0;
+        });
+    };
+
     StackService.prototype.updateCard = function(entity) {
         var self = this;
         var cards = this.data[entity.stackId].cards;

js/service/CardService.js

@@ -30,7 +30,6 @@ app.factory('CardService', function(ApiService, $http, $q){
         var deferred = $q.defer();
         var self = this;
         $http.put(this.baseUrl + '/' + card.id + '/reorder', {cardId: card.id, order: order, stackId: card.stackId}).then(function (response) {
-            card.order = order;
             deferred.resolve(response.data);
         }, function (error) {
             deferred.reject('Error while update ' + self.endpoint);

js/service/StackService.js

@@ -53,8 +53,38 @@ app.factory('StackService', function(ApiService, $http, $q){
     };
 
     StackService.prototype.addCard = function(entity) {
+        console.log(this.data);
+        if(!this.data[entity.stackId].cards) {
+            this.data[entity.stackId].cards = [];
+        }
         this.data[entity.stackId].cards.push(entity);
+        console.log(this.data);
     };
+
+    StackService.prototype.reorder = function(entity, order) {
+        // assign new order
+        for(var i=0, j=0;i<this.data[entity.stackId].cards.length;i++) {
+            if(this.data[entity.stackId].cards[i].id === entity.id) {
+                console.log(this.data[entity.stackId].cards[i].title + " " + order);
+                this.data[entity.stackId].cards[i].order = order;
+            }
+            if(j === order) {
+                j++;
+            }
+            if(this.data[entity.stackId].cards[i].id !== entity.id) {
+                this.data[entity.stackId].cards[i].order = j++;
+            }
+        }
+        // sort array by order
+        this.data[entity.stackId].cards.sort(function(a,b) {
+            if (a.order < b.order)
+                return -1;
+            if (a.order > b.order)
+                return 1;
+            return 0;
+        });
+    };
+
     StackService.prototype.updateCard = function(entity) {
         var self = this;
         var cards = this.data[entity.stackId].cards;