freifunk/ffffng
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Sorting of tasks and nodes in admin panel.

Browse source
This commit is contained in:
baldo 2016-06-07 11:58:29 +02:00
commit 954b7a3920
7 changed files with 77 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

13
server/resources/nodeResource.js
View file

@ -100,15 +100,22 @@ angular.module('ffffng').factory('NodeResource', function (
return Resources.error(res, err);
}
// TODO: Sort + Filter
// TODO: Filter
return NodeService.getAllNodes(restParams._page, restParams._perPage, function (err, nodes, total) {
return NodeService.getAllNodes(function (err, nodes, total) {
if (err) {
return Resources.error(res, err);
}
var sortedNodes = Resources.sort(
nodes,
['token', 'mac', 'hostname', 'key', 'coords', 'monitoringState'],
restParams
);
var pageNodes = Resources.getPageEntities(sortedNodes, restParams);
res.set('X-Total-Count', total);
return Resources.success(res, nodes);
return Resources.success(res, pageNodes);
});
});
}

13
server/resources/taskResource.js
View file

@ -79,15 +79,14 @@ angular.module('ffffng').factory('TaskResource', function (
return Resources.error(res, err);
}
// TODO: Sort
var tasks = _.values(Scheduler.getTasks());
var tasks = Resources.sort(
_.values(Scheduler.getTasks()),
['id', 'name', 'schedule', 'state', 'runningSince', 'lastRunStarted'],
restParams
);
var total = tasks.length;
var page = restParams._page;
var perPage = restParams._perPage;
var pageTasks = tasks.slice((page - 1) * perPage, page * perPage);
var pageTasks = Resources.getPageEntities(tasks, restParams);
res.set('X-Total-Count', total);
return Resources.success(res, _.map(pageTasks, toExternalTask));