diff --git a/Monitor/Pages/SalesAnalyzer.cshtml b/Monitor/Pages/SalesAnalyzer.cshtml index 26a8476..f7716d2 100644 --- a/Monitor/Pages/SalesAnalyzer.cshtml +++ b/Monitor/Pages/SalesAnalyzer.cshtml @@ -25,14 +25,11 @@ currentBalanceString = Math.Round(currentBalance, 2).ToString("#,#0.00", new System.Globalization.CultureInfo("en-US")); } } - Estimated Account Value:     @currentBalanceString   @Model.Summary.MainMarket   - Starting Account Value:     @Model.PTMagicConfiguration.GeneralSettings.Application.StartBalance   @Model.Summary.MainMarket   + Account Value:   @currentBalanceString   @Model.Summary.MainMarket + Starting Value:   @Model.PTMagicConfiguration.GeneralSettings.Application.StartBalance   @Model.Summary.MainMarket - -

-

diff --git a/Monitor/Pages/_get/DashboardBottom.cshtml b/Monitor/Pages/_get/DashboardBottom.cshtml index e470cd3..16bad91 100644 --- a/Monitor/Pages/_get/DashboardBottom.cshtml +++ b/Monitor/Pages/_get/DashboardBottom.cshtml @@ -9,7 +9,6 @@ } -
@@ -24,7 +23,14 @@
-

Asset Distribution

+ @{ + 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")); + } + } +
TCV:   @currentBalanceString   @Model.Summary.MainMarket  
diff --git a/Monitor/Pages/_get/DashboardBottom.cshtml.cs b/Monitor/Pages/_get/DashboardBottom.cshtml.cs index 428e19c..9a5c5c0 100644 --- a/Monitor/Pages/_get/DashboardBottom.cshtml.cs +++ b/Monitor/Pages/_get/DashboardBottom.cshtml.cs @@ -17,6 +17,8 @@ namespace Monitor.Pages { public string LastGlobalSetting = "Default"; public DateTimeOffset DateTimeNow = Constants.confMinDate; public string AssetDistributionData = ""; + public double currentBalance = 0; + public string currentBalanceString = ""; public void OnGet() { // Initialize Config base.Init(); @@ -149,7 +151,6 @@ namespace Monitor.Pages { AssetDistributionData += "{label: 'Pairs',color: '#82E0AA',value: " + PairsBalance.ToString() + "},"; AssetDistributionData += "{label: 'DCA',color: '#D98880',value: " + DCABalance.ToString() + "},"; AssetDistributionData += "{label: 'Pending',color: '#F5B041',value: " + PendingBalance.ToString() + "},"; - AssetDistributionData += "{label: 'Dust',color: '#BB8FCE',value: " + DustBalance.ToString() + "},"; AssetDistributionData += "{label: 'Balance',color: '#85C1E9',value: " + AvailableBalance.ToString() + "}]"; } }