From 2bc7f916419340e79689f3d36a4b0057b5755a72 Mon Sep 17 00:00:00 2001
From: Smidy13 <77650800+Smidy13@users.noreply.github.com>
Date: Tue, 6 Apr 2021 10:40:38 +1200
Subject: [PATCH] Bug Fix: Allow Announcements on Create Order Events

---
 .../Trading-Bot/Low-Frequency-Trading/TradingStages.js      | 6 +++++-
 .../UI/Function-Libraries/TradingSessionFunctions.js        | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Projects/Superalgos/TS/Bot-Modules/Trading-Bot/Low-Frequency-Trading/TradingStages.js b/Projects/Superalgos/TS/Bot-Modules/Trading-Bot/Low-Frequency-Trading/TradingStages.js
index cbae4558a..876a4a3a8 100644
--- a/Projects/Superalgos/TS/Bot-Modules/Trading-Bot/Low-Frequency-Trading/TradingStages.js
+++ b/Projects/Superalgos/TS/Bot-Modules/Trading-Bot/Low-Frequency-Trading/TradingStages.js
@@ -408,12 +408,15 @@ exports.newSuperalgosBotModulesTradingStages = function (processIndex) {
         function runWhenStatusIsOpening() {
             /* Opening Status Procedure */
             if (tradingEngine.tradingCurrent.strategyManageStage.status.value === 'Opening') {
+                let strategy = tradingSystem.tradingStrategies[tradingEngine.tradingCurrent.strategy.index.value]
+                let manageStage = strategy.manageStage
+                
                 /*
                 The system allows the user not to define a Manage Stage, because the Manage Stage is optional.
                 Here we are going to see if that is the case and if it is, we will inmidiatelly consider 
                 the Manage Stage as closed.
                 */
-                if (tradingSystem.tradingStrategies[tradingEngine.tradingCurrent.strategy.index.value].manageStage === undefined) {
+                if (manageStage === undefined) {
                     changeStageStatus('Manage Stage', 'Closed', 'Manage Stage Undefined')
                     changeStageStatus('Close Stage', 'Opening')
                     return
@@ -421,6 +424,7 @@ exports.newSuperalgosBotModulesTradingStages = function (processIndex) {
 
                 /* Now we switch to the Open status. */
                 changeStageStatus('Manage Stage', 'Open')
+                announcementsModuleObject.makeAnnoucements(manageStage)
             }
         }
 
diff --git a/Projects/Superalgos/UI/Function-Libraries/TradingSessionFunctions.js b/Projects/Superalgos/UI/Function-Libraries/TradingSessionFunctions.js
index d644bc354..706699a19 100644
--- a/Projects/Superalgos/UI/Function-Libraries/TradingSessionFunctions.js
+++ b/Projects/Superalgos/UI/Function-Libraries/TradingSessionFunctions.js
@@ -73,11 +73,11 @@ function newSuperalgosFunctionLibraryTradingSessionFunctions() {
             'Situation->Condition->Javascript Code->' +
             'Close Stage->' +
             'Initial Targets->Target Size In Base Asset->Target Size In Quoted Asset->Target Rate->Formula->' +
-            'Announcement->Announcement Formula->Announcement Condition->' +
             'Open Execution->Close Execution->' +
             'Execution Algorithm->Market Buy Order->Market Sell Order->Limit Buy Order->Limit Sell Order->' +
             'Order Rate->Formula->' +
             'Create Order Event->Cancel Order Event->' +
+            'Announcement->Announcement Formula->Announcement Condition->' +
             'Size In Base Asset->Size In Quoted Asset->Position Rate->Formula->' +
             'Situation->Condition->Javascript Code->' +
             'Market Order->Limit Order->' +