diff --git a/app/scripts/core/utils.js b/app/scripts/core/utils.js index feafeee..9722b9f 100644 --- a/app/scripts/core/utils.js +++ b/app/scripts/core/utils.js @@ -86,6 +86,7 @@ task.uploadSpeed = parseInt(task.uploadSpeed); task.downloadSpeed = parseInt(task.downloadSpeed); task.completePercent = (task.totalLength > 0 ? task.completedLength / task.totalLength * 100 : 0); + task.remainPercent = 100 - task.completePercent; task.taskName = this.getTaskName(task); task.idle = task.downloadSpeed == 0; diff --git a/app/scripts/filters/taskOrderBy.js b/app/scripts/filters/taskOrderBy.js index df46b94..1517c9b 100644 --- a/app/scripts/filters/taskOrderBy.js +++ b/app/scripts/filters/taskOrderBy.js @@ -6,9 +6,9 @@ if (!angular.isArray(array)) { return array; } - + var orderType = utils.parseOrderType(type); - + if (orderType == null) { return array; } @@ -20,7 +20,7 @@ } else if (orderType.type == 'percent') { return orderByFilter(array, ['completePercent'], orderType.reverse); } else if (orderType.type == 'remain') { - return orderByFilter(array, ['idle', 'remainTime'], orderType.reverse); + return orderByFilter(array, ['idle', 'remainTime', 'remainPercent'], orderType.reverse); } else if (orderType.type == 'dspeed') { return orderByFilter(array, ['downloadSpeed'], orderType.reverse); } else {