code to javascriptCode

This commit is contained in:
Luis Fernando Molina committed 2019-12-07 09:09:18 +01:00
1 parent da6f163b43
commit b081b83225
3 files changed
+29 -29

No files matched your search

+12 -12
View File
@@ -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.")
}
+3 -3
View File
@@ -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
}
+14 -14
View File
@@ -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);
}
}
}