From d8130e5d170bccf62f8fe7c8429925e5558bbc98 Mon Sep 17 00:00:00 2001
From: HojouFotytu <36724681+HojouFotytu@users.noreply.github.com>
Date: Wed, 15 Jul 2020 19:04:37 +0900
Subject: [PATCH] Re-Implement Dashboard Bottom GUI changes

---
 Core/ProfitTrailer/StrategyHelper.cs      |  2 +-
 Monitor/Pages/_get/DashboardBottom.cshtml | 31 ++++++++++++-----------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/Core/ProfitTrailer/StrategyHelper.cs b/Core/ProfitTrailer/StrategyHelper.cs
index e6b3b0a..ab5aa0f 100644
--- a/Core/ProfitTrailer/StrategyHelper.cs
+++ b/Core/ProfitTrailer/StrategyHelper.cs
@@ -238,7 +238,7 @@ namespace Core.ProfitTrailer
       {
         leverage = strategyName.Remove(0, 9);
         leverage = leverage.Remove(leverage.Length - 1, 1);
-        result = "CROSS" + leverage + "X";
+        result = "CROSS " + leverage + "X";
       }
       if (result.Contains("ISOLATED"))
       {
diff --git a/Monitor/Pages/_get/DashboardBottom.cshtml b/Monitor/Pages/_get/DashboardBottom.cshtml
index 7cf7553..0edb4af 100644
--- a/Monitor/Pages/_get/DashboardBottom.cshtml
+++ b/Monitor/Pages/_get/DashboardBottom.cshtml
@@ -10,7 +10,7 @@
 }
 
 <div class="row">
-  <div class="col-md-5 px-1">
+  <div class="col-md-4 px-1">
     <div class="card-box px-2" style="height:305px;">
       <div class="cdev" data-percent="100" data-duration="@Html.Raw(@Model.PTMagicConfiguration.GeneralSettings.Monitor.RefreshSeconds * 1000)" data-color="#aaa,#414d59"></div>
       @if (!Model.TrendChartDataJSON.Equals("")) {
@@ -22,9 +22,9 @@
       }
     </div>
   </div>
-  <div class="col-md-2 px-1">
-    <div class="card-box px-2" style="height:305px;">
-      
+  <div class="col-md-3 px-1">
+    <div class="card-box px-3" style="height:305px;">
+      <div class="cdev" data-percent="100" data-duration="@Html.Raw(@Model.PTMagicConfiguration.GeneralSettings.Monitor.RefreshSeconds * 1000)" data-color="#aaa,#414d59"></div>
       @{
       double currentBalance = Model.PTData.GetCurrentBalance();
       string currentBalanceString = currentBalance.ToString("#,#0.00000000", new System.Globalization.CultureInfo("en-US"));
@@ -32,16 +32,18 @@
         currentBalanceString = Math.Round(currentBalance, 2).ToString("#,#0.00", new System.Globalization.CultureInfo("en-US"));
         }
       }
-      <div class="text-center">
-        <small>TCV: &nbsp; <text class="text-autocolor"> @currentBalanceString &nbsp; @Model.Summary.MainMarket &nbsp; </text> </small></div>   
+      <div class="text-center"><small>TCV: &nbsp; <text class="text-autocolor"> @currentBalanceString &nbsp; @Model.Summary.MainMarket &nbsp; </text> </small></div>   
       <div id="AssetDistribution">
-        <svg style="height:290px;width:100%"></svg>
+        <svg style="height:230px;width:100%"></svg>
+        <div class="text">
+          <small>Start: &nbsp; <text class="text-autocolor"> @Model.PTMagicConfiguration.GeneralSettings.Application.StartBalance @Model.Summary.MainMarket </text>
+          <text class="pull-right">Gain: &nbsp; <text class="text-autocolor"> @Math.Round(((currentBalance - Model.PTMagicConfiguration.GeneralSettings.Application.StartBalance) / Model.PTMagicConfiguration.GeneralSettings.Application.StartBalance) * 100, 2) %</text></small>
+        </div>
       </div>
     </div>
   </div>
   <div class="col-md-5 px-1">
-   
-
+    <div class="cdev" data-percent="100" data-duration="@Html.Raw(@Model.PTMagicConfiguration.GeneralSettings.Monitor.RefreshSeconds * 1000)" data-color="#aaa,#414d59"></div>
     <div class="card-box px-2" style="height:305px;">
       @if (!Model.ProfitChartDataJSON.Equals("")) {
         <div class="profit-chart">
@@ -53,14 +55,13 @@
     </div>
   </div>
 </div>
-
-
 <div class="row">
   <div class="col-md-6 px-1">
     <div class="card-box px-2">
+      <div class="cdev" data-percent="100" data-duration="@Html.Raw(@Model.PTMagicConfiguration.GeneralSettings.Monitor.RefreshSeconds * 1000)" data-color="#aaa,#414d59"></div>
+      <br>
       <h4 class="m-t-0 m-b-20 header-title"><b>Market Trends at @Model.PTMagicConfiguration.GeneralSettings.Application.Exchange</b>
       <small class="pull-right"><a href="@Html.Raw(Model.PTMagicConfiguration.GeneralSettings.Monitor.RootUrl)MarketAnalyzer">more</a></small></h4>
-
       <table class="table table-sm">
         <thead>
           <tr>
@@ -98,8 +99,9 @@
   </div>
   
   <div class="col-md-6 px-1">
-
     <div class="card-box px-2">
+      <div class="cdev" data-percent="100" data-duration="@Html.Raw(@Model.PTMagicConfiguration.GeneralSettings.Monitor.RefreshSeconds * 1000)" data-color="#aaa,#414d59"></div>
+      <br>
       <h4 class="m-t-0 m-b-20 header-title"><b>Sales Overview</b><small class="pull-right"><a href="@Html.Raw(Model.PTMagicConfiguration.GeneralSettings.Monitor.RootUrl)SalesAnalyzer">more</a></small></h4>
      @{
         double totalProfit = Model.PTData.SellLog.Sum(s => s.Profit);
@@ -178,7 +180,6 @@
           </tr>
         </tbody>
       </table>
-       <small class="pull-right">Starting Balance: &nbsp; @Model.PTMagicConfiguration.GeneralSettings.Application.StartBalance @Model.Summary.MainMarket</small>
     </div>
   </div>
 </div>
@@ -200,7 +201,7 @@
             .x(function(d) { return d.label })
             .y(function(d) { return d.value })
             .showLabels(true)     //Display pie labels
-            .labelThreshold(.1)  //Configure the minimum slice size for labels to show up
+            .labelThreshold(.1)   //Configure the minimum slice size for labels to show up
             .labelType("percent") //Configure what type of data to show in the label. Can be "key", "value" or "percent"
             .donut(true)          //Turn on Donut mode. Makes pie chart look tasty!
             .donutRatio(0.3)     //Configure how big you want the donut hole size to be.