ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Add sorting by object

Browse Source
This commit is contained in:
Julius Haertl
2016-08-16 10:28:37 +02:00
parent 8356b12d29
commit 135d9c9cbc
5 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
js/controller/BoardController.js
View File

@@ -158,6 +158,7 @@ app.controller('BoardController', function ($rootScope, $scope, $stateParams, St
$scope.labelUpdate = function(label) {
label.edit = false;
LabelService.update(label);
console.log(label);
}
$scope.aclAdd = function(sharee) {

2
js/filters/orderObjectBy.js
View File

@@ -9,7 +9,7 @@ app.filter('orderObjectBy', function(){
array.sort(function(a, b){
a = parseInt(a[attribute]);
b = parseInt(b[attribute]);
return a - b;
return a < b;
});
return array;
}

15
js/public/app.js
View File

@@ -508,7 +508,7 @@ app.filter('orderObjectBy', function(){
array.sort(function(a, b){
a = parseInt(a[attribute]);
b = parseInt(b[attribute]);
return a - b;
return a < b;
});
return array;
}
@@ -733,7 +733,12 @@ app.factory('ApiService', ["$http", "$q", function($http, $q){
var self = this;
$http.get(this.baseUrl + '/' + id).then(function (response) {
data = response.data;
self.data[data.id] = response.data;
if(self.data[data.id]===undefined) {
self.data[data.id] = response.data;
}
$.each(response.data, function(key, value) {
self.data[data.id][key] = value;
});
deferred.resolve(response.data);
}, function (error) {
@@ -815,6 +820,12 @@ app.factory('ApiService', ["$http", "$q", function($http, $q){
return this.data[this.id];
}
ApiService.prototype.getData = function() {
return $.map(this.data, function(value, index) {
return [value];
});
};
ApiService.prototype.getAll = function () {
return this.data;
}

13
js/service/ApiService.js
View File

@@ -37,7 +37,12 @@ app.factory('ApiService', function($http, $q){
var self = this;
$http.get(this.baseUrl + '/' + id).then(function (response) {
data = response.data;
self.data[data.id] = response.data;
if(self.data[data.id]===undefined) {
self.data[data.id] = response.data;
}
$.each(response.data, function(key, value) {
self.data[data.id][key] = value;
});
deferred.resolve(response.data);
}, function (error) {
@@ -119,6 +124,12 @@ app.factory('ApiService', function($http, $q){
return this.data[this.id];
}
ApiService.prototype.getData = function() {
return $.map(this.data, function(value, index) {
return [value];
});
};
ApiService.prototype.getAll = function () {
return this.data;
}

4
templates/part.navigation.php
View File

@@ -7,11 +7,12 @@
<li><a href="#" class="icon-public">Public Boards</a></li>
//-->
<li class="with-icon with-menu" data-ng-repeat="b in boardservice.data">
<li class="with-icon with-menu" data-ng-repeat="b in boardservice.getData() | orderBy: ['shared', 'title']">
<span class="board-bullet" style="background-color:#{{b.color}};" ng-if="!b.status.edit"> </span>
<a href="#/board/{{b.id}}/" ng-if="!b.status.edit">{{ b.title }}</a>
<div class="app-navigation-entry-utils" ng-show="!b.status.edit" style="position:absolute;">
<ul>
<li class="app-navigation-entry-utils-menu-share svg" ng-show="b.shared>0"><i class="icon icon-share"> </i></li>
<li class="app-navigation-entry-utils-menu-button svg"><button class="icon-more"></button></li>
</ul>
</div>
@@ -26,7 +27,6 @@
<div class="app-navigation-entry-deleted-description">Deleted X</div>
<button class="app-navigation-entry-deleted-button icon-history svg" title="Undo"></button>
</div>
<div class="app-navigation-entry-edit" ng-show="b.status.edit">
<form ng-disabled="isAddingList" class="ng-pristine ng-valid" ng-submit="boardUpdate(b)">
<input id="newTitle" class="edit ng-valid ng-empty" type="text" autofocus-on-insert ng-model="b.title">