From ae0ec9499b0ffee126744e436120233cb51892fa Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Mon, 26 Oct 2020 16:03:54 +0100 Subject: [PATCH] Fixes --- .../Spaces/Floating-Space/UiObject.js | 4 ++ .../LowFrequencyTrading/OrdersSimulations.js | 46 ++++++++++--------- 2 files changed, 28 insertions(+), 22 deletions(-) diff --git a/Integrations/Projects/Superalgos/Spaces/Floating-Space/UiObject.js b/Integrations/Projects/Superalgos/Spaces/Floating-Space/UiObject.js index 8404e9233..f197a3eb2 100644 --- a/Integrations/Projects/Superalgos/Spaces/Floating-Space/UiObject.js +++ b/Integrations/Projects/Superalgos/Spaces/Floating-Space/UiObject.js @@ -1619,6 +1619,10 @@ function newUiObject() { if (UI.projects.superalgos.spaces.floatingSpace.inMapMode === true) { return } + if (thisObject.codeEditor !== undefined && thisObject.codeEditor.visible === true) {return} + if (thisObject.formulaEditor !== undefined && thisObject.formulaEditor.visible === true) {return} + if (thisObject.confitionEditor !== undefined && thisObject.confitionEditor.visible === true) {return} + if (thisObject.configEditor !== undefined && thisObject.configEditor.visible === true) {return} /* Text Follows */ let position = { diff --git a/TaskServer/LowFrequencyTrading/OrdersSimulations.js b/TaskServer/LowFrequencyTrading/OrdersSimulations.js index 6566adc39..333896cff 100644 --- a/TaskServer/LowFrequencyTrading/OrdersSimulations.js +++ b/TaskServer/LowFrequencyTrading/OrdersSimulations.js @@ -70,30 +70,32 @@ exports.newOrdersSimulations = function newOrdersSimulations(bot, logger) { case 'Market Order': { /* Actual Rate is simulated based on the Session Paremeters */ let slippageAmount = tradingEngineOrder.rate.value * sessionParameters.slippage.config.positionRate / 100 - switch (tradingSystemOrder.type) { - case 'Market Sell Order': { - tradingEngineOrder.orderStatistics.actualRate.value = tradingEngineOrder.rate.value - slippageAmount - tradingEngineOrder.orderStatistics.actualRate.value = global.PRECISE(tradingEngineOrder.orderStatistics.actualRate.value, 10) + if (slippageAmount !== 0) { + switch (tradingSystemOrder.type) { + case 'Market Sell Order': { + tradingEngineOrder.orderStatistics.actualRate.value = tradingEngineOrder.rate.value - slippageAmount + tradingEngineOrder.orderStatistics.actualRate.value = global.PRECISE(tradingEngineOrder.orderStatistics.actualRate.value, 10) - tradingSystem.warnings.push( - [ - sessionParameters.slippage.id, - 'sessionParameters.slippage.config.positionRate Slippage Amount (' + slippageAmount + ') substracted from Order Rate (' + tradingEngineOrder.rate.value + ') to get the Actual Rate (' +tradingEngineOrder.orderStatistics.actualRate.value + ')' - ] - ) - break - } - case 'Market Buy Order': { - tradingEngineOrder.orderStatistics.actualRate.value = tradingEngineOrder.rate.value + slippageAmount - tradingEngineOrder.orderStatistics.actualRate.value = global.PRECISE(tradingEngineOrder.orderStatistics.actualRate.value, 10) + tradingSystem.warnings.push( + [ + sessionParameters.slippage.id, + 'slippage.config.positionRate Slippage Amount (' + slippageAmount + ') substracted from Order Rate (' + tradingEngineOrder.rate.value + ') to get the Actual Rate (' + tradingEngineOrder.orderStatistics.actualRate.value + ')' + ] + ) + break + } + case 'Market Buy Order': { + tradingEngineOrder.orderStatistics.actualRate.value = tradingEngineOrder.rate.value + slippageAmount + tradingEngineOrder.orderStatistics.actualRate.value = global.PRECISE(tradingEngineOrder.orderStatistics.actualRate.value, 10) - tradingSystem.warnings.push( - [ - sessionParameters.slippage.id, - 'sessionParameters.slippage.config.positionRate Slippage Amount (' + slippageAmount + ') added to Order Rate (' + tradingEngineOrder.rate.value + ') to get the Actual Rate (' +tradingEngineOrder.orderStatistics.actualRate.value + ')' - ] - ) - break + tradingSystem.warnings.push( + [ + sessionParameters.slippage.id, + 'slippage.config.positionRate Slippage Amount (' + slippageAmount + ') added to Order Rate (' + tradingEngineOrder.rate.value + ') to get the Actual Rate (' + tradingEngineOrder.orderStatistics.actualRate.value + ')' + ] + ) + break + } } } break