From eb61498176d107185f95e507b01dfcfe0131ec15 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Tue, 26 Nov 2019 18:34:48 +0100 Subject: [PATCH] Open strategies and trades --- Strategies.js | 10 +++++++--- Trades.js | 23 ++++++++++++----------- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/Strategies.js b/Strategies.js index 9c1951e90..50cf96a80 100644 --- a/Strategies.js +++ b/Strategies.js @@ -536,7 +536,7 @@ let imageSize = 20; let imageToDraw = strategyImages[record.number]; - if (record.status === 1) { + /* Draw the line that represents the duration of closed strategy */ browserCanvasContext.beginPath(); @@ -549,9 +549,13 @@ browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.MANGANESE_PURPLE + ', 1)'; browserCanvasContext.lineWidth = 1 - browserCanvasContext.setLineDash([0, 0]) + if (record.status === 1) { + browserCanvasContext.setLineDash([0, 0]) + } else { + browserCanvasContext.setLineDash([2, 4]) + } browserCanvasContext.stroke() - } + drawStick(recordPoint1, recordPoint3); diff --git a/Trades.js b/Trades.js index a27f5e76f..b38093e0a 100644 --- a/Trades.js +++ b/Trades.js @@ -515,23 +515,24 @@ let line1 = ''; let line2 = ''; - switch (record.exitType) { - case 1: { - line1 = 'Exit: STOP'; - break; - } - case 2: { - line1 = 'Exit: TP'; - break; + if (record.status === 1) { + switch (record.exitType) { + case 1: { + line1 = 'Exit: STOP'; + break; + } + case 2: { + line1 = 'Exit: TP'; + break; + } } + } else { + line1 = 'Open Position'; } if (record.lastTradeROI < 0) { - line2 = 'ROI:' + (record.lastTradeROI).toFixed(2) + ' %'; - } else { - line2 = 'ROI:' + (record.lastTradeROI).toFixed(2) + ' %'; }