From b35bade968ba7d32e3deaf79e0d437b461edef44 Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Sat, 27 Jun 2020 14:52:45 +0200
Subject: [PATCH] Announcements Plotted at Trading System

---
 LowFrequencyTrading/Announcements.js  | 7 +++++--
 LowFrequencyTrading/TradingRecords.js | 3 +++
 LowFrequencyTrading/TradingSystem.js  | 2 ++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/LowFrequencyTrading/Announcements.js b/LowFrequencyTrading/Announcements.js
index b9112dd7e..ec8c25d75 100644
--- a/LowFrequencyTrading/Announcements.js
+++ b/LowFrequencyTrading/Announcements.js
@@ -8,18 +8,20 @@ exports.newAnnouncements = function newAnnouncements(bot, logger) {
         finalize: finalize
     }
 
+    let tradingSystem
     let tradingEngine
-    let announcementsToBeMade = []
 
     return thisObject
 
     function initialize() {
+        tradingSystem = bot.simulationState.tradingSystem
         tradingEngine = bot.simulationState.tradingEngine
     }
 
     function finalize() {
+        tradingSystem = undefined
         tradingEngine = undefined
-        announcementsToBeMade = undefined
+        bot.SESSION.messagesSent = undefined
     }
 
     function makeAnnoucements(node) {
@@ -48,6 +50,7 @@ exports.newAnnouncements = function newAnnouncements(bot, logger) {
 
                     if (bot.SESSION.socialBots !== undefined) {
                         bot.SESSION.socialBots.announce(text)
+                        tradingSystem.announcements.push([announcement.id, text])
                     } else {
                         tradingSystem.errors.push([announcement.id, 'Could not announce because session does not have Social Bots.'])
                     }
diff --git a/LowFrequencyTrading/TradingRecords.js b/LowFrequencyTrading/TradingRecords.js
index 742272708..993c75edd 100644
--- a/LowFrequencyTrading/TradingRecords.js
+++ b/LowFrequencyTrading/TradingRecords.js
@@ -12,6 +12,7 @@ exports.newTradingRecords = function newTradingRecords(bot, logger) {
 
     let tradingEngine
     let tradingSystem
+    let sessionParameters
     let outputDatasetsMap
 
     return thisObject
@@ -19,12 +20,14 @@ exports.newTradingRecords = function newTradingRecords(bot, logger) {
     function initialize(pOutputDatasetsMap) {
         tradingEngine = bot.simulationState.tradingEngine
         tradingSystem = bot.simulationState.tradingSystem
+        sessionParameters = bot.SESSION.parameters
         outputDatasetsMap = pOutputDatasetsMap  // These are the files turned into arrays, stored in a Map by Product codeName.
     }
 
     function finalize() {
         tradingEngine = undefined
         tradingSystem = undefined
+        sessionParameters = undefined
         outputDatasetsMap = undefined
     }
 
diff --git a/LowFrequencyTrading/TradingSystem.js b/LowFrequencyTrading/TradingSystem.js
index 27463eee4..d79a43da7 100644
--- a/LowFrequencyTrading/TradingSystem.js
+++ b/LowFrequencyTrading/TradingSystem.js
@@ -87,6 +87,7 @@ exports.newTradingSystem = function newTradingSystem(bot, logger) {
     }
 
     function reset(pChart) {
+        /* This function helps reset data structures at every cycle of the simulation loop/=. */
         chart = pChart // We need chat to be a local object accessible from conditions and formulas.
         tradingSystem.highlights = []
         tradingSystem.errors = []
@@ -94,6 +95,7 @@ exports.newTradingSystem = function newTradingSystem(bot, logger) {
         tradingSystem.status = []
         tradingSystem.progress = []
         tradingSystem.running = []
+        tradingSystem.announcements = []
     }
 
     function mantainStrategies() {