diff --git a/CockpitSpace/RestartSimulation.js b/CockpitSpace/RestartSimulation.js index 0b584dff5..451c4f4ac 100644 --- a/CockpitSpace/RestartSimulation.js +++ b/CockpitSpace/RestartSimulation.js @@ -34,6 +34,8 @@ function newRestartSimulation () { let productCardsToTurnOn = [] let executionFocusExists = false + let idleLabel = '' + return thisObject function finalize () { @@ -83,39 +85,21 @@ function newRestartSimulation () { } async function restart () { - let dateAtScreenCorner = new Date(window.localStorage.getItem('Date @ Screen Corner')) - let currentTimePeriod = JSON.parse(window.localStorage.getItem('Current Time Period')) - - let timePeriodsMasterArray = [marketFilesPeriods, dailyFilePeriods] - let timePeriodArray = timePeriodsMasterArray[currentTimePeriod.filePeriodIndex] - let timePeriod = timePeriodArray[currentTimePeriod.timePeriodIndex][1] - - let timePeriodDailyArray = [] - let timePeriodMarketArray = [] - - switch (currentTimePeriod.filePeriodIndex) { - case 0: { - timePeriodMarketArray.push(timePeriod) - break - } - case 1: { - timePeriodDailyArray.push(timePeriod) - break - } - } - - let simulationParams = { - beginDatetime: dateAtScreenCorner.valueOf(), - resumeExecution: false, - timePeriodDailyArray: timePeriodDailyArray, - timePeriodMarketArray: timePeriodMarketArray, - timestamp: (new Date()).valueOf() - } try { thisObject.status = 'Saving' - let result = await canvas.strategySpace.strategizerGateway.saveToStrategyzer(simulationParams) + let result = await canvas.strategySpace.strategizerGateway.saveToStrategyzer(getSimulationParams()) if (result === true) { if (window.canvasApp.executingAt === 'Local') { + if (idleLabel === 'RESTART LIVE TRADING') { + callServer('', 'ResetLogsAndData', onSaved) + function onSaved (err) { + if (err.result === GLOBAL.DEFAULT_OK_RESPONSE.result) { + logger.write('[INFO] Restart Simulation -> Logs and Simulation data Deleted.') + } else { + logger.write('[ERROR] Restart Simulation -> Can not delete Logs and Simulation data. err = ' + err.messsage) + } + } + } callServer('', 'RestartCloneExecutor', onSaved) function onSaved (err) { if (err.result === GLOBAL.DEFAULT_OK_RESPONSE.result) { @@ -141,7 +125,7 @@ function newRestartSimulation () { } function turnOffProductCards () { - let productCardsToTurnOff = ['Trading-Simulation', 'Simulation-Conditions', 'Simulation-Strategies', 'Simulation-Trades'] + let productCardsToTurnOff = ['Trading-Simulation', 'Simulation-Conditions', 'Simulation-Strategies', 'Simulation-Trades', 'Live Trading History'] for (let i = 0; i < canvas.panelsSpace.panels.length; i++) { let panel = canvas.panelsSpace.panels[i] if (panel.name === 'Products Panel') { @@ -165,6 +149,8 @@ function newRestartSimulation () { } function physics () { + labelPhysics() + if (counterTillNextState > 0) { counterTillNextState-- @@ -209,6 +195,26 @@ function newRestartSimulation () { executionFocusPhysics() } + function labelPhysics () { + idleLabel = 'RESTART SIMULATION' + if (canvas.strategySpace.workspace.definition) { + let definition = canvas.strategySpace.workspace.definition + if (definition.personalData) { + if (definition.personalData.exchangeAccounts) { + if (definition.personalData.exchangeAccounts.length > 0) { + let exchangeAccount = definition.personalData.exchangeAccounts[0] + if (exchangeAccount.keys) { + if (exchangeAccount.keys.length > 0) { + let key = exchangeAccount.keys[0] + idleLabel = 'RESTART LIVE TRADING' + } + } + } + } + } + } + } + function executionFocusPhysics () { if (canvas.strategySpace.workspace.definition !== undefined) { executionFocusExists = true @@ -289,7 +295,7 @@ function newRestartSimulation () { switch (thisObject.status) { case 'Ready': - label = 'RESTART BOTS' + label = idleLabel break case 'Saving': label = 'SAVING STRATEGIES CHANGES...' diff --git a/FloatingSpace/StrategyPartConstructor.js b/FloatingSpace/StrategyPartConstructor.js index 6c13dd5ce..0ea5e295b 100644 --- a/FloatingSpace/StrategyPartConstructor.js +++ b/FloatingSpace/StrategyPartConstructor.js @@ -124,8 +124,8 @@ function newStrategyPartConstructor () { currentStatus: true, label: undefined, visible: false, - iconPathOn: 'menu-mobility-unfreeze', - iconPathOff: 'menu-mobility-freeze', + iconPathOn: 'menu-mobility-freeze', + iconPathOff: 'menu-mobility-unfreeze', rawRadius: 8, targetRadius: 0, currentRadius: 0, diff --git a/StrategySpace/Workspace/Workspace.js b/StrategySpace/Workspace/Workspace.js index d850e3093..c7840da06 100644 --- a/StrategySpace/Workspace/Workspace.js +++ b/StrategySpace/Workspace/Workspace.js @@ -171,7 +171,7 @@ function newWorkspace () { break case 'Save Trading System': { - let result = await canvas.strategySpace.strategizerGateway.saveToStrategyzer() + let result = await canvas.strategySpace.strategizerGateway.saveToStrategyzer(getSimulationParams()) return result break } diff --git a/Utilities.js b/Utilities.js index a72310054..17f0dba24 100644 --- a/Utilities.js +++ b/Utilities.js @@ -1,4 +1,37 @@ +function getSimulationParams () { + let dateAtScreenCorner = new Date(window.localStorage.getItem('Date @ Screen Corner')) + let currentTimePeriod = JSON.parse(window.localStorage.getItem('Current Time Period')) + + let timePeriodsMasterArray = [marketFilesPeriods, dailyFilePeriods] + let timePeriodArray = timePeriodsMasterArray[currentTimePeriod.filePeriodIndex] + let timePeriod = timePeriodArray[currentTimePeriod.timePeriodIndex][1] + + let timePeriodDailyArray = [] + let timePeriodMarketArray = [] + + switch (currentTimePeriod.filePeriodIndex) { + case 0: { + timePeriodMarketArray.push(timePeriod) + break + } + case 1: { + timePeriodDailyArray.push(timePeriod) + break + } + } + + let simulationParams = { + beginDatetime: dateAtScreenCorner.valueOf(), + resumeExecution: false, + timePeriodDailyArray: timePeriodDailyArray, + timePeriodMarketArray: timePeriodMarketArray, + timestamp: (new Date()).valueOf() + } + + return simulationParams +} + function transformThisPoint (point, container) { /* We make the point relative to the current frame */