From b081b832252bf12f88ff32018cc9ef8b9dd5d198 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sat, 7 Dec 2019 09:09:18 +0100 Subject: [PATCH] code to javascriptCode --- Commons.js | 24 ++++++++++++------------ IndicatorBot.js | 6 +++--- TradingSimulation.js | 28 ++++++++++++++-------------- 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Commons.js b/Commons.js index 785df6972..63ed77f00 100644 --- a/Commons.js +++ b/Commons.js @@ -200,12 +200,12 @@ /* This is Initialization Code */ if (calculationsProcedure.initialization !== undefined) { - if (calculationsProcedure.initialization.code !== undefined) { + if (calculationsProcedure.initialization.javascriptCode !== undefined) { try { - eval(calculationsProcedure.initialization.code.code) + eval(calculationsProcedure.initialization.javascriptCode.code) } catch (err) { logger.write(MODULE_NAME, "[ERROR] calculationsProcedure -> initialization -> Error executing User Code. Error = " + err.stack) - logger.write(MODULE_NAME, "[ERROR] calculationsProcedure -> initialization -> Error executing User Code. Code = " + calculationsProcedure.initialization.code.code); + logger.write(MODULE_NAME, "[ERROR] calculationsProcedure -> initialization -> Error executing User Code. Code = " + calculationsProcedure.initialization.javascriptCode.code); throw ("Error Executing User Code.") } } @@ -213,7 +213,7 @@ /* This is Initialization Code */ if (calculationsProcedure.loop !== undefined) { - if (calculationsProcedure.loop.code !== undefined) { + if (calculationsProcedure.loop.javascriptCode !== undefined) { for (let index = 0; index < jsonArray.length; index++) { let product = {} @@ -221,11 +221,11 @@ /* This is Loop Code */ try { - eval(calculationsProcedure.loop.code.code) + eval(calculationsProcedure.loop.javascriptCode.code) } catch (err) { logger.write(MODULE_NAME, "[ERROR] calculationsProcedure -> loop -> Error executing User Code. Error = " + err.stack) logger.write(MODULE_NAME, "[ERROR] calculationsProcedure -> loop -> Error executing User Code. product = " + JSON.stringify(product)) - logger.write(MODULE_NAME, "[ERROR] calculationsProcedure -> loop -> Error executing User Code. Code = " + calculationsProcedure.loop.code.code); + logger.write(MODULE_NAME, "[ERROR] calculationsProcedure -> loop -> Error executing User Code. Code = " + calculationsProcedure.loop.javascriptCode.code); throw ("Error Executing User Code.") } @@ -291,12 +291,12 @@ /* This is Initialization Code */ if (dataBuildingProcedure.initialization !== undefined) { - if (dataBuildingProcedure.initialization.code !== undefined) { + if (dataBuildingProcedure.initialization.javascriptCode !== undefined) { try { - eval(dataBuildingProcedure.initialization.code.code) + eval(dataBuildingProcedure.initialization.javascriptCode.code) } catch (err) { logger.write(MODULE_NAME, "[ERROR] dataBuildingProcedure -> initialization -> Error executing User Code. Error = " + err.stack) - logger.write(MODULE_NAME, "[ERROR] dataBuildingProcedure -> initialization -> Error executing User Code. Code = " + dataBuildingProcedure.initialization.code.code); + logger.write(MODULE_NAME, "[ERROR] dataBuildingProcedure -> initialization -> Error executing User Code. Code = " + dataBuildingProcedure.initialization.javascriptCode.code); throw ("Error Executing User Code.") } } @@ -319,7 +319,7 @@ /* This is Initialization Code */ if (dataBuildingProcedure.loop !== undefined) { - if (dataBuildingProcedure.loop.code !== undefined) { + if (dataBuildingProcedure.loop.javascriptCode !== undefined) { let lastRecord for (let index = 0; index < mainDependency.records.length; index++) { @@ -340,11 +340,11 @@ /* This is Loop Code */ try { - eval(dataBuildingProcedure.loop.code.code) + eval(dataBuildingProcedure.loop.javascriptCode.code) } catch (err) { logger.write(MODULE_NAME, "[ERROR] dataBuildingProcedure -> loop -> Error executing User Code. Error = " + err.stack) logger.write(MODULE_NAME, "[ERROR] dataBuildingProcedure -> loop -> Error executing User Code. product = " + JSON.stringify(product)) - logger.write(MODULE_NAME, "[ERROR] dataBuildingProcedure -> loop -> Error executing User Code. Code = " + dataBuildingProcedure.loop.code.code); + logger.write(MODULE_NAME, "[ERROR] dataBuildingProcedure -> loop -> Error executing User Code. Code = " + dataBuildingProcedure.loop.javascriptCode.code); throw ("Error Executing User Code.") } diff --git a/IndicatorBot.js b/IndicatorBot.js index 8ebe98fbe..e1c5b59e7 100644 --- a/IndicatorBot.js +++ b/IndicatorBot.js @@ -90,8 +90,8 @@ /* Check Irregular Periods */ - if (outputDatasetNode.referenceParent.parentNode.dataBuilding.loop.code !== undefined) { - if (outputDatasetNode.referenceParent.parentNode.dataBuilding.loop.code.code.indexOf('results.push') >= 0) { + if (outputDatasetNode.referenceParent.parentNode.dataBuilding.loop.javascriptCode !== undefined) { + if (outputDatasetNode.referenceParent.parentNode.dataBuilding.loop.javascriptCode.code.indexOf('results.push') >= 0) { resultsWithIrregularPeriods = true } } @@ -130,7 +130,7 @@ let contextSummary = {} /* Check Irregular Periods */ - if (outputDatasetNode.referenceParent.parentNode.dataBuilding.loop.code.code.indexOf('results.push') >= 0) { + if (outputDatasetNode.referenceParent.parentNode.dataBuilding.loop.javascriptCode.code.indexOf('results.push') >= 0) { resultsWithIrregularPeriods = true } diff --git a/TradingSimulation.js b/TradingSimulation.js index ea6beb108..c0a451e0d 100644 --- a/TradingSimulation.js +++ b/TradingSimulation.js @@ -658,8 +658,8 @@ let condition = situation.conditions[m]; let key = j + '-' + 'triggerStage' + '-' + 'triggerOn' + '-' + k + '-' + m; - if (condition.code !== undefined) { - newCondition(key, condition.code); + if (condition.javascriptCode !== undefined) { + newCondition(key, condition.javascriptCode); } } } @@ -676,8 +676,8 @@ let condition = situation.conditions[m]; let key = j + '-' + 'triggerStage' + '-' + 'triggerOff' + '-' + k + '-' + m; - if (condition.code !== undefined) { - newCondition(key, condition.code); + if (condition.javascriptCode !== undefined) { + newCondition(key, condition.javascriptCode); } } } @@ -694,8 +694,8 @@ let condition = situation.conditions[m]; let key = j + '-' + 'triggerStage' + '-' + 'takePosition' + '-' + k + '-' + m; - if (condition.code !== undefined) { - newCondition(key, condition.code); + if (condition.javascriptCode !== undefined) { + newCondition(key, condition.javascriptCode); } } } @@ -825,8 +825,8 @@ let condition = situation.conditions[m]; let key = j + '-' + 'openStage' + '-' + 'initialDefinition' + '-' + 'stopLoss' + '-' + p + '-' + k + '-' + m; - if (condition.code !== undefined) { - newCondition(key, condition.code); + if (condition.javascriptCode !== undefined) { + newCondition(key, condition.javascriptCode); } } } @@ -891,8 +891,8 @@ let condition = situation.conditions[m]; let key = j + '-' + 'openStage' + '-' + 'initialDefinition' + '-' + 'takeProfit' + '-' + p + '-' + k + '-' + m; - if (condition.code !== undefined) { - newCondition(key, condition.code); + if (condition.javascriptCode !== undefined) { + newCondition(key, condition.javascriptCode); } } } @@ -967,8 +967,8 @@ let condition = situation.conditions[m]; let key = j + '-' + 'manageStage' + '-' + 'stopLoss' + '-' + p + '-' + k + '-' + m; - if (condition.code !== undefined) { - newCondition(key, condition.code); + if (condition.javascriptCode !== undefined) { + newCondition(key, condition.javascriptCode); } } } @@ -1034,8 +1034,8 @@ let condition = situation.conditions[m]; let key = j + '-' + 'manageStage' + '-' + 'takeProfit' + '-' + p + '-' + k + '-' + m; - if (condition.code !== undefined) { - newCondition(key, condition.code); + if (condition.javascriptCode !== undefined) { + newCondition(key, condition.javascriptCode); } } }