diff --git a/Core/DataObjects/PTMagicData.cs b/Core/DataObjects/PTMagicData.cs index 202b77b..c05e084 100644 --- a/Core/DataObjects/PTMagicData.cs +++ b/Core/DataObjects/PTMagicData.cs @@ -513,15 +513,6 @@ namespace Core.Main.DataObjects.PTMagicData public double DustValue { get; set; } public string Market { get; set; } } - public class PropertiesData - { - public string Currency { get; set; } - public bool Shorting { get; set; } - public bool Margin { get; set; } - public string UpTime { get; set; } - public int Port { get; set; } - public bool IsLeverageExchange { get; set; } - public string BaseUrl { get; set; } - } + #endregion } diff --git a/Core/DataObjects/ProfitTrailerData.cs b/Core/DataObjects/ProfitTrailerData.cs index 9cfa063..1beedc4 100644 --- a/Core/DataObjects/ProfitTrailerData.cs +++ b/Core/DataObjects/ProfitTrailerData.cs @@ -15,7 +15,7 @@ namespace Core.Main.DataObjects public class ProfitTrailerData { private SummaryData _summary = null; - private PropertiesData _properties = null; + private Properties _properties = null; private List _sellLog = new List(); private List _dcaLog = new List(); private List _buyLog = new List(); @@ -76,7 +76,7 @@ namespace Core.Main.DataObjects return _summary; } } - public PropertiesData Properties + public Properties Properties { get { @@ -87,7 +87,7 @@ namespace Core.Main.DataObjects // Thread double locking if (_properties == null || (DateTime.UtcNow > _propertiesRefresh)) { - _properties = BuildSummaryData(GetDataFromProfitTrailer("api/v2/data/properties")); + _properties = BuildProptertiesData(GetDataFromProfitTrailer("api/v2/data/properties")); _propertiesRefresh = DateTime.UtcNow.AddSeconds(_systemConfiguration.GeneralSettings.Monitor.RefreshSeconds - 1); } } @@ -307,9 +307,9 @@ namespace Core.Main.DataObjects DustValue = PTData.totalDustCurrentValue }; } - private PropertiesData BuildProptertiesData(dynamic PTProperties) + private Properties BuildProptertiesData(dynamic PTProperties) { - return new PropertiesData() + return new Properties() { Currency = PTProperties.currency, Shorting = PTProperties.shorting, diff --git a/Monitor/Pages/_get/DashboardBottom.cshtml.cs b/Monitor/Pages/_get/DashboardBottom.cshtml.cs index daa0d0f..54ad18a 100644 --- a/Monitor/Pages/_get/DashboardBottom.cshtml.cs +++ b/Monitor/Pages/_get/DashboardBottom.cshtml.cs @@ -128,6 +128,7 @@ namespace Monitor.Pages { int tradeDayIndex = 0; string profitPerDayJSON = ""; + if (PTData.SellLog.Count > 0) { DateTime minSellLogDate = PTData.SellLog.OrderBy(sl => sl.SoldDate).First().SoldDate.Date; diff --git a/Monitor/Pages/_get/DashboardTop.cshtml b/Monitor/Pages/_get/DashboardTop.cshtml index a216e0b..c743608 100644 --- a/Monitor/Pages/_get/DashboardTop.cshtml +++ b/Monitor/Pages/_get/DashboardTop.cshtml @@ -18,8 +18,8 @@ Market - 24H - Volume + 24H + Volume Ask Buy Strategies @@ -61,7 +61,8 @@ } @string.Format("{0}%", (buyLogEntry.PercChange * 100).ToString("#,#0.00")) @string.Format("{0}", (buyLogEntry.Volume24h).ToString()) - @buyLogEntry.CurrentPrice.ToString("#,#0.00000000", new System.Globalization.CultureInfo("en-US")) + @buyLogEntry.CurrentPrice.ToString("#,#0.00000000", new System.Globalization.CultureInfo("en-US")) + @if (buyDisabled) { @Html.Raw(buyStrategyText) } else {