Merge pull request #97 from HojouFotytu/develop

24h Trend for Possible Buy
This commit is contained in:
HojouFotytu 2019-03-17 21:54:56 +09:00 committed by GitHub
commit 005cd9ba26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 1 deletions

View File

@ -29,6 +29,7 @@
<thead>
<tr>
<th data-fieldid="Market" data-tablesaw-sortable-col data-tablesaw-sortable-default-col>Market</th>
<th data-fieldid="PercChange" data-tablesaw-sortable-col data-tablesaw-sortable-default-col>24H Trend</th>
<th data-toggle="tooltip" data-placement="top" title="Buy strategy for this market">Buy Strategy</th>
<th class="text-right" data-toggle="tooltip" data-placement="top" title="Current value relevant for buying into this market">BT Value</th>
<th class="text-right" data-toggle="tooltip" data-placement="top" title="Buy trigger as specified in your Pairs properties">Buy Trigger</th>

View File

@ -32,6 +32,7 @@
buyDisabled = true;
}
buyLogEntry.PercChange = @buyLogEntry.PercChange * 100;
string currentValueText = Core.ProfitTrailer.StrategyHelper.GetCurrentValueText(buyLogEntry.BuyStrategies, buyLogEntry.BuyStrategy, buyLogEntry.CurrentLowBBValue, buyLogEntry.CurrentValue, true);
string triggerValueText = Core.ProfitTrailer.StrategyHelper.GetTriggerValueText(Model.Summary, buyLogEntry.BuyStrategies, buyLogEntry.BuyStrategy, buyLogEntry.BBTrigger, buyLogEntry.TriggerValue, 0, true);
<tr>
@ -40,6 +41,7 @@
} else {
<th class="align-top"><a href="@Core.Helper.SystemHelper.GetMarketLink(Model.PTMagicConfiguration.GeneralSettings.Monitor.LinkPlatform,Model.PTMagicConfiguration.GeneralSettings.Application.Exchange, buyLogEntry.Market, Model.Summary.MainMarket)" target="_blank">@buyLogEntry.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>
}
<td class="text-autocolor">@buyLogEntry.PercChange.ToString("#,#0.00")</td>
@if (buyDisabled) {
<td>@Html.Raw(buyStrategyText)</td>
} else {

View File

@ -17,7 +17,8 @@
<thead>
<tr>
<th>Market</th>
<th data-toggle="tooltip" data-placement="top" title="Current profit percentage">Buy Strategies</th>
<th>24H Trend</th>
<th>Buy Strategies</th>
<th class="text-right" data-toggle="tooltip" data-placement="top" title="Current ask price for this market">Ask Price</th>
</tr>
</thead>
@ -44,12 +45,15 @@
buyDisabled = true;
}
buyLogEntry.PercChange = @buyLogEntry.PercChange * 100;
<tr>
@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, buyLogEntry.Market, Model.Summary.MainMarket)" target="_blank">@buyLogEntry.Market</a></th>
} else {
<th class="align-top"><a href="@Core.Helper.SystemHelper.GetMarketLink(Model.PTMagicConfiguration.GeneralSettings.Monitor.LinkPlatform,Model.PTMagicConfiguration.GeneralSettings.Application.Exchange, buyLogEntry.Market, Model.Summary.MainMarket)" target="_blank">@buyLogEntry.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>
}
<td class="text-autocolor">@buyLogEntry.PercChange.ToString("#,#0.00")</td>
@if (buyDisabled) {
<td>@Html.Raw(buyStrategyText)</td>
} else {