From a49b0e3868eb9bbf81832fd1cde40c9082dd1dbf Mon Sep 17 00:00:00 2001 From: HojouFotytu <36724681+HojouFotytu@users.noreply.github.com> Date: Wed, 1 May 2019 12:16:37 +0900 Subject: [PATCH] Layout changes --- Monitor/Pages/_get/DashboardBottom.cshtml | 67 ++++++++++---------- Monitor/Pages/_get/DashboardBottom.cshtml.cs | 2 +- 2 files changed, 34 insertions(+), 35 deletions(-) diff --git a/Monitor/Pages/_get/DashboardBottom.cshtml b/Monitor/Pages/_get/DashboardBottom.cshtml index 860366a..f621df8 100644 --- a/Monitor/Pages/_get/DashboardBottom.cshtml +++ b/Monitor/Pages/_get/DashboardBottom.cshtml @@ -49,39 +49,7 @@ -
-
-

Asset Distribution

-
- -
-
-
-
-
- @if (!Model.ProfitChartDataJSON.Equals("")) { -
- -
- } else { -

Unable to load graph, no sales data found.

- } -
-
- - -
-
-
- @if (!Model.TrendChartDataJSON.Equals("")) { -
- -
- } else { -

Unable to load graph, no market trend data found.

- } -
-
+

Sales Overviewmore

@@ -114,7 +82,6 @@ double last30DaysProfitFiat = Math.Round(last30DaysProfit * Model.Summary.MainMarketPrice, 2); double last30DaysPercentGain = Math.Round(last30DaysProfit / last30DaysStartBalance * 100, 2); } - @@ -166,6 +133,38 @@ +
+
+
+ @if (!Model.TrendChartDataJSON.Equals("")) { +
+ +
+ } else { +

Unable to load graph, no market trend data found.

+ } +
+
+
+
+

Asset Distribution

+
+ +
+
+
+
+
+ @if (!Model.ProfitChartDataJSON.Equals("")) { +
+ +
+ } else { +

Unable to load graph, no sales data found.

+ } +
+
+
diff --git a/Monitor/Pages/_get/DashboardBottom.cshtml.cs b/Monitor/Pages/_get/DashboardBottom.cshtml.cs index 46173a3..428e19c 100644 --- a/Monitor/Pages/_get/DashboardBottom.cshtml.cs +++ b/Monitor/Pages/_get/DashboardBottom.cshtml.cs @@ -115,7 +115,7 @@ namespace Monitor.Pages { string profitPerDayJSON = ""; if (PTData.SellLog.Count > 0) { DateTime minSellLogDate = PTData.SellLog.OrderBy(sl => sl.SoldDate).First().SoldDate.Date; - DateTime graphStartDate = DateTime.UtcNow.Date.AddDays(-10); + DateTime graphStartDate = DateTime.UtcNow.Date.AddDays(-30); if (minSellLogDate > graphStartDate) graphStartDate = minSellLogDate; for (DateTime salesDate = graphStartDate; salesDate <= DateTime.UtcNow.Date; salesDate = salesDate.AddDays(1)) { if (tradeDayIndex > 0) {