diff --git a/Projects/Superalgos/UI/Function-Libraries/TradingSessionFunctions.js b/Projects/Superalgos/UI/Function-Libraries/TradingSessionFunctions.js index 4ece16d05..b591b9c1c 100644 --- a/Projects/Superalgos/UI/Function-Libraries/TradingSessionFunctions.js +++ b/Projects/Superalgos/UI/Function-Libraries/TradingSessionFunctions.js @@ -60,6 +60,7 @@ function newSuperalgosFunctionLibraryTradingSessionFunctions() { 'Manage Stage->' + 'Managed Stop Loss->Managed Take Profit->' + 'Phase->Formula->Next Phase Event->Move To Phase Event->Phase->' + + 'Close Stage Event->' + 'Situation->Condition->Javascript Code->' + 'Close Stage->' + 'Initial Targets->Target Size In Base Asset->Target Size In Quoted Asset->Target Rate->Formula->' + diff --git a/TaskServer/LowFrequencyTrading/TradingStages.js b/TaskServer/LowFrequencyTrading/TradingStages.js index 733e735a7..cfdbd0dc4 100644 --- a/TaskServer/LowFrequencyTrading/TradingStages.js +++ b/TaskServer/LowFrequencyTrading/TradingStages.js @@ -951,10 +951,10 @@ exports.newTradingStages = function (processIndex, tradingEngineModule) { function checkStopStageEvent(stage) { /* Check the Close Stage Event. */ - let stopStageEvent = stage.stopStageEvent - if (stopStageEvent !== undefined) { - for (let k = 0; k < stopStageEvent.situations.length; k++) { - let situation = stopStageEvent.situations[k] + let closeStageEvent = stage.closeStageEvent + if (closeStageEvent !== undefined) { + for (let k = 0; k < closeStageEvent.situations.length; k++) { + let situation = closeStageEvent.situations[k] let passed if (situation.conditions.length > 0) { passed = true @@ -965,10 +965,10 @@ exports.newTradingStages = function (processIndex, tradingEngineModule) { tradingSystem.values.push([situation.id, passed]) if (passed) { tradingSystem.highlights.push(situation.id) - tradingSystem.highlights.push(stopStageEvent.id) + tradingSystem.highlights.push(closeStageEvent.id) tradingSystem.highlights.push(stage.id) - announcementsModule.makeAnnoucements(stopStageEvent) + announcementsModule.makeAnnoucements(closeStageEvent) return true } }