diff --git a/CockpitSpace/RestartSimulation.js b/CockpitSpace/RestartSimulation.js index 26f44c099..8813d3c1c 100644 --- a/CockpitSpace/RestartSimulation.js +++ b/CockpitSpace/RestartSimulation.js @@ -110,7 +110,7 @@ function newRestartSimulation () { try { if (isRunning === false) { thisObject.status = 'Saving' - let result = await canvas.strategySpace.strategizerGateway.saveToStrategyzer(getSimulationParams()) + let result = await canvas.strategySpace.strategizerGateway.saveToStrategyzer(getUICurrentValues()) if (result === false) { thisObject.status = 'Error' counterTillNextState = 500 @@ -151,7 +151,7 @@ function newRestartSimulation () { function getDefinition () { let definitionNode = canvas.strategySpace.workspace.getProtocolDefinitionNode() - definitionNode.simulationParams = getSimulationParams() + definitionNode.uiCurrentValues = getUICurrentValues() return JSON.stringify(definitionNode) } diff --git a/StrategySpace/StrategizerGateway.js b/StrategySpace/StrategizerGateway.js index b623990b4..efde1d0eb 100644 --- a/StrategySpace/StrategizerGateway.js +++ b/StrategySpace/StrategizerGateway.js @@ -94,7 +94,7 @@ function newStrategizerGateway () { } } - async function saveToStrategyzer (simulationParams) { + async function saveToStrategyzer (uiCurrentValues) { try { const accessToken = window.localStorage.getItem(LOGGED_IN_ACCESS_TOKEN_LOCAL_STORAGE_KEY) if (accessToken === null) { @@ -115,7 +115,7 @@ function newStrategizerGateway () { } if (window.canvasApp.executingAt === 'Local') { - tradingSystem.simulationParams = simulationParams + tradingSystem.uiCurrentValues = uiCurrentValues callServer(JSON.stringify(tradingSystem), 'SaveDefinition', onSaved) function onSaved (err) { if (err.result === GLOBAL.DEFAULT_OK_RESPONSE.result) { diff --git a/StrategySpace/Workspace/FunctionLibraries/SessionFunctions.js b/StrategySpace/Workspace/FunctionLibraries/SessionFunctions.js index 8c7ad313a..598f8ebe0 100644 --- a/StrategySpace/Workspace/FunctionLibraries/SessionFunctions.js +++ b/StrategySpace/Workspace/FunctionLibraries/SessionFunctions.js @@ -19,7 +19,7 @@ function newSessionFunctions () { function getDefinition () { let definitionNode = canvas.strategySpace.workspace.getProtocolDefinitionNode() - definitionNode.simulationParams = getSimulationParams() + definitionNode.uiCurrentValues = getUICurrentValues() return JSON.stringify(definitionNode) } } diff --git a/StrategySpace/Workspace/Workspace.js b/StrategySpace/Workspace/Workspace.js index 637d9346f..11f612768 100644 --- a/StrategySpace/Workspace/Workspace.js +++ b/StrategySpace/Workspace/Workspace.js @@ -187,7 +187,7 @@ function newWorkspace () { break case 'Save Trading System': { - let result = await canvas.strategySpace.strategizerGateway.saveToStrategyzer(getSimulationParams()) + let result = await canvas.strategySpace.strategizerGateway.saveToStrategyzer(getUICurrentValues()) if (result === true) { callBackFunction(GLOBAL.DEFAULT_OK_RESPONSE) } else { diff --git a/Utilities.js b/Utilities.js index 7325e599f..118ec8f65 100644 --- a/Utilities.js +++ b/Utilities.js @@ -1,5 +1,5 @@ -function getSimulationParams () { +function getUICurrentValues () { let dateAtScreenCorner = new Date(window.localStorage.getItem('Date @ Screen Corner')) let currentTimePeriod = JSON.parse(window.localStorage.getItem('Current Time Period')) @@ -7,13 +7,13 @@ function getSimulationParams () { let timePeriodArray = timePeriodsMasterArray[currentTimePeriod.filePeriodIndex] let timePeriod = timePeriodArray[currentTimePeriod.timePeriodIndex][1] - let simulationParams = { + let uiCurrentValues = { beginDatetime: dateAtScreenCorner, timePeriod: timePeriod, timestamp: (new Date()).valueOf() } - return simulationParams + return uiCurrentValues } function transformThisPoint (point, container) {