From 023acc0e57a9d874a9791bf7f4afc7d28f634d58 Mon Sep 17 00:00:00 2001 From: djbadders <34887832+djbadders@users.noreply.github.com> Date: Mon, 30 Mar 2020 23:34:05 +0100 Subject: [PATCH] Updates timers for dashboard bottom --- Monitor/Pages/_Layout.cshtml | 1 + Monitor/Pages/_get/DashboardBottom.cshtml | 14 +- Monitor/wwwroot/assets/css/custom.css | 71 +- Monitor/wwwroot/assets/css/style.css | 9340 +++++++++++++-------- Monitor/wwwroot/assets/js/circlos.js | 62 + 5 files changed, 5968 insertions(+), 3520 deletions(-) create mode 100644 Monitor/wwwroot/assets/js/circlos.js diff --git a/Monitor/Pages/_Layout.cshtml b/Monitor/Pages/_Layout.cshtml index a4ab6fc..3108b41 100644 --- a/Monitor/Pages/_Layout.cshtml +++ b/Monitor/Pages/_Layout.cshtml @@ -209,5 +209,6 @@ + diff --git a/Monitor/Pages/_get/DashboardBottom.cshtml b/Monitor/Pages/_get/DashboardBottom.cshtml index 47be0f8..2e0bd56 100644 --- a/Monitor/Pages/_get/DashboardBottom.cshtml +++ b/Monitor/Pages/_get/DashboardBottom.cshtml @@ -12,9 +12,11 @@
+
+ @if (!Model.TrendChartDataJSON.Equals("")) {
- +
} else {

Unable to load graph, no market trend data found.

@@ -23,6 +25,7 @@
+
@{ double currentBalance = Model.PTData.GetCurrentBalance(); string currentBalanceString = currentBalance.ToString("#,#0.00000000", new System.Globalization.CultureInfo("en-US")); @@ -45,6 +48,8 @@
+
+
@if (!Model.ProfitChartDataJSON.Equals("")) {
@@ -60,7 +65,10 @@
+
+
+

Market Trends at @Model.PTMagicConfiguration.GeneralSettings.Application.Exchangemore

@@ -100,7 +108,10 @@
+
+
+

Sales Overviewmore

@{ double totalProfit = Model.PTData.SellLog.Sum(s => s.Profit); @@ -189,6 +200,7 @@