From 6dc9f2abc800e44b554040f6efc593dcd6cd6065 Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Sat, 2 May 2020 10:16:34 +0200
Subject: [PATCH] bug fixed

---
 TradingSimulation.js                   | 12 ++--
 TradingSimulationAssetBalancesPanel.js | 79 ++++++++++++++++++--------
 2 files changed, 63 insertions(+), 28 deletions(-)

diff --git a/TradingSimulation.js b/TradingSimulation.js
index 624c489c2..f9b3b5787 100644
--- a/TradingSimulation.js
+++ b/TradingSimulation.js
@@ -385,8 +385,10 @@
                         record.maximunBalanceB = dailyFile[i][32];
                         record.baseAsset = dailyFile[i][33];
                         record.quotedAsset = dailyFile[i][34];
-                        record.positionPeriods = dailyFile[i][35];
-                        record.positionDays = dailyFile[i][36];
+                        record.marketBaseAsset = dailyFile[i][35];
+                        record.marketQuotedAsset = dailyFile[i][36];
+                        record.positionPeriods = dailyFile[i][37];
+                        record.positionDays = dailyFile[i][38];
 
                         if (
                             (record.begin >= farLeftDate.valueOf() && record.end <= farRightDate.valueOf()) &&
@@ -477,8 +479,10 @@
                 record.maximunBalanceB = marketFile[i][32];
                 record.baseAsset = marketFile[i][33];
                 record.quotedAsset = marketFile[i][34];
-                record.positionPeriods = marketFile[i][35];
-                record.positionDays = marketFile[i][36];
+                record.marketBaseAsset = marketFile[i][35];
+                record.marketQuotedAsset = marketFile[i][36];
+                record.positionPeriods = marketFile[i][37];
+                record.positionDays = marketFile[i][38];
 
                 if (
                     (record.begin >= leftDate.valueOf() && record.end <= rightDate.valueOf()) &&
diff --git a/TradingSimulationAssetBalancesPanel.js b/TradingSimulationAssetBalancesPanel.js
index 3cc23fa0e..7272577da 100644
--- a/TradingSimulationAssetBalancesPanel.js
+++ b/TradingSimulationAssetBalancesPanel.js
@@ -154,33 +154,64 @@ function newTradingEnginesPlottersTradingSimulationTradingSimulationTradingSimul
             return
         }
 
-        params = {}
-        params.VALUE = currentRecord.balanceA;
-        params.INIT_VALUE = currentRecord.initialBalanceA
-        params.MIN_VALUE = currentRecord.minimunBalanceA
-        params.MAX_VALUE = currentRecord.maximunBalanceA
-        params.ASSET_LABEL = 'Asset A'
-        params.ASSET_NAME = currentRecord.baseAsset
-        params.LEFT_OFFSET = X_AXIS
-        params.POSITION_TAKEN = positionTaken
-        params.BASE_ASSET = currentRecord.baseAsset
-        params.DECIMALS = 4
+        if (currentRecord.baseAsset === currentRecord.marketBaseAsset) {
+            params = {}
+            params.VALUE = currentRecord.balanceA;
+            params.INIT_VALUE = currentRecord.initialBalanceA
+            params.MIN_VALUE = currentRecord.minimunBalanceA
+            params.MAX_VALUE = currentRecord.maximunBalanceA
+            params.ASSET_LABEL = 'Base'
+            params.ASSET_NAME = currentRecord.baseAsset
+            params.LEFT_OFFSET = X_AXIS
+            params.POSITION_TAKEN = positionTaken
+            params.BASE_ASSET = currentRecord.baseAsset
+            params.DECIMALS = 4
 
-        paramsArray.push(params)
+            paramsArray.push(params)
 
-        params = {}
-        params.VALUE = currentRecord.balanceB;
-        params.MIN_VALUE = currentRecord.minimunBalanceB
-        params.INIT_VALUE = currentRecord.initialBalanceB
-        params.MAX_VALUE = currentRecord.maximunBalanceB
-        params.ASSET_LABEL = 'Asset B'
-        params.ASSET_NAME = currentRecord.quotedAsset
-        params.LEFT_OFFSET = X_AXIS
-        params.POSITION_TAKEN = positionTaken
-        params.BASE_ASSET = currentRecord.baseAsset
-        params.DECIMALS = 2
+            params = {}
+            params.VALUE = currentRecord.balanceB;
+            params.MIN_VALUE = currentRecord.minimunBalanceB
+            params.INIT_VALUE = currentRecord.initialBalanceB
+            params.MAX_VALUE = currentRecord.maximunBalanceB
+            params.ASSET_LABEL = 'Quoted'
+            params.ASSET_NAME = currentRecord.quotedAsset
+            params.LEFT_OFFSET = X_AXIS
+            params.POSITION_TAKEN = positionTaken
+            params.BASE_ASSET = currentRecord.baseAsset
+            params.DECIMALS = 2
+
+            paramsArray.push(params)
+        } else {
+            params = {}
+            params.VALUE = currentRecord.balanceB;
+            params.INIT_VALUE = currentRecord.initialBalanceB
+            params.MIN_VALUE = currentRecord.minimunBalanceB
+            params.MAX_VALUE = currentRecord.maximunBalanceB
+            params.ASSET_LABEL = 'Base'
+            params.ASSET_NAME = currentRecord.baseAsset
+            params.LEFT_OFFSET = X_AXIS
+            params.POSITION_TAKEN = positionTaken
+            params.BASE_ASSET = currentRecord.baseAsset
+            params.DECIMALS = 4
+
+            paramsArray.push(params)
+
+            params = {}
+            params.VALUE = currentRecord.balanceA;
+            params.MIN_VALUE = currentRecord.minimunBalanceA
+            params.INIT_VALUE = currentRecord.initialBalanceA
+            params.MAX_VALUE = currentRecord.maximunBalanceA
+            params.ASSET_LABEL = 'Quoted'
+            params.ASSET_NAME = currentRecord.quotedAsset
+            params.LEFT_OFFSET = X_AXIS
+            params.POSITION_TAKEN = positionTaken
+            params.BASE_ASSET = currentRecord.baseAsset
+            params.DECIMALS = 2
+
+            paramsArray.push(params)
+        }
 
-        paramsArray.push(params)
 
         thisObject.assetBalances.setParamsArray(paramsArray)
         thisObject.assetBalances.draw()