From c0063d7e0141dc594432e56d8b07cb4483c2ac60 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Wed, 6 Dec 2017 16:27:31 +0800
Subject: [PATCH] feat(torrents): Add an orderBy function for "Life" and "Size"

#20
---
 .../controllers/about.client.controller.js    | 42 +++++++++++++++++++
 .../client/views/maker-view.client.view.html  | 14 ++++++-
 modules/core/client/app/trans-string-en.js    |  2 +
 modules/core/client/app/trans-string-zh.js    |  2 +
 .../controllers/torrents.client.controller.js | 42 +++++++++++++++++++
 .../views/list-torrents.client.view.html      | 14 ++++++-
 .../controllers/vip.client.controller.js      | 42 +++++++++++++++++++
 modules/vip/client/views/vip.client.view.html | 14 ++++++-
 8 files changed, 166 insertions(+), 6 deletions(-)

diff --git a/modules/about/client/controllers/about.client.controller.js b/modules/about/client/controllers/about.client.controller.js
index 40434be7..7e369c1b 100644
--- a/modules/about/client/controllers/about.client.controller.js
+++ b/modules/about/client/controllers/about.client.controller.js
@@ -70,6 +70,8 @@
      */
     vm.orderByVote = function () {
       vm.sortSLF = undefined;
+      vm.sortSize = undefined;
+      vm.sortLife = undefined;
 
       if (vm.sortVote === undefined) {
         vm.sortVote = '-';
@@ -82,11 +84,51 @@
       vm.buildPager();
     };
 
+    /**
+     * orderBySize
+     */
+    vm.orderBySize = function () {
+      vm.sortSLF = undefined;
+      vm.sortVote = undefined;
+      vm.sortLife = undefined;
+
+      if (vm.sortSize === undefined) {
+        vm.sortSize = '-';
+        vm.sort = {'torrent_size': -1};
+      } else if (vm.sortSize === '-') {
+        vm.sortSize = undefined;
+        vm.sort = undefined;
+      }
+
+      vm.buildPager();
+    };
+
+    /**
+     * orderByLife
+     */
+    vm.orderByLife = function () {
+      vm.sortSLF = undefined;
+      vm.sortVote = undefined;
+      vm.sortSize = undefined;
+
+      if (vm.sortLife === undefined) {
+        vm.sortLife = '-';
+        vm.sort = {'createdat': 1};
+      } else if (vm.sortLife === '-') {
+        vm.sortLife = undefined;
+        vm.sort = undefined;
+      }
+
+      vm.buildPager();
+    };
+
     /**
      * orderBySLF
      */
     vm.orderBySLF = function () {
       vm.sortVote = undefined;
+      vm.sortSize = undefined;
+      vm.sortLife = undefined;
 
       if (vm.sortSLF === undefined) {
         vm.sortSLF = '-S';
diff --git a/modules/about/client/views/maker-view.client.view.html b/modules/about/client/views/maker-view.client.view.html
index 95734800..154da1be 100644
--- a/modules/about/client/views/maker-view.client.view.html
+++ b/modules/about/client/views/maker-view.client.view.html
@@ -133,8 +133,18 @@
                                        uib-tooltip="{{ 'TABLE_FIELDS.TITLE_VOTES' | translate}}">{{ 'TABLE_FIELDS.VOTES' | translate}}</a>
                                     <i class="fa fa-caret-down text-info" ng-if="vm.sortVote == '-'"></i>
                                 </th>
-                                <th class="text-center">{{ 'TABLE_FIELDS.LIFETIME' | translate}}</th>
-                                <th class="text-center">{{ 'TABLE_FIELDS.SIZE' | translate}}</th>
+                                <th class="text-center">
+                                    <a href="#" tooltip-placement="top"
+                                       ng-click="vm.orderByLife();"
+                                       uib-tooltip="{{ 'TABLE_FIELDS.TITLE_LIFE' | translate}}">{{ 'TABLE_FIELDS.LIFETIME' | translate}}</a>
+                                    <i class="fa fa-caret-down text-info" ng-if="vm.sortLife == '-'"></i>
+                                </th>
+                                <th class="text-center">
+                                    <a href="#" tooltip-placement="top"
+                                       ng-click="vm.orderBySize();"
+                                       uib-tooltip="{{ 'TABLE_FIELDS.TITLE_SIZE' | translate}}">{{ 'TABLE_FIELDS.SIZE' | translate}}</a>
+                                    <i class="fa fa-caret-down text-info" ng-if="vm.sortSize == '-'"></i>
+                                </th>
                                 <th>
                                     <a href="#" tooltip-placement="top"
                                        ng-click="vm.orderBySLF();"
diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js
index 86066c17..19793a38 100644
--- a/modules/core/client/app/trans-string-en.js
+++ b/modules/core/client/app/trans-string-en.js
@@ -111,6 +111,8 @@
       LIFETIME: 'Life',
       VOTES: 'Votes',
       TITLE_VOTES: 'orderBy votes',
+      TITLE_SIZE: 'orderBy size',
+      TITLE_LIFE: 'orderBy life',
 
       //status
       UPLOADED_SPEED: 'U/S',
diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js
index dfa8fc7e..a1b2e642 100644
--- a/modules/core/client/app/trans-string-zh.js
+++ b/modules/core/client/app/trans-string-zh.js
@@ -111,6 +111,8 @@
       LIFETIME: '存活时间',
       VOTES: '评分',
       TITLE_VOTES: '按评分排序',
+      TITLE_SIZE: '按文件大小排序',
+      TITLE_LIFE: '按上传时间排序',
 
       //status
       UPLOADED_SPEED: '上/速',
diff --git a/modules/torrents/client/controllers/torrents.client.controller.js b/modules/torrents/client/controllers/torrents.client.controller.js
index d3cf341d..aa98cc5d 100644
--- a/modules/torrents/client/controllers/torrents.client.controller.js
+++ b/modules/torrents/client/controllers/torrents.client.controller.js
@@ -153,6 +153,8 @@
      */
     vm.orderByVote = function () {
       vm.sortSLF = undefined;
+      vm.sortSize = undefined;
+      vm.sortLife = undefined;
 
       if (vm.sortVote === undefined) {
         vm.sortVote = '-';
@@ -165,11 +167,51 @@
       vm.torrentBuildPager();
     };
 
+    /**
+     * orderBySize
+     */
+    vm.orderBySize = function () {
+      vm.sortSLF = undefined;
+      vm.sortVote = undefined;
+      vm.sortLife = undefined;
+
+      if (vm.sortSize === undefined) {
+        vm.sortSize = '-';
+        vm.sort = {'torrent_size': -1};
+      } else if (vm.sortSize === '-') {
+        vm.sortSize = undefined;
+        vm.sort = undefined;
+      }
+
+      vm.torrentBuildPager();
+    };
+
+    /**
+     * orderByLife
+     */
+    vm.orderByLife = function () {
+      vm.sortSLF = undefined;
+      vm.sortVote = undefined;
+      vm.sortSize = undefined;
+
+      if (vm.sortLife === undefined) {
+        vm.sortLife = '-';
+        vm.sort = {'createdat': 1};
+      } else if (vm.sortLife === '-') {
+        vm.sortLife = undefined;
+        vm.sort = undefined;
+      }
+
+      vm.torrentBuildPager();
+    };
+
     /**
      * orderBySLF
      */
     vm.orderBySLF = function () {
       vm.sortVote = undefined;
+      vm.sortSize = undefined;
+      vm.sortLife = undefined;
 
       if (vm.sortSLF === undefined) {
         vm.sortSLF = '-S';
diff --git a/modules/torrents/client/views/list-torrents.client.view.html b/modules/torrents/client/views/list-torrents.client.view.html
index da5c7569..4092e9e5 100644
--- a/modules/torrents/client/views/list-torrents.client.view.html
+++ b/modules/torrents/client/views/list-torrents.client.view.html
@@ -163,8 +163,18 @@
                                uib-tooltip="{{ 'TABLE_FIELDS.TITLE_VOTES' | translate}}">{{ 'TABLE_FIELDS.VOTES' | translate}}</a>
                             <i class="fa fa-caret-down text-info" ng-if="vm.sortVote == '-'"></i>
                         </th>
-                        <th class="text-center">{{ 'TABLE_FIELDS.LIFETIME' | translate}}</th>
-                        <th class="text-center">{{ 'TABLE_FIELDS.SIZE' | translate}}</th>
+                        <th class="text-center">
+                            <a href="#" tooltip-placement="top"
+                               ng-click="vm.orderByLife();"
+                               uib-tooltip="{{ 'TABLE_FIELDS.TITLE_LIFE' | translate}}">{{ 'TABLE_FIELDS.LIFETIME' | translate}}</a>
+                            <i class="fa fa-caret-down text-info" ng-if="vm.sortLife == '-'"></i>
+                        </th>
+                        <th class="text-center">
+                            <a href="#" tooltip-placement="top"
+                               ng-click="vm.orderBySize();"
+                               uib-tooltip="{{ 'TABLE_FIELDS.TITLE_SIZE' | translate}}">{{ 'TABLE_FIELDS.SIZE' | translate}}</a>
+                            <i class="fa fa-caret-down text-info" ng-if="vm.sortSize == '-'"></i>
+                        </th>
                         <th>
                             <a href="#" tooltip-placement="top"
                                ng-click="vm.orderBySLF();"
diff --git a/modules/vip/client/controllers/vip.client.controller.js b/modules/vip/client/controllers/vip.client.controller.js
index f05298ce..c091a3bd 100644
--- a/modules/vip/client/controllers/vip.client.controller.js
+++ b/modules/vip/client/controllers/vip.client.controller.js
@@ -66,6 +66,8 @@
      */
     vm.orderByVote = function () {
       vm.sortSLF = undefined;
+      vm.sortSize = undefined;
+      vm.sortLife = undefined;
 
       if (vm.sortVote === undefined) {
         vm.sortVote = '-';
@@ -78,11 +80,51 @@
       vm.buildPager();
     };
 
+    /**
+     * orderBySize
+     */
+    vm.orderBySize = function () {
+      vm.sortSLF = undefined;
+      vm.sortVote = undefined;
+      vm.sortLife = undefined;
+
+      if (vm.sortSize === undefined) {
+        vm.sortSize = '-';
+        vm.sort = {'torrent_size': -1};
+      } else if (vm.sortSize === '-') {
+        vm.sortSize = undefined;
+        vm.sort = undefined;
+      }
+
+      vm.buildPager();
+    };
+
+    /**
+     * orderByLife
+     */
+    vm.orderByLife = function () {
+      vm.sortSLF = undefined;
+      vm.sortVote = undefined;
+      vm.sortSize = undefined;
+
+      if (vm.sortLife === undefined) {
+        vm.sortLife = '-';
+        vm.sort = {'createdat': 1};
+      } else if (vm.sortLife === '-') {
+        vm.sortLife = undefined;
+        vm.sort = undefined;
+      }
+
+      vm.buildPager();
+    };
+
     /**
      * orderBySLF
      */
     vm.orderBySLF = function () {
       vm.sortVote = undefined;
+      vm.sortSize = undefined;
+      vm.sortLife = undefined;
 
       if (vm.sortSLF === undefined) {
         vm.sortSLF = '-S';
diff --git a/modules/vip/client/views/vip.client.view.html b/modules/vip/client/views/vip.client.view.html
index 7fe0aec1..c2f030a6 100644
--- a/modules/vip/client/views/vip.client.view.html
+++ b/modules/vip/client/views/vip.client.view.html
@@ -154,8 +154,18 @@
                                        uib-tooltip="{{ 'TABLE_FIELDS.TITLE_VOTES' | translate}}">{{ 'TABLE_FIELDS.VOTES' | translate}}</a>
                                     <i class="fa fa-caret-down text-info" ng-if="vm.sortVote == '-'"></i>
                                 </th>
-                                <th class="text-center">{{ 'TABLE_FIELDS.LIFETIME' | translate}}</th>
-                                <th class="text-center">{{ 'TABLE_FIELDS.SIZE' | translate}}</th>
+                                <th class="text-center">
+                                    <a href="#" tooltip-placement="top"
+                                       ng-click="vm.orderByLife();"
+                                       uib-tooltip="{{ 'TABLE_FIELDS.TITLE_LIFE' | translate}}">{{ 'TABLE_FIELDS.LIFETIME' | translate}}</a>
+                                    <i class="fa fa-caret-down text-info" ng-if="vm.sortLife == '-'"></i>
+                                </th>
+                                <th class="text-center">
+                                    <a href="#" tooltip-placement="top"
+                                       ng-click="vm.orderBySize();"
+                                       uib-tooltip="{{ 'TABLE_FIELDS.TITLE_SIZE' | translate}}">{{ 'TABLE_FIELDS.SIZE' | translate}}</a>
+                                    <i class="fa fa-caret-down text-info" ng-if="vm.sortSize == '-'"></i>
+                                </th>
                                 <th>
                                     <a href="#" tooltip-placement="top"
                                        ng-click="vm.orderBySLF();"