From 34f6abf2db01f7d611168358d1ad3a440f45daec Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Wed, 25 Mar 2020 17:50:09 +0100
Subject: [PATCH] Situation Names

---
 Strategies.js | 8 ++++++++
 Trades.js     | 5 ++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/Strategies.js b/Strategies.js
index 3ca511d39..41b911914 100644
--- a/Strategies.js
+++ b/Strategies.js
@@ -383,6 +383,7 @@
                         record.number = dailyFile[i][3];
                         record.beginRate = dailyFile[i][4];
                         record.endRate = dailyFile[i][5];
+                        record.triggerOnSituation = dailyFile[i][6];
 
                         if (
                             (record.begin >= farLeftDate.valueOf() && record.end <= farRightDate.valueOf()) &&
@@ -454,6 +455,7 @@
                 record.number = marketFile[i][3];
                 record.beginRate = marketFile[i][4];
                 record.endRate = marketFile[i][5];
+                record.triggerOnSituation = marketFile[i][6];
 
                 if (record.begin >= leftDate.valueOf() && record.end <= rightDate.valueOf()) {
 
@@ -575,6 +577,12 @@
                 browserCanvasContext.fillStyle = 'rgba(' + UI_COLOR.LIGHT_GREY + ', ' + 0.5 + ')';
                 browserCanvasContext.fill();
                 */
+
+                /* Situation Name */
+                let digit = record.begin.toFixed(0).substring(7,8)
+                let positionY =  recordPoint3.y  - (recordPoint3.y - recordPoint1.y) / 2 + (Number(digit) * 10 - 50)
+                printLabel(record.triggerOnSituation, recordPoint1.x + 5, positionY , '1', 9);
+
                 /* Draw the Sticks */
 
                 drawStick(recordPoint1, recordPoint3);
diff --git a/Trades.js b/Trades.js
index 24e64c7cd..2d38c3233 100644
--- a/Trades.js
+++ b/Trades.js
@@ -370,6 +370,7 @@
                         record.beginRate = dailyFile[i][4];
                         record.endRate = dailyFile[i][5];
                         record.exitType = dailyFile[i][6];
+                        record.takePositionSituation = dailyFile[i][7];
 
                         if (
                             (record.begin >= farLeftDate.valueOf() && record.end <= farRightDate.valueOf()) &&
@@ -435,6 +436,7 @@
                 record.beginRate = marketFile[i][4];
                 record.endRate = marketFile[i][5];
                 record.exitType = marketFile[i][6];
+                record.takePositionSituation = marketFile[i][7];
 
                 if (
                     (record.begin >= leftDate.valueOf() && record.end <= rightDate.valueOf()) &&
@@ -516,6 +518,7 @@
                 recordPoint2 = thisObject.fitFunction(recordPoint2);
                 recordPoint3 = thisObject.fitFunction(recordPoint3);
 
+                let line0 = record.takePositionSituation
                 let line1 = '';
                 let line2 = '';
 
@@ -595,7 +598,7 @@
                     // we do not write any text
                 } else {
 
-
+                    printLabel(line0, recordPoint2.x - (recordPoint2.x - recordPoint1.x) / 2 - line1.length * FONT_ASPECT_RATIO, point.y - 15, '1', 12);
                     printLabel(line1, recordPoint2.x - (recordPoint2.x - recordPoint1.x) / 2 - line1.length * FONT_ASPECT_RATIO, point.y, '1', 12);
                     printLabel(line2, recordPoint2.x - (recordPoint2.x - recordPoint1.x) / 2 - line2.length * FONT_ASPECT_RATIO, point.y + 15, '1', 12);