From 44ab622c59fbd997e7d4366a7f42a370cf0a59d7 Mon Sep 17 00:00:00 2001 From: HojouFotytu <36724681+HojouFotytu@users.noreply.github.com> Date: Mon, 18 Mar 2019 16:37:14 +0900 Subject: [PATCH 1/3] Ticker Changes --- Monitor/Pages/SalesAnalyzer.cshtml | 20 ++++++++++++++++++++ Monitor/Pages/_Layout.cshtml | 14 +++----------- Monitor/Pages/_get/TickerWidgets.cshtml | 16 +++------------- Monitor/wwwroot/assets/css/custom.css | 6 ------ 4 files changed, 26 insertions(+), 30 deletions(-) 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 @@
- -
-
    -
         - - GS: @Core.Helper.SystemHelper.SplitCamelCase(Model.Summary.CurrentGlobalSetting.SettingName) - -
-
-
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; From 4bb4d01ed8530f59721428d10d67737574204100 Mon Sep 17 00:00:00 2001 From: HojouFotytu <36724681+HojouFotytu@users.noreply.github.com> Date: Mon, 18 Mar 2019 17:08:45 +0900 Subject: [PATCH 2/3] Updated version --- PTMagic/Program.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PTMagic/Program.cs b/PTMagic/Program.cs index 4edac9b..9d8c620 100644 --- a/PTMagic/Program.cs +++ b/PTMagic/Program.cs @@ -7,7 +7,7 @@ using Core.Helper; using Core.Main.DataObjects.PTMagicData; using Microsoft.Extensions.DependencyInjection; -[assembly: AssemblyVersion("2.1.3")] +[assembly: AssemblyVersion("2.2.0")] [assembly: AssemblyProduct("PT Magic")] namespace PTMagic From 4f618babe0d700181340dd0e6324974874b02ccd Mon Sep 17 00:00:00 2001 From: HojouFotytu <36724681+HojouFotytu@users.noreply.github.com> Date: Tue, 19 Mar 2019 00:56:38 +0900 Subject: [PATCH 3/3] Reverted removal of SMS ticker --- Monitor/Pages/MarketAnalyzer.cshtml | 9 +++++++++ Monitor/Pages/SalesAnalyzer.cshtml | 25 +++++++++++-------------- Monitor/Pages/_Layout.cshtml | 2 +- Monitor/Pages/_get/TickerWidgets.cshtml | 8 ++++++-- 4 files changed, 27 insertions(+), 17 deletions(-) diff --git a/Monitor/Pages/MarketAnalyzer.cshtml b/Monitor/Pages/MarketAnalyzer.cshtml index b7d70b8..31b44fe 100644 --- a/Monitor/Pages/MarketAnalyzer.cshtml +++ b/Monitor/Pages/MarketAnalyzer.cshtml @@ -8,6 +8,15 @@ } + +
+
+
+

Current   @Model.Summary.MainMarket   Price:    @Html.Raw(Model.MainFiatCurrencySymbol + Model.Summary.MainMarketPrice.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US")))  

+
+
+
+
diff --git a/Monitor/Pages/SalesAnalyzer.cshtml b/Monitor/Pages/SalesAnalyzer.cshtml index b4d06d0..31a2a0a 100644 --- a/Monitor/Pages/SalesAnalyzer.cshtml +++ b/Monitor/Pages/SalesAnalyzer.cshtml @@ -13,22 +13,19 @@ }
-
-
- - @{ - 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    

- -
+
+
+ @{ + 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")); + } + } +

Total Account Value:     @currentBalanceString   @Model.Summary.MainMarket  

+
@if (Model.PTData.SellLog.Count == 0) {
diff --git a/Monitor/Pages/_Layout.cshtml b/Monitor/Pages/_Layout.cshtml index c0bc50d..dd49bdf 100644 --- a/Monitor/Pages/_Layout.cshtml +++ b/Monitor/Pages/_Layout.cshtml @@ -41,7 +41,7 @@
-
    +
    • diff --git a/Monitor/Pages/_get/TickerWidgets.cshtml b/Monitor/Pages/_get/TickerWidgets.cshtml index 48cff44..51c247b 100644 --- a/Monitor/Pages/_get/TickerWidgets.cshtml +++ b/Monitor/Pages/_get/TickerWidgets.cshtml @@ -30,11 +30,15 @@ }
      - GS: @Core.Helper.SystemHelper.SplitCamelCase(Model.Summary.CurrentGlobalSetting.SettingName) + @Core.Helper.SystemHelper.SplitCamelCase(Model.Summary.CurrentGlobalSetting.SettingName) +
      + +
      + SMS: @Html.Raw(singleSettingInfoIcon) @activeSingleSettings
      - PTM: +