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] 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: +