From 6bae907712710515a019188dc60455233a902a08 Mon Sep 17 00:00:00 2001
From: Matthias <xmatthias@outlook.com>
Date: Sat, 4 Sep 2021 17:10:35 +0200
Subject: [PATCH] Remove Hourlychart in favor of botcomparison

---
 src/components/charts/HourlyChart.vue |  1 +
 src/store/modules/layout.ts           |  8 ++---
 src/views/Dashboard.vue               | 44 ++++++++++++++++++++-------
 3 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/src/components/charts/HourlyChart.vue b/src/components/charts/HourlyChart.vue
index 753bf25c..a1663909 100644
--- a/src/components/charts/HourlyChart.vue
+++ b/src/components/charts/HourlyChart.vue
@@ -52,6 +52,7 @@ const CHART_TRADE_COUNT = 'Trade Count';
   },
 })
 export default class HourlyChart extends Vue {
+  // TODO: This chart is not used at the moment!
   @Prop({ required: true }) trades!: Trade[];
 
   @Prop({ default: true, type: Boolean }) showTitle!: boolean;
diff --git a/src/store/modules/layout.ts b/src/store/modules/layout.ts
index 8cf55b08..eb21203c 100644
--- a/src/store/modules/layout.ts
+++ b/src/store/modules/layout.ts
@@ -13,10 +13,10 @@ export enum TradeLayout {
 export enum DashboardLayout {
   KPI = 'g-kpi',
   dailyChart = 'g-dailyChart',
-  hourlyChart = 'g-hourlyChart',
+  botComparison = 'g-botComparison',
+  allOpenTrades = 'g-allOpenTrades',
   cumChartChart = 'g-cumChartChart',
   tradesLogChart = 'g-TradesLogChart',
-  allOpenTrades = 'g-allOpenTrades',
 }
 
 export enum LayoutGetters {
@@ -53,7 +53,7 @@ const DEFAULT_TRADING_LAYOUT: GridItemData[] = [
 const DEFAULT_DASHBOARD_LAYOUT: GridItemData[] = [
   { i: DashboardLayout.KPI, x: 0, y: 0, w: 4, h: 6 },
   { i: DashboardLayout.dailyChart, x: 4, y: 0, w: 4, h: 6 },
-  { i: DashboardLayout.hourlyChart, x: 0, y: 6, w: 6, h: 4 } /* Bot Comparison */,
+  { i: DashboardLayout.botComparison, x: 0, y: 6, w: 6, h: 4 } /* Bot Comparison */,
   { i: DashboardLayout.allOpenTrades, x: 6, y: 6, w: 6, h: 4 },
   { i: DashboardLayout.cumChartChart, x: 8, y: 0, w: 4, h: 6 },
   { i: DashboardLayout.tradesLogChart, x: 0, y: 12, w: 12, h: 4 },
@@ -61,7 +61,7 @@ const DEFAULT_DASHBOARD_LAYOUT: GridItemData[] = [
 
 const DEFAULT_DASHBOARD_LAYOUT_SM: GridItemData[] = [
   { i: DashboardLayout.KPI, x: 0, y: 0, w: 12, h: 6 },
-  { i: DashboardLayout.hourlyChart, x: 0, y: 6, w: 12, h: 6 } /* Bot Comparison */,
+  { i: DashboardLayout.botComparison, x: 0, y: 6, w: 12, h: 6 } /* Bot Comparison */,
   { i: DashboardLayout.allOpenTrades, x: 0, y: 12, w: 12, h: 8 },
   { i: DashboardLayout.dailyChart, x: 0, y: 20, w: 12, h: 6 },
   { i: DashboardLayout.cumChartChart, x: 0, y: 26, w: 12, h: 6 },
diff --git a/src/views/Dashboard.vue b/src/views/Dashboard.vue
index cc133129..3a57deec 100644
--- a/src/views/Dashboard.vue
+++ b/src/views/Dashboard.vue
@@ -77,17 +77,31 @@
       </DraggableContainer>
     </GridItem>
     <GridItem
-      :i="gridLayoutHourly.i"
-      :x="gridLayoutHourly.x"
-      :y="gridLayoutHourly.y"
-      :w="gridLayoutHourly.w"
-      :h="gridLayoutHourly.h"
+      :i="gridLayoutBotComparison.i"
+      :x="gridLayoutBotComparison.x"
+      :y="gridLayoutBotComparison.y"
+      :w="gridLayoutBotComparison.w"
+      :h="gridLayoutBotComparison.h"
       :min-w="3"
       :min-h="4"
       drag-allow-from=".drag-header"
     >
-      <DraggableContainer header="Hourly Profit">
-        <HourlyChart :trades="closedTrades" :show-title="false" />
+      <DraggableContainer header="Bot comparison">
+        <bot-comparison-list />
+      </DraggableContainer>
+    </GridItem>
+    <GridItem
+      :i="gridLayoutAllOpenTrades.i"
+      :x="gridLayoutAllOpenTrades.x"
+      :y="gridLayoutAllOpenTrades.y"
+      :w="gridLayoutAllOpenTrades.w"
+      :h="gridLayoutAllOpenTrades.h"
+      :min-w="3"
+      :min-h="4"
+      drag-allow-from=".drag-header"
+    >
+      <DraggableContainer header="Open Trades">
+        <trade-list :active-trades="true" :trades="allOpenTradesAllBots" />
       </DraggableContainer>
     </GridItem>
     <GridItem
@@ -129,9 +143,10 @@ import { namespace } from 'vuex-class';
 import { GridLayout, GridItem, GridItemData } from 'vue-grid-layout';
 
 import DailyChart from '@/components/charts/DailyChart.vue';
-import HourlyChart from '@/components/charts/HourlyChart.vue';
 import CumProfitChart from '@/components/charts/CumProfitChart.vue';
 import TradesLogChart from '@/components/charts/TradesLog.vue';
+import BotComparisonList from '@/components/ftbot/BotComarisonList.vue';
+import TradeList from '@/components/ftbot/TradeList.vue';
 import DraggableContainer from '@/components/layout/DraggableContainer.vue';
 
 import {
@@ -160,15 +175,18 @@ const layoutNs = namespace('layout');
     GridLayout,
     GridItem,
     DailyChart,
-    HourlyChart,
     CumProfitChart,
     TradesLogChart,
+    BotComparisonList,
+    TradeList,
     DraggableContainer,
   },
 })
 export default class Dashboard extends Vue {
   @ftbot.Getter closedTrades!: Trade[];
 
+  @ftbot.Getter [MultiBotStoreGetters.allOpenTradesAllBots]!: Trade[];
+
   @ftbot.Getter [MultiBotStoreGetters.allTradesAllBots]!: ClosedTrade[];
 
   @ftbot.Getter [BotStoreGetters.dailyStats]!: DailyReturnValue;
@@ -246,8 +264,12 @@ export default class Dashboard extends Vue {
     return findGridLayout(this.gridLayout, DashboardLayout.dailyChart);
   }
 
-  get gridLayoutHourly(): GridItemData {
-    return findGridLayout(this.gridLayout, DashboardLayout.hourlyChart);
+  get gridLayoutBotComparison(): GridItemData {
+    return findGridLayout(this.gridLayout, DashboardLayout.botComparison);
+  }
+
+  get gridLayoutAllOpenTrades(): GridItemData {
+    return findGridLayout(this.gridLayout, DashboardLayout.allOpenTrades);
   }
 
   get gridLayoutCumChart(): GridItemData {