From 32eae764316e308d095e6fcf654c86be5417bbf3 Mon Sep 17 00:00:00 2001 From: HojouFotytu <36724681+HojouFotytu@users.noreply.github.com> Date: Thu, 18 Feb 2021 16:59:31 +0900 Subject: [PATCH 1/5] Trading View fixes --- Core/Helper/SystemHelper.cs | 28 +++++++++++++++------------- Monitor/Pages/SettingsGeneral.cshtml | 1 - PTMagic/Program.cs | 2 +- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/Core/Helper/SystemHelper.cs b/Core/Helper/SystemHelper.cs index c315e50..3c2d269 100644 --- a/Core/Helper/SystemHelper.cs +++ b/Core/Helper/SystemHelper.cs @@ -536,20 +536,14 @@ namespace Core.Helper string result = "#"; if (platform.Equals("TradingView")) { - result = "https://www.tradingview.com/symbols/" + market.ToUpper() + "/?exchange=" + exchange.ToUpper(); - } - else if (platform.Equals("TradingViewFutures")) - { - result = "https://www.tradingview.com/chart/?symbol="; - - string pairName = SystemHelper.StripBadCode(market, Constants.WhiteListMinimal); - - if (pairName.StartsWith(mainMarket)) + if (exchange.Equals("binancefutures", StringComparison.InvariantCultureIgnoreCase)) { - pairName = pairName.Replace(mainMarket, "") + mainMarket; + result = "https://www.tradingview.com/chart/?symbol=BINANCE:" + market.ToUpper() + "PERP"; + } + else + { + result = "https://www.tradingview.com/?symbol=" + exchange.ToUpper() + ":" + market.ToUpper(); } - - result += pairName + "PERP"; } else { @@ -614,8 +608,16 @@ namespace Core.Helper pairName = pairName.Replace(mainMarket, "") + mainMarket; } - result += pairName; + if (exchange.Equals("binancefutures", StringComparison.InvariantCultureIgnoreCase)) + { + result = "BINANCE:" + pairName + "PERP"; + } + else + { + result += pairName; + } + return result; } diff --git a/Monitor/Pages/SettingsGeneral.cshtml b/Monitor/Pages/SettingsGeneral.cshtml index 5447e0b..64c3783 100644 --- a/Monitor/Pages/SettingsGeneral.cshtml +++ b/Monitor/Pages/SettingsGeneral.cshtml @@ -243,7 +243,6 @@ diff --git a/PTMagic/Program.cs b/PTMagic/Program.cs index ff6fbbd..11bc420 100644 --- a/PTMagic/Program.cs +++ b/PTMagic/Program.cs @@ -6,7 +6,7 @@ using Core.Helper; using Microsoft.Extensions.DependencyInjection; -[assembly: AssemblyVersion("2.5.4")] +[assembly: AssemblyVersion("2.5.5")] [assembly: AssemblyProduct("PT Magic")] namespace PTMagic From 5065c374ff89d1eeacd79536a49d5a942549762f Mon Sep 17 00:00:00 2001 From: HojouFotytu <36724681+HojouFotytu@users.noreply.github.com> Date: Thu, 18 Feb 2021 17:23:20 +0900 Subject: [PATCH 2/5] distribution chart revert --- Monitor/Pages/_get/DashboardBottom.cshtml.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Monitor/Pages/_get/DashboardBottom.cshtml.cs b/Monitor/Pages/_get/DashboardBottom.cshtml.cs index 96bc581..eeb3004 100644 --- a/Monitor/Pages/_get/DashboardBottom.cshtml.cs +++ b/Monitor/Pages/_get/DashboardBottom.cshtml.cs @@ -196,15 +196,15 @@ namespace Monitor.Pages { if (sellStrategyText.Contains("PENDING")) { - PendingBalance = PendingBalance + ((dcaLogEntry.Amount * dcaLogEntry.CurrentPrice) / dcaLogEntry.Leverage != 0 ? dcaLogEntry.Leverage : 1); + PendingBalance = PendingBalance + ((dcaLogEntry.Amount * dcaLogEntry.CurrentPrice) / dcaLogEntry.Leverage); } else if (dcaLogEntry.BuyStrategies.Count > 0) { - DCABalance = DCABalance + ((dcaLogEntry.Amount * dcaLogEntry.CurrentPrice) / dcaLogEntry.Leverage != 0 ? dcaLogEntry.Leverage : 1); + DCABalance = DCABalance + ((dcaLogEntry.Amount * dcaLogEntry.CurrentPrice) / dcaLogEntry.Leverage); } else { - PairsBalance = PairsBalance + ((dcaLogEntry.Amount * dcaLogEntry.CurrentPrice) / dcaLogEntry.Leverage != 0 ? dcaLogEntry.Leverage : 1); + PairsBalance = PairsBalance + ((dcaLogEntry.Amount * dcaLogEntry.CurrentPrice) / dcaLogEntry.Leverage); } } } From 34662bf6f06633dd650c3c542729c018e3a18389 Mon Sep 17 00:00:00 2001 From: HojouFotytu <36724681+HojouFotytu@users.noreply.github.com> Date: Thu, 18 Feb 2021 18:02:26 +0900 Subject: [PATCH 3/5] TCV calculations fix --- Monitor/Pages/SalesAnalyzer.cshtml.cs | 7 ++++++- Monitor/Pages/_get/DashboardBottom.cshtml.cs | 22 ++++++-------------- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/Monitor/Pages/SalesAnalyzer.cshtml.cs b/Monitor/Pages/SalesAnalyzer.cshtml.cs index 37725f3..1b2a00f 100644 --- a/Monitor/Pages/SalesAnalyzer.cshtml.cs +++ b/Monitor/Pages/SalesAnalyzer.cshtml.cs @@ -161,7 +161,12 @@ namespace Monitor.Pages double AvailableBalance = PTData.GetCurrentBalance(); foreach (Core.Main.DataObjects.PTMagicData.DCALogData dcaLogEntry in PTData.DCALog) { - totalCurrentValue = totalCurrentValue + ((dcaLogEntry.Amount * dcaLogEntry.CurrentPrice) / dcaLogEntry.Leverage != 0 ? dcaLogEntry.Leverage : 1); + double leverage = dcaLogEntry.Leverage; + if (leverage == 0) + { + leverage = 1; + } + totalCurrentValue = totalCurrentValue + ((dcaLogEntry.Amount * dcaLogEntry.CurrentPrice) / leverage); } totalCurrentValue = totalCurrentValue + AvailableBalance; } diff --git a/Monitor/Pages/_get/DashboardBottom.cshtml.cs b/Monitor/Pages/_get/DashboardBottom.cshtml.cs index eeb3004..a410c22 100644 --- a/Monitor/Pages/_get/DashboardBottom.cshtml.cs +++ b/Monitor/Pages/_get/DashboardBottom.cshtml.cs @@ -177,34 +177,24 @@ namespace Monitor.Pages string sellStrategyText = Core.ProfitTrailer.StrategyHelper.GetStrategyText(Summary, dcaLogEntry.SellStrategies, dcaLogEntry.SellStrategy, isSellStrategyTrue, isTrailingSellActive); // Aggregate totals - if (dcaLogEntry.Leverage == 0) + double leverage = dcaLogEntry.Leverage; + if (leverage == 0) { - if (sellStrategyText.Contains("PENDING")) - { - PendingBalance = PendingBalance + (dcaLogEntry.Amount * dcaLogEntry.CurrentPrice); - } - else if (dcaLogEntry.BuyStrategies.Count > 0) - { - DCABalance = DCABalance + (dcaLogEntry.Amount * dcaLogEntry.CurrentPrice); - } - else - { - PairsBalance = PairsBalance + (dcaLogEntry.Amount * dcaLogEntry.CurrentPrice); - } + leverage = 1; } else { if (sellStrategyText.Contains("PENDING")) { - PendingBalance = PendingBalance + ((dcaLogEntry.Amount * dcaLogEntry.CurrentPrice) / dcaLogEntry.Leverage); + PendingBalance = PendingBalance + ((dcaLogEntry.Amount * dcaLogEntry.CurrentPrice) / leverage); } else if (dcaLogEntry.BuyStrategies.Count > 0) { - DCABalance = DCABalance + ((dcaLogEntry.Amount * dcaLogEntry.CurrentPrice) / dcaLogEntry.Leverage); + DCABalance = DCABalance + ((dcaLogEntry.Amount * dcaLogEntry.CurrentPrice) / leverage); } else { - PairsBalance = PairsBalance + ((dcaLogEntry.Amount * dcaLogEntry.CurrentPrice) / dcaLogEntry.Leverage); + PairsBalance = PairsBalance + ((dcaLogEntry.Amount * dcaLogEntry.CurrentPrice) / leverage); } } } From c2718c7dbd8437bb1b8e9a7c01e15577b4da3223 Mon Sep 17 00:00:00 2001 From: HojouFotytu <36724681+HojouFotytu@users.noreply.github.com> Date: Thu, 18 Feb 2021 18:06:52 +0900 Subject: [PATCH 4/5] distribution fix re-fixed --- Monitor/Pages/_get/DashboardBottom.cshtml.cs | 21 +++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/Monitor/Pages/_get/DashboardBottom.cshtml.cs b/Monitor/Pages/_get/DashboardBottom.cshtml.cs index a410c22..5eb3390 100644 --- a/Monitor/Pages/_get/DashboardBottom.cshtml.cs +++ b/Monitor/Pages/_get/DashboardBottom.cshtml.cs @@ -182,20 +182,17 @@ namespace Monitor.Pages { leverage = 1; } + if (sellStrategyText.Contains("PENDING")) + { + PendingBalance = PendingBalance + ((dcaLogEntry.Amount * dcaLogEntry.CurrentPrice) / leverage); + } + else if (dcaLogEntry.BuyStrategies.Count > 0) + { + DCABalance = DCABalance + ((dcaLogEntry.Amount * dcaLogEntry.CurrentPrice) / leverage); + } else { - if (sellStrategyText.Contains("PENDING")) - { - PendingBalance = PendingBalance + ((dcaLogEntry.Amount * dcaLogEntry.CurrentPrice) / leverage); - } - else if (dcaLogEntry.BuyStrategies.Count > 0) - { - DCABalance = DCABalance + ((dcaLogEntry.Amount * dcaLogEntry.CurrentPrice) / leverage); - } - else - { - PairsBalance = PairsBalance + ((dcaLogEntry.Amount * dcaLogEntry.CurrentPrice) / leverage); - } + PairsBalance = PairsBalance + ((dcaLogEntry.Amount * dcaLogEntry.CurrentPrice) / leverage); } } totalCurrentValue = PendingBalance + DCABalance + PairsBalance + AvailableBalance; From 925e2a492669e27c4820ef7e28bf8f12877d4d44 Mon Sep 17 00:00:00 2001 From: HojouFotytu <36724681+HojouFotytu@users.noreply.github.com> Date: Thu, 18 Feb 2021 18:19:42 +0900 Subject: [PATCH 5/5] change TV link to UK --- Core/Helper/SystemHelper.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Core/Helper/SystemHelper.cs b/Core/Helper/SystemHelper.cs index 3c2d269..dcb2f79 100644 --- a/Core/Helper/SystemHelper.cs +++ b/Core/Helper/SystemHelper.cs @@ -538,11 +538,11 @@ namespace Core.Helper { if (exchange.Equals("binancefutures", StringComparison.InvariantCultureIgnoreCase)) { - result = "https://www.tradingview.com/chart/?symbol=BINANCE:" + market.ToUpper() + "PERP"; + result = "https://uk.tradingview.com/chart/?symbol=BINANCE:" + market.ToUpper() + "PERP"; } else { - result = "https://www.tradingview.com/?symbol=" + exchange.ToUpper() + ":" + market.ToUpper(); + result = "https://uk.tradingview.com/?symbol=" + exchange.ToUpper() + ":" + market.ToUpper(); } } else