diff --git a/Monitor/Pages/SalesAnalyzer.cshtml b/Monitor/Pages/SalesAnalyzer.cshtml index ec7263b..b4d06d0 100644 --- a/Monitor/Pages/SalesAnalyzer.cshtml +++ b/Monitor/Pages/SalesAnalyzer.cshtml @@ -12,6 +12,24 @@ } +
+
+
+ + @{ + double currentBalance = Model.PTData.GetCurrentBalance(); + string currentBalanceString = currentBalance.ToString("#,#0.00000000", new System.Globalization.CultureInfo("en-US")); + if (currentBalance > 100) { + currentBalanceString = Math.Round(currentBalance, 2).ToString("#,#0.00", new System.Globalization.CultureInfo("en-US")); + } + } + +

@Model.Summary.MainMarket   Balance:     @currentBalanceString    

+ +
+
+
+ @if (Model.PTData.SellLog.Count == 0) {
@@ -26,7 +44,9 @@
+

Sales Analysis

+ @{ double totalProfit = Model.PTData.SellLog.Sum(s => s.Profit); double totalProfitFiat = Math.Round(totalProfit * Model.Summary.MainMarketPrice, 2); diff --git a/Monitor/Pages/_Layout.cshtml b/Monitor/Pages/_Layout.cshtml index 60d6a1f..c0bc50d 100644 --- a/Monitor/Pages/_Layout.cshtml +++ b/Monitor/Pages/_Layout.cshtml @@ -39,18 +39,10 @@
- - diff --git a/Monitor/Pages/_get/TickerWidgets.cshtml b/Monitor/Pages/_get/TickerWidgets.cshtml index 99aeed4..48cff44 100644 --- a/Monitor/Pages/_get/TickerWidgets.cshtml +++ b/Monitor/Pages/_get/TickerWidgets.cshtml @@ -22,25 +22,15 @@ string iconColor = "text-success"; string ptMagicHealthIcon = "fa-heartbeat"; string ptMagicHealthTooltip = "PT Magic is alive and healthy!"; - if (elapsedSecondsSinceRuntime > (intervalSeconds + intervalSeconds * 0.2)) { + if (elapsedSecondsSinceRuntime > (intervalSeconds + intervalSeconds * 0.5)) { ptMagicHealthIcon = "fa-exclamation-triangle"; ptMagicHealthTooltip = "PT Magic seems to have problems, check the logs!"; iconColor = "text-danger"; } } -@if (!Model.Summary.MainMarket.Equals("USDT", StringComparison.InvariantCultureIgnoreCase)) { -
- @Model.Summary.MainMarket: @Html.Raw(Model.MainFiatCurrencySymbol + Model.Summary.MainMarketPrice.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US"))) -
-} - -
- TV: @currentBalanceString @Model.Summary.MainMarket -
- -
- SMS: @Html.Raw(singleSettingInfoIcon) @activeSingleSettings +
+ GS: @Core.Helper.SystemHelper.SplitCamelCase(Model.Summary.CurrentGlobalSetting.SettingName)
diff --git a/Monitor/wwwroot/assets/css/custom.css b/Monitor/wwwroot/assets/css/custom.css index f17ec61..ed62771 100644 --- a/Monitor/wwwroot/assets/css/custom.css +++ b/Monitor/wwwroot/assets/css/custom.css @@ -71,12 +71,6 @@ font-size: 0.78571rem; } -@media only screen and (max-width: 991px) { - .ticker-widgets { - display:none; - } -} - .ticker-widgets div { display: inline-block; margin-top: 12px;