From 7493d03087977d93de987247261d40bf9c2aa824 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sat, 10 Aug 2019 00:14:45 +0200 Subject: [PATCH 1/2] Envio de simulationParams junto con la definition.json --- CockpitSpace/RestartSimulation.js | 11 +++++++---- StrategySpace/StrategizerGateway.js | 3 ++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CockpitSpace/RestartSimulation.js b/CockpitSpace/RestartSimulation.js index 15fbf7fa8..66fcdcdeb 100644 --- a/CockpitSpace/RestartSimulation.js +++ b/CockpitSpace/RestartSimulation.js @@ -106,14 +106,17 @@ function newRestartSimulation () { beginDatetime: dateAtScreenCorner.valueOf() / 1000 | 0, resumeExecution: false, timePeriodDailyArray: timePeriodDailyArray, - timePeriodMarketArray: timePeriodMarketArray + timePeriodMarketArray: timePeriodMarketArray, + timestamp: (new Date()).valueOf() } try { thisObject.status = 'Saving' - let result = await canvas.strategySpace.strategizerGateway.saveToStrategyzer() + let result = await canvas.strategySpace.strategizerGateway.saveToStrategyzer(simulationParams) if (result === true) { - thisObject.status = 'Restarting' - await graphQlRestartSimulation(simulationParams) + if (window.canvasApp.executingAt !== 'Local') { + thisObject.status = 'Restarting' + await graphQlRestartSimulation(simulationParams) + } thisObject.status = 'Calculating' counterTillNextState = 50 } else { diff --git a/StrategySpace/StrategizerGateway.js b/StrategySpace/StrategizerGateway.js index fa7fbfcad..431129be8 100644 --- a/StrategySpace/StrategizerGateway.js +++ b/StrategySpace/StrategizerGateway.js @@ -94,7 +94,7 @@ function newStrategizerGateway () { } } - async function saveToStrategyzer () { + async function saveToStrategyzer (simulationParams) { try { const accessToken = window.localStorage.getItem(LOGGED_IN_ACCESS_TOKEN_LOCAL_STORAGE_KEY) if (accessToken === null) { @@ -121,6 +121,7 @@ function newStrategizerGateway () { } if (window.canvasApp.executingAt === 'Local') { + tradingSystem.simulationParams = simulationParams callServer(JSON.stringify(tradingSystem), 'SaveDefinition', onSaved) function onSaved (err) { if (err.result === GLOBAL.DEFAULT_OK_RESPONSE.result) { From 33a8a725f68d75d440050dec778cee1f0169682b Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sat, 10 Aug 2019 11:15:35 +0200 Subject: [PATCH 2/2] Bad date format --- CockpitSpace/RestartSimulation.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CockpitSpace/RestartSimulation.js b/CockpitSpace/RestartSimulation.js index 66fcdcdeb..4d5787271 100644 --- a/CockpitSpace/RestartSimulation.js +++ b/CockpitSpace/RestartSimulation.js @@ -103,7 +103,7 @@ function newRestartSimulation () { } let simulationParams = { - beginDatetime: dateAtScreenCorner.valueOf() / 1000 | 0, + beginDatetime: dateAtScreenCorner.valueOf(), resumeExecution: false, timePeriodDailyArray: timePeriodDailyArray, timePeriodMarketArray: timePeriodMarketArray,