From d8b3ee612cacdd04c89a60078d47a41de89aecff Mon Sep 17 00:00:00 2001
From: HojouFotytu <36724681+HojouFotytu@users.noreply.github.com>
Date: Wed, 21 Apr 2021 19:29:42 +0900
Subject: [PATCH] Merge Target & Profit

---
 Monitor/Pages/SettingsGeneral.cshtml   |  2 +-
 Monitor/Pages/_get/DashboardTop.cshtml | 68 +++++++++++---------------
 2 files changed, 29 insertions(+), 41 deletions(-)

diff --git a/Monitor/Pages/SettingsGeneral.cshtml b/Monitor/Pages/SettingsGeneral.cshtml
index 20f0d27..4989f93 100644
--- a/Monitor/Pages/SettingsGeneral.cshtml
+++ b/Monitor/Pages/SettingsGeneral.cshtml
@@ -190,7 +190,7 @@
               </div>
 
               <div class="form-group row">
-                <label class="col-md-4 col-form-label">Market Analyzer Chart <i class="fa fa-info-circle text-muted" data-toggle="tooltip" data-placement="top" title="By default the price chart on the analyzer page displays your base currency.  You can select a different currency here"></i></label>
+                <label class="col-md-4 col-form-label">Market Analyzer Chart <i class="fa fa-info-circle text-muted" data-toggle="tooltip" data-placement="top" title="By default the price chart on the analyzer page displays your base market currency against your fiat.  You can change this to another pair."></i></label>
                 <div class="col-md-8">
                   <input type="text" class="form-control" name="Monitor_AnalyzerChart" value="@Model.PTMagicConfiguration.GeneralSettings.Monitor.AnalyzerChart.ToString(new System.Globalization.CultureInfo("en-US"))">
                 </div>
diff --git a/Monitor/Pages/_get/DashboardTop.cshtml b/Monitor/Pages/_get/DashboardTop.cshtml
index 80d5569..9bdb3b4 100644
--- a/Monitor/Pages/_get/DashboardTop.cshtml
+++ b/Monitor/Pages/_get/DashboardTop.cshtml
@@ -98,10 +98,9 @@
                 <th class="text-left" data-toggle="tooltip" data-placement="top" title="24 Hour Trend">24H</th>
                 <th class="text-left" data-toggle="tooltip" data-placement="top" title="Total Buy Cost">Cost</th>
                 <th></th>
-                <th class="text-left" data-toggle="tooltip" data-placement="top" title="Active buy strategies">DCA</th>
-                <th class="text-left" data-toggle="tooltip" data-placement="top" title="Active sell strategies">Sell</th>
-                <th class="text-left" data-toggle="tooltip" data-placement="top" title="Target profit to sell">Target</th>
-                <th class="text-left" data-toggle="tooltip" data-placement="top" title="Current Profit">Profit</th>
+                <th class="text-left" data-toggle="tooltip" data-placement="top" title="Active Buy Strategies">DCA</th>
+                <th class="text-left" data-toggle="tooltip" data-placement="top" title="Active Sell Strategies">Sell</th>
+                <th class="text-left" data-toggle="tooltip" data-html="true" data-placement="top" title="Profit Target <br> Current Profit">Profit</th>
                 <th></th>
               </tr>
             </thead>
@@ -202,42 +201,32 @@
                   <td>@Html.Raw(buyStrategyText)</td>
                   <!-- Sell Strategy -->
                   <td>@Html.Raw(sellStrategyText)</td>
-                  <!-- Target -->
-                  @if (!sellStrategyText.Contains("WATCHMODE"))
-                  {
-                    @if (sellStrategyText.Contains("CROSSED"))
-                    // if leverage, recalculate profit target
-                    {
-                      string leverageText = sellStrategyText.Remove(0, sellStrategyText.IndexOf("CROSSED")+9);
-                      leverage = leverageText.Remove(leverageText.IndexOf(".0)"), leverageText.Length - leverageText.IndexOf(".0)"));
-                      leverageValue = double.Parse(leverage);
-                    }
-                    @if (sellStrategyText.Contains("ISOLATED"))
-                    {
-                      string leverageText = sellStrategyText.Remove(0, sellStrategyText.IndexOf("ISOLATED")+10);
-                      leverage = leverageText.Remove(leverageText.IndexOf(".0)"), leverageText.Length - leverageText.IndexOf(".0)"));
-                      leverageValue = double.Parse(leverage);
-                    }
-                    @if (leverageValue == 1)
-                    {
-                      <td class="@Html.Raw((dcaLogEntry.TargetGainValue.HasValue && (profitPercentage > dcaLogEntry.TargetGainValue.Value)) ? "text-success" : "text-danger")">@Html.Raw(dcaLogEntry.TargetGainValue.HasValue ? dcaLogEntry.TargetGainValue.Value.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US")) + "%" : "&nbsp")</td>
-                    }
-                    else
-                    {
-                      double TargetGain = leverageValue * dcaLogEntry.TargetGainValue.Value;
-                      <td class="@Html.Raw((dcaLogEntry.TargetGainValue.HasValue && (profitPercentage > dcaLogEntry.TargetGainValue.Value)) ? "text-success" : "text-danger")">@Html.Raw(dcaLogEntry.TargetGainValue.HasValue ? TargetGain.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US")) + "%" : "&nbsp")</td>
-                    }
-                  }
-                  else
-                  {
-                    <td class="text-left"></td>
-                  }
-                  <!-- Profit -->
+                  <!-- Target/Profit -->
                   @if (!@lostValue)
-                  {          
-                    profitPercentage = profitPercentage * leverageValue;
-                    <td class="text-autocolor">@profitPercentage.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US"))%</td>
-                  }
+                  {
+                    @if (!sellStrategyText.Contains("WATCHMODE"))
+                    {
+                      @if (sellStrategyText.Contains("CROSSED"))
+                      // if leverage, recalculate profit target
+                      {
+                        string leverageText = sellStrategyText.Remove(0, sellStrategyText.IndexOf("CROSSED")+9);
+                        leverage = leverageText.Remove(leverageText.IndexOf(".0)"), leverageText.Length - leverageText.IndexOf(".0)"));
+                        leverageValue = double.Parse(leverage);
+                      }
+                      @if (sellStrategyText.Contains("ISOLATED"))
+                      {
+                        string leverageText = sellStrategyText.Remove(0, sellStrategyText.IndexOf("ISOLATED")+10);
+                        leverage = leverageText.Remove(leverageText.IndexOf(".0)"), leverageText.Length - leverageText.IndexOf(".0)"));
+                        leverageValue = double.Parse(leverage);
+                      }
+                      profitPercentage = profitPercentage * leverageValue; 
+                      double TargetGain = leverageValue * dcaLogEntry.TargetGainValue.Value;
+                      <td>@TargetGain.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US"))%
+                        <br>
+                        <div class="text-autocolor">@profitPercentage.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US"))%</div>
+                      </td>
+                    }
+                  } 
                   else
                   {
                     <td class="text-left">No Value!</td>
@@ -258,7 +247,6 @@
             <td></td>
             <td></td>
             <td></td>
-            <td></td>
             <td class="text-autocolor">@Html.Raw((((Model.TotalBagGain) / Model.TotalBagCost) * 100).ToString("#,#0.00", new System.Globalization.CultureInfo("en-US")))%</td>
             </tbody>
           </table>