trading
/
PTMagic
mirror of https://github.com/PTMagicians/PTMagic.git
2
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #262 from HojouFotytu/develop 

Develop
This commit is contained in:
HojouFotytu 2021-02-18 00:31:05 +09:00 committed by GitHub
parent ca643c2815 b5b0fc95a3
commit 624c1719f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Core/ProfitTrailer/StrategyHelper.cs
View File

@ -21,9 +21,16 @@ namespace Core.ProfitTrailer
// PT allows for "advanced_stats" to show details of the trailing logic and dynamic formulas. // PT allows for "advanced_stats" to show details of the trailing logic and dynamic formulas.
if (result.Contains("STATS") || result.Contains("DYN")) if (result.Contains("STATS") || result.Contains("DYN"))
{
if (result.Contains("STATS-TSL") && (!result.Contains("TSL-STRAT")))
{
result = "TSL";
}
else
{ {
result = ""; result = "";
} }
}
// strategy labels with variable values // strategy labels with variable values
if (result.Contains("BUY TIMEOUT AS")) if (result.Contains("BUY TIMEOUT AS"))
{ {
@ -410,9 +417,16 @@ namespace Core.ProfitTrailer
} }
else if (strategy.Name.Contains("STATS")) else if (strategy.Name.Contains("STATS"))
// Avoid displaying advanced buy stats and completed level formulas // Avoid displaying advanced buy stats and completed level formulas
{
if (strategy.Name.Contains("STATS-TSL") && (!strategy.Name.Contains("TSL-STRAT")))
{
strategyText += "<span class=\"label label-warn\" data-toggle=\"tooltip\" data-placement=\"top\" title=\"" + strategy.Name + "\" >" + StrategyHelper.GetStrategyShortcut(strategy.Name, false) + "<i class=\"fa fa-flag text-success\"></i></span> ";
}
else
{ {
strategy.Name = ""; strategy.Name = "";
} }
}
else if (strategy.Name.Contains("FORMULA")) else if (strategy.Name.Contains("FORMULA"))
// Avoid displaying formula details // Avoid displaying formula details
{ {

4
Monitor/Pages/MarketAnalyzer.cshtml
View File

@ -155,7 +155,7 @@ else
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">
<div class="card-box"> <div class="card-box">
<h4 class="m-t-0 m-b-20 header-title"><b>Market Trends at @Model.PTMagicConfiguration.GeneralSettings.Application.Exchange</b></h4> <h4 class="m-t-0 m-b-20 header-title"><b>Market Trend Averages at @Model.PTMagicConfiguration.GeneralSettings.Application.Exchange</b></h4>
<table class="table table-sm"> <table class="table table-sm">
<thead> <thead>
<tr> <tr>
@ -280,7 +280,7 @@ else
string trendChangeOutput = mps.MarketTrendChanges[marketTrend.Name].ToString("#,#0.00", new System.Globalization.CultureInfo("en-US")); string trendChangeOutput = mps.MarketTrendChanges[marketTrend.Name].ToString("#,#0.00", new System.Globalization.CultureInfo("en-US"));
if ((mps.MarketTrendChanges[marketTrend.Name] > marketTrend.TrendThreshold) || (mps.MarketTrendChanges[marketTrend.Name] > marketTrend.TrendThreshold) ) if ((mps.MarketTrendChanges[marketTrend.Name] > marketTrend.TrendThreshold) || (mps.MarketTrendChanges[marketTrend.Name] > marketTrend.TrendThreshold) )
{ {
<td class="text-right text-autocolor-saw"><i class="fa fa-ban text-muted" data-toggle="tooltip" data-placement="top" title="This coin has been excluded from the average market trend on this timeframe due to your Threshold setting."></i>&nbsp; @trendChangeOutput%</td> <td class="text-right text-autocolor-saw"><i class="fa fa-ban text-muted" data-toggle="tooltip" data-placement="top" title="This coin has been excluded from the Market Trend Averages for this timeframe due to your Threshold setting."></i>&nbsp; @trendChangeOutput%</td>
} }
else else
{ {