From dc1d60821a90c2139dda65775621a068f942e689 Mon Sep 17 00:00:00 2001
From: MaysWind <i@mayswind.net>
Date: Mon, 22 Apr 2019 23:06:05 +0800
Subject: [PATCH] code refactor

---
 src/scripts/filters/taskStatus.js | 8 ++++----
 src/views/list.html               | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/scripts/filters/taskStatus.js b/src/scripts/filters/taskStatus.js
index 8029d38..7c33368 100644
--- a/src/scripts/filters/taskStatus.js
+++ b/src/scripts/filters/taskStatus.js
@@ -2,7 +2,7 @@
     'use strict';
 
     angular.module('ariaNg').filter('taskStatus', function () {
-        return function (task) {
+        return function (task, simplify) {
             if (!task) {
                 return '';
             }
@@ -17,11 +17,11 @@
                 return 'Waiting';
             } else if (task.status === 'paused') {
                 return 'Paused';
-            } else if (task.status === 'complete') {
+            } else if (!simplify && task.status === 'complete') {
                 return 'Completed';
-            } else if (task.status === 'error') {
+            } else if (!simplify && task.status === 'error') {
                 return (task.errorCode ? 'format.task.error-occurred' : 'Error Occurred');
-            } else if (task.status === 'removed') {
+            } else if (!simplify && task.status === 'removed') {
                 return 'Removed';
             } else {
                 return '';
diff --git a/src/views/list.html b/src/views/list.html
index bff00e5..fefa46c 100644
--- a/src/views/list.html
+++ b/src/views/list.html
@@ -65,13 +65,13 @@
                         <span class="task-last-time"
                               ng-bind="task.status === 'waiting' ? '--:--:--' : (task.status === 'paused' ? '' : (task.status === 'active' ? ((0 <= task.remainTime && task.remainTime < 86400) ? (task.remainTime | dateDuration: 'second': 'HH:mm:ss') : ('More Than One Day' | translate)) : ''))"></span>
                         <span class="task-download-speed visible-xs-inline pull-right"
-                              ng-bind="task.status === 'waiting' ? ('Waiting' | translate) : (task.status === 'paused' ? ('Paused' | translate) : (task.status === 'active' ? (!task.seeder || task.downloadSpeed > 0 ? (task.downloadSpeed | readableVolume) + '/s' : '-') : ''))"></span>
+                              ng-bind="(task.status === 'active' ? (!task.seeder || task.downloadSpeed > 0 ? (task.downloadSpeed | readableVolume) + '/s' : '-') : (task | taskStatus: true | translate: {errorcode: task.errorCode}))"></span>
                         <span class="task-seeders pull-right" ng-bind="task.status === 'active' ? ((task.numSeeders ? (task.numSeeders + '/') : '') + task.connections) : ''"></span>
                     </div>
                 </div>
                 <div class="col-md-2 col-sm-2 hidden-xs">
                     <span class="task-download-speed" title="{{task.status === 'active' ? (('Download Speed' | translate) + ': ' + (task.downloadSpeed | readableVolume) + '/s') + (task.bittorrent ? ', ' + ('Upload Speed' | translate) + ': ' + (task.uploadSpeed | readableVolume) + '/s' : '') : ''}}"
-                          ng-bind="task.status === 'waiting' ? ('Waiting' | translate) : (task.status === 'paused' ? ('Paused' | translate) : (task.status === 'active' ? (!task.seeder || task.downloadSpeed > 0 ? (task.downloadSpeed | readableVolume) + '/s' : '-') : ''))"></span>
+                          ng-bind="(task.status === 'active' ? (!task.seeder || task.downloadSpeed > 0 ? (task.downloadSpeed | readableVolume) + '/s' : '-') : (task | taskStatus: true | translate: {errorcode: task.errorCode}))"></span>
                 </div>
                 <div class="task-right-arrow visible-md visible-lg">
                     <a ng-href="#!/task/detail/{{task.gid}}" title="{{'Click to view task detail' | translate}}">