From b66e8cd41d6c0c51f8f588e4cd839b4a89a4b20b Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Mon, 13 May 2019 12:13:43 +0200 Subject: [PATCH] Temporary Labels can be parametrized now --- FloatingSpace/CircularMenu.js | 3 +++ FloatingSpace/CircularMenuItem.js | 16 +++++++++++++--- FloatingSpace/StrategyPart.js | 4 +++- StrategySpace/TradingSystem.js | 1 - 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/FloatingSpace/CircularMenu.js b/FloatingSpace/CircularMenu.js index b623c7c34..97edde860 100644 --- a/FloatingSpace/CircularMenu.js +++ b/FloatingSpace/CircularMenu.js @@ -53,6 +53,9 @@ function newCircularMenu () { menuItem.action = menuItemInitialValue.action menuItem.actionFunction = menuItemInitialValue.actionFunction menuItem.label = menuItemInitialValue.label + menuItem.workingLabel = menuItemInitialValue.workingLabel + menuItem.workDoneLabel = menuItemInitialValue.workDoneLabel + menuItem.workFailedLabel = menuItemInitialValue.workFailedLabel menuItem.visible = menuItemInitialValue.visible menuItem.imagePathOn = menuItemInitialValue.imagePathOn menuItem.imagePathOff = menuItemInitialValue.imagePathOff diff --git a/FloatingSpace/CircularMenuItem.js b/FloatingSpace/CircularMenuItem.js index 8c21ac556..4aef13239 100644 --- a/FloatingSpace/CircularMenuItem.js +++ b/FloatingSpace/CircularMenuItem.js @@ -9,6 +9,9 @@ function newCircularMenuItem () { action: undefined, actionFunction: undefined, label: undefined, + workingLabel: undefined, + workDoneLabel: undefined, + workFailedLabel: undefined, visible: false, imagePathOn: undefined, imagePathOff: undefined, @@ -133,13 +136,20 @@ function newCircularMenuItem () { async function onMouseClick (event) { if (temporaryStatus === 0) { - setTemporaryStatus('Saving...', UI_COLOR.GREY, 500) + if (thisObject.workingLabel !== undefined) { + setTemporaryStatus(thisObject.workingLabel, UI_COLOR.GREY, 500) + } + let result = await thisObject.actionFunction(thisObject.payload, thisObject.action) if (result === true) { - setTemporaryStatus('Saved', UI_COLOR.PATINATED_TURQUOISE, 250) + if (thisObject.workDoneLabel !== undefined) { + setTemporaryStatus(thisObject.workDoneLabel, UI_COLOR.PATINATED_TURQUOISE, 250) + } } else { - setTemporaryStatus('Not Saved', UI_COLOR.TITANIUM_YELLOW, 500) + if (thisObject.workFailedLabel != undefined) { + setTemporaryStatus(thisObject.workFailedLabel, UI_COLOR.TITANIUM_YELLOW, 500) + } } } } diff --git a/FloatingSpace/StrategyPart.js b/FloatingSpace/StrategyPart.js index 41cd9e751..6417fb09e 100644 --- a/FloatingSpace/StrategyPart.js +++ b/FloatingSpace/StrategyPart.js @@ -91,6 +91,9 @@ function newStrategyPart () { action: 'Save Trading System', actionFunction: thisObject.payload.onMenuItemClick, label: 'Save Changes', + workingLabel: 'Saving...', + workDoneLabel: 'Saved', + workFailedLabel: 'Not Saved', visible: false, imagePathOn: 'Images/icons/style-01/upload.png', imagePathOff: 'Images/icons/style-01/target.png', @@ -654,4 +657,3 @@ function newStrategyPart () { } } } - diff --git a/StrategySpace/TradingSystem.js b/StrategySpace/TradingSystem.js index e4d3f6775..9cd76e864 100644 --- a/StrategySpace/TradingSystem.js +++ b/StrategySpace/TradingSystem.js @@ -254,7 +254,6 @@ function newTradingSystem () { } case 'Open Settings': - break case 'Delete Strategy':