From 212cd5a1000f6a53981263d896a6294482a1a3ab Mon Sep 17 00:00:00 2001 From: HojouFotytu <36724681+HojouFotytu@users.noreply.github.com> Date: Wed, 19 Dec 2018 23:40:44 +0900 Subject: [PATCH] Gui Changes --- CONTRIBUTING.md | 2 +- Core/MarketAnalyzer/BaseAnalyzer.cs | 2 +- Core/ProfitTrailer/StrategyHelper.cs | 5 +- Monitor/Pages/BagAnalyzer.cshtml | 11 +- Monitor/Pages/DCACalculator.cshtml | 2 +- Monitor/Pages/MarketAnalyzer.cshtml | 2 +- Monitor/Pages/_Layout.cshtml | 10 +- Monitor/Pages/_get/BagList.cshtml | 6 +- Monitor/Pages/_get/DashboardBottom.cshtml | 108 +++++++++--------- Monitor/Pages/_get/DashboardTop.cshtml | 5 +- .../wwwroot/assets/js/analyzer-settings.js | 10 +- 11 files changed, 82 insertions(+), 81 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e7e06d1..f756ee6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -3,7 +3,7 @@ - Experienced users with C# and ASP.NET Core may contribute pull requests to this project following the Coding Style below ## What we expect from users who want to contribute a pull request -- Read the file [_Development/README.md](https://github.com/Legedric/ptmagic/blob/master/_Development/README.md) and follow the instructions carefully +- Read the file [_Development/README.md](https://github.com/PTMagicians/PTMagic/blob/master/_Development/README.md) and follow the instructions carefully - In depth knowledge of the project PT Magic and what it is supposed to do - In depth knowledge of the architecture, the different parts and layers of PT Magic diff --git a/Core/MarketAnalyzer/BaseAnalyzer.cs b/Core/MarketAnalyzer/BaseAnalyzer.cs index 3355e57..f20d2e5 100644 --- a/Core/MarketAnalyzer/BaseAnalyzer.cs +++ b/Core/MarketAnalyzer/BaseAnalyzer.cs @@ -175,7 +175,7 @@ namespace Core.MarketAnalyzer try { - string baseUrl = "https://api.github.com/repos/legedric/ptmagic/releases/latest"; + string baseUrl = "https://api.github.com/repos/PTMagicians/PTMagic/releases/latest"; Newtonsoft.Json.Linq.JObject jsonObject = GetSimpleJsonObjectFromURL(baseUrl, log, true); if (jsonObject != null) diff --git a/Core/ProfitTrailer/StrategyHelper.cs b/Core/ProfitTrailer/StrategyHelper.cs index c3859b2..88c785c 100644 --- a/Core/ProfitTrailer/StrategyHelper.cs +++ b/Core/ProfitTrailer/StrategyHelper.cs @@ -87,7 +87,7 @@ namespace Core.ProfitTrailer result = "SOM"; break; case "max buy times": - result = "MAX"; + result = "DCAMAX"; break; case "max pairs": result = "PAIRS"; @@ -122,6 +122,9 @@ namespace Core.ProfitTrailer case "rebuy timeout": result = "TIMEOUT"; break; + case "MIN/MAX CHANGE PERC": + result = "MIN/MAX"; + break; default: break; } diff --git a/Monitor/Pages/BagAnalyzer.cshtml b/Monitor/Pages/BagAnalyzer.cshtml index 2d13740..07e6e01 100644 --- a/Monitor/Pages/BagAnalyzer.cshtml +++ b/Monitor/Pages/BagAnalyzer.cshtml @@ -29,16 +29,15 @@ Market + Value DCA Buy Strats - BT Value - Buy Trigger + BS Value + BS Trigger Profit Sell Strats - ST - Bid Price - Avg. Price - Cost + SST + Bid Price
Avg Price diff --git a/Monitor/Pages/DCACalculator.cshtml b/Monitor/Pages/DCACalculator.cshtml index 77d30dd..364ed4c 100644 --- a/Monitor/Pages/DCACalculator.cshtml +++ b/Monitor/Pages/DCACalculator.cshtml @@ -23,7 +23,7 @@

Use this calculator to help building a proper setup for your Profit Trailer settings for ALL_max_trading_pairs, ALL_@maxCostCaption.ToLower()_cost and DCA levels.
To do so enter your available balance and adjust the values to whatever you consider the best setting for your parameters.
- If you are having problems understanding the different modes, please read this wiki article. + If you are having problems understanding the different modes, please read this wiki article.

