From 3f350cf159af50f41c2907e2cf56b903f718811b Mon Sep 17 00:00:00 2001 From: HojouFotytu <36724681+HojouFotytu@users.noreply.github.com> Date: Thu, 21 Mar 2019 18:56:48 +0900 Subject: [PATCH 1/9] dashboard baglist tweaks --- Core/ProfitTrailer/StrategyHelper.cs | 2 ++ Monitor/Pages/_get/DashboardTop.cshtml | 20 +++++++------------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/Core/ProfitTrailer/StrategyHelper.cs b/Core/ProfitTrailer/StrategyHelper.cs index f83cca5..f09c064 100644 --- a/Core/ProfitTrailer/StrategyHelper.cs +++ b/Core/ProfitTrailer/StrategyHelper.cs @@ -139,6 +139,8 @@ namespace Core.ProfitTrailer break; case "max cost reached": result = "COST"; + case "rebuy timeout": + result = "TIMEOUT"; break; default: break; diff --git a/Monitor/Pages/_get/DashboardTop.cshtml b/Monitor/Pages/_get/DashboardTop.cshtml index 0bdbbc4..ea54c18 100644 --- a/Monitor/Pages/_get/DashboardTop.cshtml +++ b/Monitor/Pages/_get/DashboardTop.cshtml @@ -93,10 +93,9 @@ Market Value - DCA - Buy Strats - Sell Strats - + + DCA Buy Strats + Sell Strats Profit @@ -162,7 +161,7 @@ @dcaLogEntry.BoughtTimes; } } else { - Disabled! + } @@ -172,23 +171,18 @@ @Html.Raw(buyStrategyText) } @Html.Raw(sellStrategyText) - - @if (isTrailingSellActive) { - - } - - + @if(!@lostValue) { - @dcaLogEntry.ProfitPercent.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US"))% + @dcaLogEntry.ProfitPercent.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US"))%   } else { No Value! } - + } From cd5b0ef5875f6990c2263f6b6f4837b30a5cb8e6 Mon Sep 17 00:00:00 2001 From: HojouFotytu <36724681+HojouFotytu@users.noreply.github.com> Date: Thu, 21 Mar 2019 19:01:41 +0900 Subject: [PATCH 2/9] moved ticker back to left --- Monitor/Pages/_Layout.cshtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Monitor/Pages/_Layout.cshtml b/Monitor/Pages/_Layout.cshtml index dd49bdf..c0bc50d 100644 --- a/Monitor/Pages/_Layout.cshtml +++ b/Monitor/Pages/_Layout.cshtml @@ -41,7 +41,7 @@