HojouFotytu
GitHub
commit
5842883cc7
|
|
@ -399,9 +399,11 @@ namespace Core.Main.DataObjects
|
|||
dcaLogData.SellStrategy = pair.sellStrategy == null ? "" : pair.sellStrategy;
|
||||
dcaLogData.IsTrailing = false;
|
||||
|
||||
if (pair.buyStrategies != null && processBuyStrategies)
|
||||
// See if they are using PT 2.5 (buyStrategiesData) or 2.4 (buyStrategies)
|
||||
var buyStrats = pair.buyStrategies != null ? pair.buyStrategies : pair.buyStrategiesData.data;
|
||||
if (buyStrats != null && processBuyStrategies)
|
||||
{
|
||||
foreach (var bs in pair.buyStrategies)
|
||||
foreach (var bs in buyStrats)
|
||||
{
|
||||
Strategy buyStrategy = new Strategy();
|
||||
buyStrategy.Type = bs.type;
|
||||
|
|
@ -412,16 +414,18 @@ namespace Core.Main.DataObjects
|
|||
buyStrategy.CurrentValue = bs.currentValue;
|
||||
buyStrategy.CurrentValuePercentage = bs.currentValuePercentage;
|
||||
buyStrategy.Decimals = bs.decimals;
|
||||
buyStrategy.IsTrailing = ((string)bs.positive).IndexOf("trailing", StringComparison.InvariantCultureIgnoreCase) > -1;
|
||||
buyStrategy.IsTrue = ((string)bs.positive).IndexOf("true", StringComparison.InvariantCultureIgnoreCase) > -1;
|
||||
buyStrategy.IsTrailing = bs.trailing;
|
||||
buyStrategy.IsTrue = bs.strategyResult;
|
||||
|
||||
dcaLogData.BuyStrategies.Add(buyStrategy);
|
||||
}
|
||||
}
|
||||
|
||||
if (pair.sellStrategies != null)
|
||||
// See if they are using PT 2.5 (sellStrategiesData) or 2.4 (sellStrategies)
|
||||
var sellStrats = pair.sellStrategies != null ? pair.sellStrategies : pair.sellStrategiesData.data;
|
||||
if (sellStrats != null)
|
||||
{
|
||||
foreach (var ss in pair.sellStrategies)
|
||||
foreach (var ss in sellStrats)
|
||||
{
|
||||
Strategy sellStrategy = new Strategy();
|
||||
sellStrategy.Type = ss.type;
|
||||
|
|
@ -432,8 +436,8 @@ namespace Core.Main.DataObjects
|
|||
sellStrategy.CurrentValue = ss.currentValue;
|
||||
sellStrategy.CurrentValuePercentage = ss.currentValuePercentage;
|
||||
sellStrategy.Decimals = ss.decimals;
|
||||
sellStrategy.IsTrailing = ((string)ss.positive).IndexOf("trailing", StringComparison.InvariantCultureIgnoreCase) > -1;
|
||||
sellStrategy.IsTrue = ((string)ss.positive).IndexOf("true", StringComparison.InvariantCultureIgnoreCase) > -1;
|
||||
sellStrategy.IsTrailing = ss.trailing;
|
||||
sellStrategy.IsTrue = ss.strategyResult;
|
||||
|
||||
dcaLogData.SellStrategies.Add(sellStrategy);
|
||||
|
||||
|
|
@ -495,9 +499,14 @@ namespace Core.Main.DataObjects
|
|||
}
|
||||
else
|
||||
{
|
||||
if (rbld.buyStrategies != null)
|
||||
// Parse buy strategies
|
||||
|
||||
// See if they are using PT 2.5 (buyStrategiesData) or 2.4 (buyStrategies)
|
||||
var buyStrats = rbld.buyStrategies != null ? rbld.buyStrategies : rbld.buyStrategiesData.data;
|
||||
|
||||
if (buyStrats != null)
|
||||
{
|
||||
foreach (var bs in rbld.buyStrategies)
|
||||
foreach (var bs in buyStrats)
|
||||
{
|
||||
Strategy buyStrategy = new Strategy();
|
||||
buyStrategy.Type = bs.type;
|
||||
|
|
@ -508,8 +517,8 @@ namespace Core.Main.DataObjects
|
|||
buyStrategy.CurrentValue = bs.currentValue;
|
||||
buyStrategy.CurrentValuePercentage = bs.currentValuePercentage;
|
||||
buyStrategy.Decimals = bs.decimals;
|
||||
buyStrategy.IsTrailing = ((string)(bs.positive)).IndexOf("trailing", StringComparison.InvariantCultureIgnoreCase) > -1;
|
||||
buyStrategy.IsTrue = ((string)(bs.positive)).IndexOf("true", StringComparison.InvariantCultureIgnoreCase) > -1;
|
||||
buyStrategy.IsTrailing = bs.trailing;
|
||||
buyStrategy.IsTrue = bs.strategyResult;
|
||||
|
||||
// Is SOM?
|
||||
buyLogData.IsSom = buyLogData.IsSom || buyStrategy.Name.Contains("som enabled", StringComparison.OrdinalIgnoreCase);
|
||||
|
|
|
|||
|
|
@ -1519,11 +1519,15 @@ namespace Core.Main
|
|||
|
||||
int marketPairProcess = 1;
|
||||
Dictionary<string, List<string>> matchedMarketTriggers = new Dictionary<string, List<string>>();
|
||||
|
||||
// Loop through markets
|
||||
foreach (string marketPair in this.MarketList)
|
||||
{
|
||||
this.Log.DoLogDebug("'" + marketPair + "' - Checking triggers (" + marketPairProcess.ToString() + "/" + this.MarketList.Count.ToString() + ")...");
|
||||
|
||||
bool stopTriggers = false;
|
||||
|
||||
// Loop through single market settings
|
||||
foreach (SingleMarketSetting marketSetting in this.PTMagicConfiguration.AnalyzerSettings.SingleMarketSettings)
|
||||
{
|
||||
List<string> matchedSingleMarketTriggers = new List<string>();
|
||||
|
|
@ -1560,7 +1564,7 @@ namespace Core.Main
|
|||
continue;
|
||||
}
|
||||
|
||||
#region Checking Off Triggers
|
||||
// Trigger checking
|
||||
SingleMarketSettingSummary smss = this.SingleMarketSettingSummaries.Find(s => s.Market.Equals(marketPair, StringComparison.InvariantCultureIgnoreCase) && s.SingleMarketSetting.SettingName.Equals(marketSetting.SettingName, StringComparison.InvariantCultureIgnoreCase));
|
||||
if (smss != null)
|
||||
{
|
||||
|
|
@ -1576,7 +1580,7 @@ namespace Core.Main
|
|||
{
|
||||
if (offTrigger.HoursSinceTriggered > 0)
|
||||
{
|
||||
#region Check for Activation time period trigger
|
||||
// Check for Activation time period trigger
|
||||
int smsActiveHours = (int)Math.Floor(DateTime.UtcNow.Subtract(smss.ActivationDateTimeUTC).TotalHours);
|
||||
if (smsActiveHours >= offTrigger.HoursSinceTriggered)
|
||||
{
|
||||
|
|
@ -1588,17 +1592,15 @@ namespace Core.Main
|
|||
}
|
||||
else
|
||||
{
|
||||
|
||||
// Trigger not met!
|
||||
this.Log.DoLogDebug("'" + marketPair + "' - SMS only active for " + smsActiveHours.ToString() + " hours. Trigger not matched!");
|
||||
|
||||
offTriggerResults.Add(false);
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
else if (offTrigger.Min24hVolume > 0 || offTrigger.Max24hVolume < Constants.Max24hVolume)
|
||||
{
|
||||
#region Check for 24h volume trigger
|
||||
// Check for 24h volume trigger
|
||||
List<MarketTrendChange> marketTrendChanges = this.SingleMarketTrendChanges[this.SingleMarketTrendChanges.Keys.Last()];
|
||||
if (marketTrendChanges.Count > 0)
|
||||
{
|
||||
|
|
@ -1607,7 +1609,6 @@ namespace Core.Main
|
|||
{
|
||||
if (mtc.Volume24h >= offTrigger.Min24hVolume && mtc.Volume24h <= offTrigger.Max24hVolume)
|
||||
{
|
||||
|
||||
// Trigger met!
|
||||
this.Log.DoLogDebug("'" + marketPair + "' - 24h volume off trigger matched! 24h volume = " + mtc.Volume24h.ToString(new System.Globalization.CultureInfo("en-US")) + " " + this.LastRuntimeSummary.MainMarket);
|
||||
|
||||
|
|
@ -1615,7 +1616,6 @@ namespace Core.Main
|
|||
}
|
||||
else
|
||||
{
|
||||
|
||||
// Trigger not met!
|
||||
this.Log.DoLogDebug("'" + marketPair + "' - 24h volume off trigger not matched! 24h volume = " + mtc.Volume24h.ToString(new System.Globalization.CultureInfo("en-US")) + " " + this.LastRuntimeSummary.MainMarket);
|
||||
|
||||
|
|
@ -1623,19 +1623,37 @@ namespace Core.Main
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
#endregion
|
||||
}
|
||||
else
|
||||
{
|
||||
#region Check for market trend triggers
|
||||
// Check for market trend Off triggers
|
||||
if (this.SingleMarketTrendChanges.ContainsKey(offTrigger.MarketTrendName))
|
||||
{
|
||||
|
||||
List<MarketTrendChange> marketTrendChanges = this.SingleMarketTrendChanges[offTrigger.MarketTrendName];
|
||||
List<MarketTrend> marketTrends = this.PTMagicConfiguration.AnalyzerSettings.MarketAnalyzer.MarketTrends;
|
||||
|
||||
if (marketTrendChanges.Count > 0)
|
||||
{
|
||||
double averageMarketTrendChange = marketTrendChanges.Average(m => m.TrendChange);
|
||||
double averageMarketTrendChange = 0;
|
||||
var trendThreshold = (from mt in this.PTMagicConfiguration.AnalyzerSettings.MarketAnalyzer.MarketTrends
|
||||
where mt.Name == offTrigger.MarketTrendName
|
||||
select new { mt.TrendThreshold }).Single();
|
||||
|
||||
// Calculate average market change, skip any that are outside the threshold if enabled
|
||||
if (trendThreshold.TrendThreshold != 0)
|
||||
{
|
||||
var includedMarkets = from m in marketTrendChanges
|
||||
where m.TrendChange <= trendThreshold.TrendThreshold && m.TrendChange >= (trendThreshold.TrendThreshold * -1.0)
|
||||
orderby m.Market
|
||||
select m;
|
||||
|
||||
averageMarketTrendChange = includedMarkets.Average(m => m.TrendChange);
|
||||
}
|
||||
else
|
||||
{
|
||||
// Calculate for whole market
|
||||
averageMarketTrendChange = marketTrendChanges.Average(m => m.TrendChange);
|
||||
}
|
||||
|
||||
MarketTrendChange mtc = marketTrendChanges.Find(m => m.Market.Equals(marketPair, StringComparison.InvariantCultureIgnoreCase));
|
||||
if (mtc != null)
|
||||
|
|
@ -1645,7 +1663,6 @@ namespace Core.Main
|
|||
|
||||
if (offTrigger.MarketTrendRelation.Equals(Constants.MarketTrendRelationRelative))
|
||||
{
|
||||
|
||||
// Build pair trend change relative to the global market trend
|
||||
trendChange = trendChange - averageMarketTrendChange;
|
||||
}
|
||||
|
|
@ -1684,7 +1701,6 @@ namespace Core.Main
|
|||
offTriggerResults.Add(false);
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1720,8 +1736,8 @@ namespace Core.Main
|
|||
}
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
// Do we have triggers
|
||||
if (marketSetting.Triggers.Count > 0 && !stopTriggers)
|
||||
{
|
||||
#region Checking Triggers
|
||||
|
|
@ -1730,6 +1746,8 @@ namespace Core.Main
|
|||
List<bool> triggerResults = new List<bool>();
|
||||
Dictionary<int, double> relevantTriggers = new Dictionary<int, double>();
|
||||
int triggerIndex = 0;
|
||||
|
||||
// Loop through SMS triggers
|
||||
foreach (Trigger trigger in marketSetting.Triggers)
|
||||
{
|
||||
|
||||
|
|
@ -1819,7 +1837,26 @@ namespace Core.Main
|
|||
List<MarketTrendChange> marketTrendChanges = this.SingleMarketTrendChanges[trigger.MarketTrendName];
|
||||
if (marketTrendChanges.Count > 0)
|
||||
{
|
||||
double averageMarketTrendChange = marketTrendChanges.Average(m => m.TrendChange);
|
||||
double averageMarketTrendChange = 0;
|
||||
var trendThreshold = (from mt in this.PTMagicConfiguration.AnalyzerSettings.MarketAnalyzer.MarketTrends
|
||||
where mt.Name == trigger.MarketTrendName
|
||||
select new { mt.TrendThreshold }).Single();
|
||||
|
||||
// Calculate average market change, skip any that are outside the threshold if enabled
|
||||
if (trendThreshold.TrendThreshold != 0)
|
||||
{
|
||||
var includedMarkets = from m in marketTrendChanges
|
||||
where m.TrendChange <= trendThreshold.TrendThreshold && m.TrendChange >= (trendThreshold.TrendThreshold * -1.0)
|
||||
orderby m.Market
|
||||
select m;
|
||||
|
||||
averageMarketTrendChange = includedMarkets.Average(m => m.TrendChange);
|
||||
}
|
||||
else
|
||||
{
|
||||
// Calculate for whole market
|
||||
averageMarketTrendChange = marketTrendChanges.Average(m => m.TrendChange);
|
||||
}
|
||||
|
||||
MarketTrendChange mtc = marketTrendChanges.Find(m => m.Market.Equals(marketPair, StringComparison.InvariantCultureIgnoreCase));
|
||||
if (mtc != null)
|
||||
|
|
@ -1895,7 +1932,7 @@ namespace Core.Main
|
|||
#endregion
|
||||
}
|
||||
triggerIndex++;
|
||||
}
|
||||
} // End loop SMS triggers
|
||||
|
||||
// Check if all triggers have to get triggered or just one
|
||||
bool settingTriggered = false;
|
||||
|
|
@ -2041,7 +2078,7 @@ namespace Core.Main
|
|||
this.Log.DoLogDebug("'" + marketPair + "' - '" + marketSetting.SettingName + "' not triggered!");
|
||||
}
|
||||
}
|
||||
}
|
||||
} // End loop single market settings
|
||||
|
||||
if ((marketPairProcess % 10) == 0)
|
||||
{
|
||||
|
|
@ -2049,8 +2086,9 @@ namespace Core.Main
|
|||
}
|
||||
|
||||
marketPairProcess++;
|
||||
}
|
||||
} // End loop through markets
|
||||
|
||||
// Did we trigger any SMS?
|
||||
if (this.TriggeredSingleMarketSettings.Count > 0)
|
||||
{
|
||||
this.Log.DoLogInfo("Building single market settings for '" + this.TriggeredSingleMarketSettings.Count.ToString() + "' markets...");
|
||||
|
|
|
|||
|
|
@ -391,7 +391,7 @@ namespace Core.MarketAnalyzer
|
|||
if (marketTrendChanges != null && marketTrendChanges.Count > 0)
|
||||
{
|
||||
double totalTrendChange = 0;
|
||||
int trendChangeCount = marketTrendChanges.Count;
|
||||
int trendsCount = marketTrendChanges.Count;
|
||||
foreach (MarketTrendChange marketTrendChange in marketTrendChanges)
|
||||
{
|
||||
if (marketTrend.TrendThreshold != 0)
|
||||
|
|
@ -399,7 +399,7 @@ namespace Core.MarketAnalyzer
|
|||
if ((marketTrendChange.TrendChange > marketTrend.TrendThreshold) || (marketTrendChange.TrendChange < (marketTrend.TrendThreshold * -1)))
|
||||
{
|
||||
log.DoLogInfo("Market trend '" + marketTrend.Name + "' is ignoring " + marketTrendChange.Market + " for exceeding TrendThreshold.");
|
||||
trendChangeCount += -1;
|
||||
trendsCount += -1;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -411,7 +411,7 @@ namespace Core.MarketAnalyzer
|
|||
totalTrendChange += marketTrendChange.TrendChange;
|
||||
}
|
||||
}
|
||||
double averageTrendChange = totalTrendChange / trendChangeCount;
|
||||
double averageTrendChange = totalTrendChange / trendsCount;
|
||||
result.Add(marketTrend.Name, averageTrendChange);
|
||||
log.DoLogInfo("Built average market trend change '" + marketTrend.Name + "' (" + averageTrendChange.ToString("#,#0.00") + "% in " + marketTrend.TrendMinutes.ToString() + " minutes) for " + marketTrendChanges.Count.ToString() + " markets.");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -261,6 +261,9 @@ namespace Core.ProfitTrailer
|
|||
public static bool IsValidStrategy(string strategyName, bool checkForAnyInvalid)
|
||||
{
|
||||
bool result = false;
|
||||
|
||||
if (!string.IsNullOrEmpty(strategyName))
|
||||
{
|
||||
// buy/sell strategies beginning with PT 2.3.3 contain the letter followed by a colon and space.
|
||||
if (strategyName.Contains(":"))
|
||||
{
|
||||
|
|
@ -338,8 +341,12 @@ namespace Core.ProfitTrailer
|
|||
result = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
public static int GetStrategyValueDecimals(string strategyName)
|
||||
{
|
||||
int result = 0;
|
||||
|
|
|
|||
|
|
@ -278,8 +278,16 @@ else
|
|||
if (mps.MarketTrendChanges.ContainsKey(marketTrend.Name)) {
|
||||
marketTrendsDisplayed++;
|
||||
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) )
|
||||
{
|
||||
<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> @trendChangeOutput%</td>
|
||||
}
|
||||
else
|
||||
{
|
||||
<td class="text-right text-autocolor-saw">@trendChangeOutput%</td>
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@for (int i = 0; i < marketTrends.Count - marketTrendsDisplayed; i++) {
|
||||
<td></td>
|
||||
|
|
|
|||
|
|
@ -196,7 +196,7 @@
|
|||
<th class="text-right">Sales</th>
|
||||
<th class="text-right">Profit @Model.Summary.MainMarket</th>
|
||||
<th class="text-right">Profit @Model.Summary.MainFiatCurrency</th>
|
||||
<th class="text-right">% Gain</th>
|
||||
<th class="text-right">Gain</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
|
|
|||
|
|
@ -138,50 +138,31 @@
|
|||
isSellStrategyTrue = (dcaLogEntry.SellStrategies.FindAll(ss => !ss.IsTrue).Count == 0);
|
||||
}
|
||||
|
||||
bool buyDisabled = false;
|
||||
string leverage = "";
|
||||
double leverageValue = 1;
|
||||
string buyStrategyText = Core.ProfitTrailer.StrategyHelper.GetStrategyText(Model.Summary, dcaLogEntry.BuyStrategies, dcaLogEntry.BuyStrategy, isBuyStrategyTrue, isTrailingBuyActive);
|
||||
|
||||
if (!Core.ProfitTrailer.StrategyHelper.IsValidStrategy(buyStrategyText, true))
|
||||
{
|
||||
buyDisabled = true;
|
||||
}
|
||||
string sellStrategyText = Core.ProfitTrailer.StrategyHelper.GetStrategyText(Model.Summary, dcaLogEntry.SellStrategies, dcaLogEntry.SellStrategy, isSellStrategyTrue, isTrailingSellActive);
|
||||
|
||||
// Check for when PT loses the value of a pair
|
||||
bool lostValue = false;
|
||||
lostValue = (dcaLogEntry.TotalCost == 0.0) || (dcaLogEntry.AverageBuyPrice == 0.0);
|
||||
|
||||
double exchangeFee = 0;
|
||||
switch (Model.PTMagicConfiguration.GeneralSettings.Application.Exchange.ToLower())
|
||||
// Profit percentage
|
||||
var profitPercentage = dcaLogEntry.ProfitPercent;
|
||||
|
||||
if (dcaLogEntry.SellStrategies != null)
|
||||
{
|
||||
case "binance":
|
||||
exchangeFee = 0.002;
|
||||
break;
|
||||
case "binanceus":
|
||||
exchangeFee = 0.002;
|
||||
break;
|
||||
case "binancefutures":
|
||||
exchangeFee = 0.002;
|
||||
break;
|
||||
case "bittrex":
|
||||
exchangeFee = 0.0025;
|
||||
break;
|
||||
case "poloniex":
|
||||
exchangeFee = 0.0025;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
var gainStrategy = dcaLogEntry.SellStrategies.FirstOrDefault(x => x.Name.Contains(" GAIN", StringComparison.InvariantCultureIgnoreCase));
|
||||
if (gainStrategy != null)
|
||||
{
|
||||
// Use the gain percentage value as it is accurate to what can be achieved with the order book!
|
||||
profitPercentage = gainStrategy.CurrentValue;
|
||||
}
|
||||
}
|
||||
// Aggregate totals
|
||||
double tradingFee = (exchangeFee * dcaLogEntry.TotalCost) * 2;
|
||||
double bagGain = (dcaLogEntry.ProfitPercent / 100) * dcaLogEntry.TotalCost * leverageValue;
|
||||
Model.TotalBagCost = Model.TotalBagCost + dcaLogEntry.TotalCost;
|
||||
Model.TotalBagGain = Model.TotalBagGain + bagGain;
|
||||
|
||||
// Render the row
|
||||
<tr @(lostValue ? "class=errorRow" : "") >
|
||||
<!-- Market -->
|
||||
@if (mps == null || mps.ActiveSingleSettings == null || mps.ActiveSingleSettings.Count == 0)
|
||||
{
|
||||
<th class="align-top"><a href="@Core.Helper.SystemHelper.GetMarketLink(Model.PTMagicConfiguration.GeneralSettings.Monitor.LinkPlatform,Model.PTMagicConfiguration.GeneralSettings.Application.Exchange, dcaLogEntry.Market, Model.Summary.MainMarket)" target="_blank">@dcaLogEntry.Market</a></th>
|
||||
|
|
@ -189,8 +170,11 @@
|
|||
{
|
||||
<th class="align-top"><a href="@Core.Helper.SystemHelper.GetMarketLink(Model.PTMagicConfiguration.GeneralSettings.Monitor.LinkPlatform,Model.PTMagicConfiguration.GeneralSettings.Application.Exchange, dcaLogEntry.Market, Model.Summary.MainMarket)" target="_blank">@dcaLogEntry.Market</a> <i class="fa fa-exclamation-triangle text-highlight" data-toggle="tooltip" data-placement="top" data-html="true" title="@await Component.InvokeAsync("PairIcon", mps)" data-template="<div class='tooltip' role='tooltip'><div class='tooltip-arrow'></div><div class='tooltip-inner pair-tooltip'></div></div>"></i></th>
|
||||
}
|
||||
<!-- 24hr change -->
|
||||
<td class="text-autocolor">@Html.Raw((dcaLogEntry.PercChange * 100).ToString("#,#0.00", new System.Globalization.CultureInfo("en-US")))%</td>
|
||||
<!-- Cost -->
|
||||
<td class="text-left">@Html.Raw(dcaLogEntry.TotalCost.ToString("#,#0.000000", new System.Globalization.CultureInfo("en-US")))</td>
|
||||
<!-- DCA Count -->
|
||||
<td class="text-right">
|
||||
@if (dcaEnabled)
|
||||
{
|
||||
|
|
@ -203,9 +187,11 @@
|
|||
<span data-toggle="tooltip" data-placement="top" title="DCA is disabled"><i class="fa fa-ban text-highlight"></i></span>
|
||||
}
|
||||
</td>
|
||||
<!-- DCA Strategy -->
|
||||
<td>@Html.Raw(buyStrategyText)</td>
|
||||
<!-- Sell Strategy -->
|
||||
<td>@Html.Raw(sellStrategyText)</td>
|
||||
|
||||
<!-- Target -->
|
||||
@if (!sellStrategyText.Contains("WATCHMODE"))
|
||||
{
|
||||
@if (sellStrategyText.Contains("CROSSED"))
|
||||
|
|
@ -223,31 +209,37 @@
|
|||
}
|
||||
@if (leverageValue == 1)
|
||||
{
|
||||
<td class="@Html.Raw((dcaLogEntry.TargetGainValue.HasValue && (dcaLogEntry.ProfitPercent > dcaLogEntry.TargetGainValue.Value)) ? "text-success" : "text-danger")">@Html.Raw(dcaLogEntry.TargetGainValue.HasValue ? dcaLogEntry.TargetGainValue.Value.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US")) + "%" : " ")</td>
|
||||
<td class="@Html.Raw((dcaLogEntry.TargetGainValue.HasValue && (profitPercentage > dcaLogEntry.TargetGainValue.Value)) ? "text-success" : "text-danger")">@Html.Raw(dcaLogEntry.TargetGainValue.HasValue ? dcaLogEntry.TargetGainValue.Value.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US")) + "%" : " ")</td>
|
||||
}
|
||||
else
|
||||
{
|
||||
double TargetGain = leverageValue * dcaLogEntry.TargetGainValue.Value;
|
||||
<td class="@Html.Raw((dcaLogEntry.TargetGainValue.HasValue && (dcaLogEntry.ProfitPercent > dcaLogEntry.TargetGainValue.Value)) ? "text-success" : "text-danger")">@Html.Raw(dcaLogEntry.TargetGainValue.HasValue ? TargetGain.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US")) + "%" : " ")</td>
|
||||
<td class="@Html.Raw((dcaLogEntry.TargetGainValue.HasValue && (profitPercentage > dcaLogEntry.TargetGainValue.Value)) ? "text-success" : "text-danger")">@Html.Raw(dcaLogEntry.TargetGainValue.HasValue ? TargetGain.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US")) + "%" : " ")</td>
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
<td class="text-left"></td>
|
||||
}
|
||||
|
||||
|
||||
|
||||
<!-- Profit -->
|
||||
@if (!@lostValue)
|
||||
{
|
||||
<td class="text-autocolor">@dcaLogEntry.ProfitPercent.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US"))%</td>
|
||||
profitPercentage = profitPercentage * leverageValue;
|
||||
<td class="text-autocolor">@profitPercentage.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US"))%</td>
|
||||
}
|
||||
else
|
||||
{
|
||||
<td class="text-left">No Value!</td>
|
||||
}
|
||||
<!-- Bag details -->
|
||||
<td class="text-right"><a href="@Html.Raw(Model.PTMagicConfiguration.GeneralSettings.Monitor.RootUrl)_get/BagDetails/?m=@dcaLogEntry.Market" data-remote="false" data-toggle="modal" data-target="#dca-chart"><i class="fa fa-plus-circle"></i></a></td>
|
||||
</tr>
|
||||
{
|
||||
// Aggregate totals
|
||||
double bagGain = (profitPercentage / 100) * dcaLogEntry.TotalCost;
|
||||
Model.TotalBagCost = Model.TotalBagCost + dcaLogEntry.TotalCost;
|
||||
Model.TotalBagGain = Model.TotalBagGain + bagGain;
|
||||
}
|
||||
}
|
||||
<td>Totals:</td>
|
||||
<td></td>
|
||||
|
|
|
|||
|
|
@ -77,6 +77,14 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group row">
|
||||
<label class="col-md-4 col-form-label">Trend Threshold <i class="fa fa-info-circle text-muted" data-toggle="tooltip" data-placement="top" title="Exclude coins above/below this value when calculing market trend average."></i></label>
|
||||
<div class="col-md-8">
|
||||
<input type="text" class="form-control" name="MarketAnalyzer_MarketTrend_@(Model.MarketTrendName)|TrendThreshold" value="@Model.MarketTrend.TrendThreshold.ToString()">
|
||||
<span class="help-block"><small>Leave empty to exclude none</small></span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group row">
|
||||
<label class="col-md-4 col-form-label">Display Graph <i class="fa fa-info-circle text-muted" data-toggle="tooltip" data-placement="top" title="Displays or hides the graph for this trend on the dashboard of your PT Magic monitor."></i></label>
|
||||
<div class="col-md-8">
|
||||
|
|
|
|||
|
|
@ -3,23 +3,27 @@
|
|||
@{
|
||||
Layout = null;
|
||||
|
||||
// Single market settings tool tip
|
||||
int activeSingleSettings = Model.MarketsWithSingleSettings.Count;
|
||||
string singleSettingInfoIcon = "";
|
||||
if (activeSingleSettings > 0) {
|
||||
singleSettingInfoIcon = "<i class=\"fa fa-info-circle text-muted\" data-toggle=\"tooltip\" data-placement=\"top\" data-html=\"true\" title=\"<b>Single Market Settings active for:</b><br />-" + Core.Helper.SystemHelper.ConvertListToTokenString(Model.MarketsWithSingleSettings, "<br />-", true) + "\" data-template=\"<div class='tooltip' role='tooltip'><div class='tooltip-arrow'></div><div class='tooltip-inner tooltip-200 text-left'></div></div>\"></i>";
|
||||
singleSettingInfoIcon = "<i class=\"fa fa-info-circle text-muted\" data-toggle=\"tooltip\" data-placement=\"top\" data-html=\"true\" title=\"<b>Single Market Settings active for:</b><br />" + Core.Helper.SystemHelper.ConvertListToTokenString(Model.MarketsWithSingleSettings, "<br />", true) + "\" data-template=\"<div class='tooltip' role='tooltip'><div class='tooltip-arrow'></div><div class='tooltip-inner tooltip-200 text-left'></div></div>\"></i>";
|
||||
}
|
||||
|
||||
// Global setting tool tip
|
||||
string globalSettingInfoIcon = "<i class=\"fa fa-info-circle text-muted\" data-toggle=\"tooltip\" data-placement=\"top\" data-html=\"true\" title=\"<b>Instance: </b>" + Model.PTMagicConfiguration.GeneralSettings.Application.InstanceName + "\" data-template=\"<div class='tooltip' role='tooltip'><div class='tooltip-arrow'></div><div class='tooltip-inner tooltip-100 text-left'></div></div>\"></i>";
|
||||
|
||||
// Health indicator
|
||||
DateTime lastRuntime = Model.Summary.LastRuntime;
|
||||
double elapsedSecondsSinceRuntime = DateTime.UtcNow.Subtract(lastRuntime).TotalSeconds;
|
||||
double intervalSeconds = Model.PTMagicConfiguration.AnalyzerSettings.MarketAnalyzer.IntervalMinutes * 60.0;
|
||||
|
||||
string iconColor = "text-success";
|
||||
string ptMagicHealthIcon = "fa-heartbeat";
|
||||
string ptMagicHealthTooltip = "PT Magic is alive and healthy! <br> Time elapsed since last run:"+ lastRuntime;
|
||||
string ptMagicHealthTooltip = "PT Magic is alive and healthy! Time elapsed since last run: " + Math.Round(elapsedSecondsSinceRuntime / 60, 1) + " mins.";
|
||||
if (elapsedSecondsSinceRuntime > (intervalSeconds * 2)) {
|
||||
ptMagicHealthIcon = "fa-exclamation-triangle";
|
||||
ptMagicHealthTooltip = "PT Magic seems to have problems, check the logs! Time elapsed since last run: "+ Math.Round(elapsedSecondsSinceRuntime / 60, 1) + " mins.";
|
||||
ptMagicHealthTooltip = "PT Magic seems to have problems, check the logs! Time elapsed since last run: " + Math.Round(elapsedSecondsSinceRuntime / 60, 1) + " mins.";
|
||||
iconColor = "text-danger";
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,14 +21,23 @@ namespace Monitor.Pages {
|
|||
|
||||
private void BindData() {
|
||||
// Get markets with active single settings
|
||||
foreach (string key in Summary.MarketSummary.Keys) {
|
||||
if (Summary.MarketSummary[key].ActiveSingleSettings != null) {
|
||||
if (Summary.MarketSummary[key].ActiveSingleSettings.Count > 0) {
|
||||
MarketsWithSingleSettings.Add(key);
|
||||
var MarketsWithSingleSettingsData = from x in Summary.MarketSummary
|
||||
where x.Value.ActiveSingleSettings != null
|
||||
&& x.Value.ActiveSingleSettings.Count > 0
|
||||
orderby x.Key ascending
|
||||
select x;
|
||||
|
||||
foreach (var market in MarketsWithSingleSettingsData) {
|
||||
// Get the name of all active single market settings
|
||||
string activeSettings = string.Empty;
|
||||
foreach (var singleSetting in market.Value.ActiveSingleSettings)
|
||||
{
|
||||
activeSettings += (", " + singleSetting.SettingName);
|
||||
}
|
||||
activeSettings = activeSettings.Substring(2); // Chop the unrequired comma
|
||||
|
||||
MarketsWithSingleSettings.Add(String.Format("{0} : {1}", market.Key, activeSettings));
|
||||
}
|
||||
}
|
||||
MarketsWithSingleSettings.Sort();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ using Core.Helper;
|
|||
using Microsoft.Extensions.DependencyInjection;
|
||||
|
||||
|
||||
[assembly: AssemblyVersion("2.5.2")]
|
||||
[assembly: AssemblyVersion("2.5.3")]
|
||||
[assembly: AssemblyProduct("PT Magic")]
|
||||
|
||||
namespace PTMagic
|
||||
|
|
|
|||
|
|
@ -0,0 +1,112 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Color Codes
|
||||
|
||||
Red='\033[0;31m' # Red
|
||||
Green='\033[0;32m' # Green
|
||||
Color_Off='\033[0m' # Text Reset
|
||||
|
||||
#Init Vars
|
||||
|
||||
BASEDIR=$PWD
|
||||
|
||||
#Main Script
|
||||
|
||||
clear
|
||||
|
||||
if [[ $EUID -ne 0 ]];
|
||||
then
|
||||
echo "This script must be run as root"
|
||||
exit
|
||||
fi
|
||||
|
||||
echo "Profit Trailer Magic Auto Updater"
|
||||
echo ""
|
||||
echo "This Programm will update you to a Version of PTM you choose"
|
||||
echo ""
|
||||
echo -e "Please make sure that PTM is ${Red}NOT RUNNING!!!${Color_Off}"
|
||||
echo ""
|
||||
echo "Continue? (yes/no)"
|
||||
|
||||
read start
|
||||
|
||||
if [ "$start" != "yes" ]
|
||||
then
|
||||
echo "exiting"
|
||||
exit
|
||||
fi
|
||||
|
||||
echo ""
|
||||
echo "Please input the version NR you want to update to."
|
||||
echo "It can be found on: https://github.com/PTMagicians/PTMagic/releases"
|
||||
echo "Example: 2.5.1"
|
||||
|
||||
read VERSION
|
||||
|
||||
echo ""
|
||||
echo "Checking for Required Programms:"
|
||||
|
||||
if ! command -v unzip &> /dev/null
|
||||
then
|
||||
echo -e "Unzip: ${Red}[\u274c]${Color_Off}"
|
||||
UNZIPINSTALL="unzip"
|
||||
else
|
||||
echo -e "Unzip: ${Green}[\u2714]${Color_Off}"
|
||||
UNZIPINSTALL=""
|
||||
fi
|
||||
|
||||
if ! command -v wget &> /dev/null
|
||||
then
|
||||
echo -e "Wget: ${Red}[\u274c]${Color_Off}"
|
||||
WGETINSTALL="wget"
|
||||
else
|
||||
echo -e "Wget: ${Green}[\u2714]${Color_Off}"
|
||||
WGETINSTALL=""
|
||||
fi
|
||||
|
||||
|
||||
if [[ $UNZIPINSTALL != "" ]] || [[ $WGETINSTALL != "" ]]
|
||||
then
|
||||
echo ""
|
||||
echo "Installing missing programms..."
|
||||
apt install -y $UNZIPINSTALL $WGETINSTALL >/dev/null
|
||||
echo "Missing Programms installed"
|
||||
fi
|
||||
|
||||
echo ""
|
||||
echo "Removing old upgrade files..."
|
||||
rm -r -f -d $PWD/temp >/dev/null
|
||||
|
||||
echo ""
|
||||
echo "Downloading PTM Version $VERSION..."
|
||||
|
||||
mkdir "$PWD/temp" >/dev/null
|
||||
cd "$PWD/temp"
|
||||
|
||||
wget "https://github.com/PTMagicians/PTMagic/releases/download/$VERSION/PTM_$VERSION.zip" --output-file=logfile
|
||||
|
||||
if [ ! -f $PWD/PTM_$VERSION.zip ];
|
||||
then
|
||||
echo -e "${Red}Download Failed${Color_Off}"
|
||||
exit
|
||||
fi
|
||||
|
||||
echo ""
|
||||
echo "Unpacking Archive..."
|
||||
|
||||
unzip $PWD/PTM_$VERSION.zip >/dev/null
|
||||
|
||||
echo ""
|
||||
echo "Moving Files..."
|
||||
|
||||
cp -r $PWD/PTM_$VERSION/PTMagic/. $BASEDIR/
|
||||
|
||||
echo ""
|
||||
echo "Cleaning up..."
|
||||
|
||||
cd $BASEDIR
|
||||
|
||||
rm -r -d $PWD/temp >/dev/null
|
||||
|
||||
echo ""
|
||||
echo "Done"
|
||||
Loading…
Reference in New Issue