test

src/NTMinerDataSchemas/Core/MinerServer/ClientData.cs

@@ -698,18 +698,66 @@ namespace NTMiner.Core.MinerServer {
 
         public DateTime AESPasswordOn { get; set; }
 
-        public double GetMainCoinRejectPercent() {
-            if (this.MainCoinTotalShare == 0) {
-                return 0;
+        public int MainCoinPoolDelayNumber {
+            get {
+                if (string.IsNullOrEmpty(this.MainCoinPoolDelay)) {
+                    return 0;
+                }
+                string text = this.MainCoinPoolDelay.Trim();
+                int count = 0;
+                for (int i = 0; i < text.Length; i++) {
+                    if (!char.IsNumber(text[i])) {
+                        count = i;
+                        break;
+                    }
+                }
+                if (count != 0) {
+                    return int.Parse(text.Substring(0, count));
+                }
+                else {
+                    return 0;
+                }
             }
-            return this.MainCoinRejectShare / this.MainCoinTotalShare;
         }
 
-        public double GetDualCoinRejectPercent() {
-            if (this.DualCoinTotalShare == 0) {
-                return 0;
+        public int DualCoinPoolDelayNumber {
+            get {
+                if (string.IsNullOrEmpty(this.DualCoinPoolDelay)) {
+                    return 0;
+                }
+                string text = this.DualCoinPoolDelay.Trim();
+                int count = 0;
+                for (int i = 0; i < text.Length; i++) {
+                    if (!char.IsNumber(text[i])) {
+                        count = i;
+                        break;
+                    }
+                }
+                if (count != 0) {
+                    return int.Parse(text.Substring(0, count));
+                }
+                else {
+                    return 0;
+                }
+            }
+        }
+
+        public double MainCoinRejectPercent {
+            get {
+                if (this.MainCoinTotalShare == 0) {
+                    return 0;
+                }
+                return this.MainCoinRejectShare / this.MainCoinTotalShare;
+            }
+        }
+
+        public double DualCoinRejectPercent {
+            get {
+                if (this.DualCoinTotalShare == 0) {
+                    return 0;
+                }
+                return this.DualCoinRejectShare / this.DualCoinTotalShare;
             }
-            return this.DualCoinRejectShare / this.DualCoinTotalShare;
         }
     }
 }

src/WebApiServer/Core/Impl/ClientDataSetBase.cs

@@ -158,10 +158,10 @@ namespace NTMiner.Core.Impl {
                 case ClientDataSortField.MainCoinRejectPercent:
                     switch (query.SortDirection) {
                         case SortDirection.Ascending:
-                            list = list.OrderBy(a => a.GetMainCoinRejectPercent()).ToList();
+                            list = list.OrderBy(a => a.MainCoinRejectPercent).ToList();
                             break;
                         case SortDirection.Descending:
-                            list = list.OrderByDescending(a => a.GetMainCoinRejectPercent()).ToList();
+                            list = list.OrderByDescending(a => a.MainCoinRejectPercent).ToList();
                             break;
                         default:
                             break;
@@ -170,10 +170,10 @@ namespace NTMiner.Core.Impl {
                 case ClientDataSortField.DualCoinRejectPercent:
                     switch (query.SortDirection) {
                         case SortDirection.Ascending:
-                            list = list.OrderBy(a => a.GetDualCoinRejectPercent()).ToList();
+                            list = list.OrderBy(a => a.DualCoinRejectPercent).ToList();
                             break;
                         case SortDirection.Descending:
-                            list = list.OrderByDescending(a => a.GetDualCoinRejectPercent()).ToList();
+                            list = list.OrderByDescending(a => a.DualCoinRejectPercent).ToList();
                             break;
                         default:
                             break;
@@ -182,10 +182,10 @@ namespace NTMiner.Core.Impl {
                 case ClientDataSortField.MainCoinPoolDelay:
                     switch (query.SortDirection) {
                         case SortDirection.Ascending:
-                            list = list.OrderBy(a => a.MainCoinPoolDelay).ToList();
+                            list = list.OrderBy(a => a.MainCoinPoolDelayNumber).ToList();
                             break;
                         case SortDirection.Descending:
-                            list = list.OrderByDescending(a => a.MainCoinPoolDelay).ToList();
+                            list = list.OrderByDescending(a => a.MainCoinPoolDelayNumber).ToList();
                             break;
                         default:
                             break;
@@ -194,10 +194,10 @@ namespace NTMiner.Core.Impl {
                 case ClientDataSortField.DualCoinPoolDelay:
                     switch (query.SortDirection) {
                         case SortDirection.Ascending:
-                            list = list.OrderBy(a => a.DualCoinPoolDelay).ToList();
+                            list = list.OrderBy(a => a.DualCoinPoolDelayNumber).ToList();
                             break;
                         case SortDirection.Descending:
-                            list = list.OrderByDescending(a => a.DualCoinPoolDelay).ToList();
+                            list = list.OrderByDescending(a => a.DualCoinPoolDelayNumber).ToList();
                             break;
                         default:
                             break;