@if (Model.PTMagicConfiguration.GeneralSettings.Monitor.DefaultDCAMode.Equals("simple", StringComparison.InvariantCultureIgnoreCase)) { diff --git a/Monitor/Pages/MarketAnalyzer.cshtml b/Monitor/Pages/MarketAnalyzer.cshtml index 99170bb..b7d70b8 100644 --- a/Monitor/Pages/MarketAnalyzer.cshtml +++ b/Monitor/Pages/MarketAnalyzer.cshtml @@ -49,7 +49,7 @@ @if (!Model.TrendChartDataJSON.Equals("")) {
- +
} else {

Not able to load graph, no market trend data found.
If you still do not see a graph after more than hour, report an issue.

diff --git a/Monitor/Pages/_Layout.cshtml b/Monitor/Pages/_Layout.cshtml index c769dda..42275cb 100644 --- a/Monitor/Pages/_Layout.cshtml +++ b/Monitor/Pages/_Layout.cshtml @@ -32,7 +32,7 @@ v@Model.CurrentBotVersion @if (!Core.Helper.SystemHelper.IsRecentVersion(Model.CurrentBotVersion, Model.LatestVersion)) { - + } else { } @@ -113,7 +113,7 @@ }
  • - Wiki + Wiki
  • @@ -140,11 +140,9 @@
    - www.profit-trailer-magic.com + GitHub | - GitHub - | - Wiki + Wiki
    diff --git a/Monitor/Pages/_get/BagList.cshtml b/Monitor/Pages/_get/BagList.cshtml index ed578dc..f48b16a 100644 --- a/Monitor/Pages/_get/BagList.cshtml +++ b/Monitor/Pages/_get/BagList.cshtml @@ -81,6 +81,7 @@ } else { @dcaLogEntry.Market } + @Html.Raw(@dcaLogEntry.TotalCost.ToString("#,#0.00000000", new System.Globalization.CultureInfo("en-US")) + "(" + Model.MainFiatCurrencySymbol + currentFiatValue.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US")) + ")") @if (dcaLogEntry.BoughtTimes > 0) { @dcaLogEntry.BoughtTimes; @@ -110,9 +111,8 @@ @Html.Raw(triggerSellValueText) - @dcaLogEntry.CurrentPrice.ToString("#,#0.00000000", new System.Globalization.CultureInfo("en-US")) - @dcaLogEntry.AverageBuyPrice.ToString("#,#0.00000000", new System.Globalization.CultureInfo("en-US")) - @Html.Raw(@dcaLogEntry.TotalCost.ToString("#,#0.00000000", new System.Globalization.CultureInfo("en-US")) + " (" + Model.MainFiatCurrencySymbol + currentFiatValue.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US")) + ")") + @dcaLogEntry.CurrentPrice.ToString("#,#0.00000000", new System.Globalization.CultureInfo("en-US"))
    @dcaLogEntry.AverageBuyPrice.ToString("#,#0.00000000", new System.Globalization.CultureInfo("en-US")) + Details } diff --git a/Monitor/Pages/_get/DashboardBottom.cshtml b/Monitor/Pages/_get/DashboardBottom.cshtml index a5d8265..6b5b588 100644 --- a/Monitor/Pages/_get/DashboardBottom.cshtml +++ b/Monitor/Pages/_get/DashboardBottom.cshtml @@ -5,6 +5,45 @@ }
    +
    +
    +

    Market Trendsmore

    + + + + + + + + + + + + @foreach (var marketTrend in Model.MarketTrends.OrderBy(mt => mt.TrendMinutes)) { + if (Model.Summary.MarketTrendChanges.ContainsKey(marketTrend.Name)) { + double trendChange = Model.Summary.MarketTrendChanges[marketTrend.Name].OrderByDescending(mtc => mtc.TrendDateTime).First().TrendChange; + string trendChangeOutput = trendChange.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US")); + + int marketCount = marketTrend.MaxMarkets; + string marketCountString = marketCount.ToString(); + + if (marketCount == 0) { + marketCountString = "All"; + } else if (marketCount > Model.Summary.MarketSummary.Keys.Count && marketTrend.Platform.Equals("Exchange", StringComparison.InvariantCultureIgnoreCase)) { + marketCountString = Model.Summary.MarketSummary.Keys.Count.ToString(); + } + + + + + + + } + } + +
    NameMarketsTimeframeChange
    @Core.Helper.SystemHelper.SplitCamelCase(marketTrend.Name)@marketCountString@Core.Helper.SystemHelper.GetProperDurationTime(marketTrend.TrendMinutes * 60, false)@trendChangeOutput%
    +
    +

    Sales Overviewmore

    @@ -76,72 +115,33 @@
    -
    -
    -

    Market Trendsmore

    - - - - - - - - - - - - @foreach (var marketTrend in Model.MarketTrends.OrderBy(mt => mt.TrendMinutes)) { - if (Model.Summary.MarketTrendChanges.ContainsKey(marketTrend.Name)) { - double trendChange = Model.Summary.MarketTrendChanges[marketTrend.Name].OrderByDescending(mtc => mtc.TrendDateTime).First().TrendChange; - string trendChangeOutput = trendChange.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US")); - - int marketCount = marketTrend.MaxMarkets; - string marketCountString = marketCount.ToString(); - - if (marketCount == 0) { - marketCountString = "All"; - } else if (marketCount > Model.Summary.MarketSummary.Keys.Count && marketTrend.Platform.Equals("Exchange", StringComparison.InvariantCultureIgnoreCase)) { - marketCountString = Model.Summary.MarketSummary.Keys.Count.ToString(); - } - - - - - - - } - } - -
    NameMarketsTimeframeChange
    @Core.Helper.SystemHelper.SplitCamelCase(marketTrend.Name)@marketCountString@Core.Helper.SystemHelper.GetProperDurationTime(marketTrend.TrendMinutes * 60, false)@trendChangeOutput%
    -
    -
    -
    -
    - @if (!Model.ProfitChartDataJSON.Equals("")) { -
    - -
    - } else { -

    Not able to load graph, no sales data found.
    If you still do not see a graph after you made your first sale, report an issue.

    - } -
    -
    - -
    -
    +
    +
    @if (!Model.TrendChartDataJSON.Equals("")) {
    - +
    } else {

    Not able to load graph, no market trend data found.
    If you still do not see a graph after more than hour, report an issue.

    }
    +
    +
    + @if (!Model.ProfitChartDataJSON.Equals("")) { +
    + +
    + } else { +

    Not able to load graph, no sales data found.
    If you still do not see a graph after you made your first sale, report an issue.

    + } +
    +
    +