diff --git a/Projects/Foundations/Icons/close-stage-pm-event.png b/Projects/Foundations/Icons/close-stage-pm-event.png deleted file mode 100644 index 278950703..000000000 Binary files a/Projects/Foundations/Icons/close-stage-pm-event.png and /dev/null differ diff --git a/Projects/Foundations/Icons/create-order-pm-event.png b/Projects/Foundations/Icons/create-order-pm-event.png deleted file mode 100644 index 278950703..000000000 Binary files a/Projects/Foundations/Icons/create-order-pm-event.png and /dev/null differ diff --git a/Projects/Foundations/Icons/managed-stop-loss-pm-formula.png b/Projects/Foundations/Icons/managed-stop-loss-pm-formula.png deleted file mode 100644 index 278950703..000000000 Binary files a/Projects/Foundations/Icons/managed-stop-loss-pm-formula.png and /dev/null differ diff --git a/Projects/Foundations/Icons/managed-take-profit-pm-formula.png b/Projects/Foundations/Icons/managed-take-profit-pm-formula.png deleted file mode 100644 index 278950703..000000000 Binary files a/Projects/Foundations/Icons/managed-take-profit-pm-formula.png and /dev/null differ diff --git a/Projects/Foundations/Icons/move-to-phase-pm-event.png b/Projects/Foundations/Icons/move-to-phase-pm-event.png deleted file mode 100644 index 278950703..000000000 Binary files a/Projects/Foundations/Icons/move-to-phase-pm-event.png and /dev/null differ diff --git a/Projects/Foundations/Icons/next-phase-pm-event.png b/Projects/Foundations/Icons/next-phase-pm-event.png deleted file mode 100644 index 278950703..000000000 Binary files a/Projects/Foundations/Icons/next-phase-pm-event.png and /dev/null differ diff --git a/Projects/Foundations/Icons/order-rate-pm-formula.png b/Projects/Foundations/Icons/order-rate-pm-formula.png deleted file mode 100644 index 278950703..000000000 Binary files a/Projects/Foundations/Icons/order-rate-pm-formula.png and /dev/null differ diff --git a/Projects/Foundations/Icons/take-position-pm-event.png b/Projects/Foundations/Icons/take-position-pm-event.png deleted file mode 100644 index 278950703..000000000 Binary files a/Projects/Foundations/Icons/take-position-pm-event.png and /dev/null differ diff --git a/Projects/Foundations/Icons/target-rate-pm-formula.png b/Projects/Foundations/Icons/target-rate-pm-formula.png deleted file mode 100644 index 278950703..000000000 Binary files a/Projects/Foundations/Icons/target-rate-pm-formula.png and /dev/null differ diff --git a/Projects/Foundations/Icons/target-size-in-base-asset-pm-formula.png b/Projects/Foundations/Icons/target-size-in-base-asset-pm-formula.png deleted file mode 100644 index 278950703..000000000 Binary files a/Projects/Foundations/Icons/target-size-in-base-asset-pm-formula.png and /dev/null differ diff --git a/Projects/Foundations/Icons/target-size-in-quoted-asset-pm-formula.png b/Projects/Foundations/Icons/target-size-in-quoted-asset-pm-formula.png deleted file mode 100644 index 278950703..000000000 Binary files a/Projects/Foundations/Icons/target-size-in-quoted-asset-pm-formula.png and /dev/null differ diff --git a/Projects/Foundations/Icons/trigger-off-pm-event.png b/Projects/Foundations/Icons/trigger-off-pm-event.png deleted file mode 100644 index 278950703..000000000 Binary files a/Projects/Foundations/Icons/trigger-off-pm-event.png and /dev/null differ diff --git a/Projects/Foundations/Icons/trigger-on-pm-event.png b/Projects/Foundations/Icons/trigger-on-pm-event.png deleted file mode 100644 index 278950703..000000000 Binary files a/Projects/Foundations/Icons/trigger-on-pm-event.png and /dev/null differ diff --git a/Projects/Foundations/Schemas/App-Schema/cancel-order-event.json b/Projects/Foundations/Schemas/App-Schema/cancel-order-event.json index b94b4ad3d..4c885fcf8 100644 --- a/Projects/Foundations/Schemas/App-Schema/cancel-order-event.json +++ b/Projects/Foundations/Schemas/App-Schema/cancel-order-event.json @@ -11,10 +11,10 @@ }, { "action": "Add UI Object", - "label": "Add Cancel Order Portfolio Event", + "label": "Add Portfolio Event", "disableIfPropertyIsDefined": true, - "propertyToCheckFor": "cancelOrderPMEvent", - "relatedUiObject": "Cancel Order PM Event", + "propertyToCheckFor": "askPortfolioEventsManager", + "relatedUiObject": "Ask Portfolio Events Manager", "actionFunction": "payload.executeAction", "relatedUiObjectProject": "Foundations", "actionProject": "Visual-Scripting" @@ -51,9 +51,9 @@ "autoAdd": true }, { - "name": "cancelOrderPMEvent", + "name": "askPortfolioEventsManager", "type": "node", - "childType": "Cancel Order PM Event" + "childType": "Ask Portfolio Events Manager" }, { "name": "announcements", diff --git a/Projects/Foundations/Schemas/App-Schema/cancel-order-pm-event.json b/Projects/Foundations/Schemas/App-Schema/cancel-order-pm-event.json deleted file mode 100644 index 667138691..000000000 --- a/Projects/Foundations/Schemas/App-Schema/cancel-order-pm-event.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "Cancel Order PM Event", - "menuItems": [ - { - "action": "Delete UI Object", - "actionProject": "Visual-Scripting", - "askConfirmation": true, - "confirmationLabel": "Confirm to Delete", - "label": "Delete", - "iconPathOn": "delete-entity", - "iconPathOff": "delete-entity", - "actionFunction": "payload.executeAction" - } - ], - "addLeftIcons": true, - "initialValues": { - "config": "{}" - }, - "editors": { - "config": true - }, - "level": 4, - "attachingRules": { - "compatibleTypes": "->Cancel Order Event->" - }, - "childrenNodesProperties": [ - ], - "propertyNameAtParent": "cancelOrderPMEvent" -} \ No newline at end of file diff --git a/Projects/Foundations/Schemas/App-Schema/close-stage-event.json b/Projects/Foundations/Schemas/App-Schema/close-stage-event.json index b43c74d28..6339603c9 100644 --- a/Projects/Foundations/Schemas/App-Schema/close-stage-event.json +++ b/Projects/Foundations/Schemas/App-Schema/close-stage-event.json @@ -11,10 +11,10 @@ }, { "action": "Add UI Object", - "label": "Add Close Stage Portfolio Event", + "label": "Add Portfolio Event", "disableIfPropertyIsDefined": true, - "propertyToCheckFor": "closeStagePMEvent", - "relatedUiObject": "Close Stage PM Event", + "propertyToCheckFor": "askPortfolioEventsManager", + "relatedUiObject": "Ask Portfolio Events Manager", "actionFunction": "payload.executeAction", "relatedUiObjectProject": "Foundations", "actionProject": "Visual-Scripting" @@ -51,9 +51,9 @@ "autoAdd": true }, { - "name": "closeStagePMEvent", + "name": "askPortfolioEventsManager", "type": "node", - "childType": "Close Stage PM Event" + "childType": "Ask Portfolio Events Manager" }, { "name": "announcements", diff --git a/Projects/Foundations/Schemas/App-Schema/close-stage-pm-event.json b/Projects/Foundations/Schemas/App-Schema/close-stage-pm-event.json deleted file mode 100644 index 881836fb7..000000000 --- a/Projects/Foundations/Schemas/App-Schema/close-stage-pm-event.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "Close Stage PM Event", - "menuItems": [ - { - "action": "Delete UI Object", - "actionProject": "Visual-Scripting", - "askConfirmation": true, - "confirmationLabel": "Confirm to Delete", - "label": "Delete", - "iconPathOn": "delete-entity", - "iconPathOff": "delete-entity", - "actionFunction": "payload.executeAction" - } - ], - "addLeftIcons": true, - "initialValues": { - "config": "{}" - }, - "editors": { - "config": true - }, - "level": 2, - "attachingRules": { - "compatibleTypes": "->Close Stage Event->" - }, - "childrenNodesProperties": [ - ], - "propertyNameAtParent": "closeStagePMEvent" -} \ No newline at end of file diff --git a/Projects/Foundations/Schemas/App-Schema/create-order-event.json b/Projects/Foundations/Schemas/App-Schema/create-order-event.json index 12e682b0e..de8902dba 100644 --- a/Projects/Foundations/Schemas/App-Schema/create-order-event.json +++ b/Projects/Foundations/Schemas/App-Schema/create-order-event.json @@ -11,10 +11,10 @@ }, { "action": "Add UI Object", - "label": "Add Create Order Portfolio Event", + "label": "Add Portfolio Event", "disableIfPropertyIsDefined": true, - "propertyToCheckFor": "createOrderPMEvent", - "relatedUiObject": "Create Order PM Event", + "propertyToCheckFor": "askPortfolioEventsManager", + "relatedUiObject": "Ask Portfolio Events Manager", "actionFunction": "payload.executeAction", "relatedUiObjectProject": "Foundations", "actionProject": "Visual-Scripting" @@ -51,9 +51,9 @@ "autoAdd": true }, { - "name": "createOrderPMEvent", + "name": "askPortfolioEventsManager", "type": "node", - "childType": "Create Order PM Event" + "childType": "Ask Portfolio Events Manager" }, { "name": "announcements", diff --git a/Projects/Foundations/Schemas/App-Schema/create-order-pm-event.json b/Projects/Foundations/Schemas/App-Schema/create-order-pm-event.json deleted file mode 100644 index 3bddd9388..000000000 --- a/Projects/Foundations/Schemas/App-Schema/create-order-pm-event.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "Create Order PM Event", - "menuItems": [ - { - "action": "Delete UI Object", - "actionProject": "Visual-Scripting", - "askConfirmation": true, - "confirmationLabel": "Confirm to Delete", - "label": "Delete", - "iconPathOn": "delete-entity", - "iconPathOff": "delete-entity", - "actionFunction": "payload.executeAction" - } - ], - "addLeftIcons": true, - "initialValues": { - "config": "{}" - }, - "editors": { - "config": true - }, - "level": 2, - "attachingRules": { - "compatibleTypes": "->Create Order Event->" - }, - "childrenNodesProperties": [ - ], - "propertyNameAtParent": "createOrderPMEvent" -} \ No newline at end of file diff --git a/Projects/Foundations/Schemas/App-Schema/formula.json b/Projects/Foundations/Schemas/App-Schema/formula.json index 96b0521c4..1c8f55ce6 100644 --- a/Projects/Foundations/Schemas/App-Schema/formula.json +++ b/Projects/Foundations/Schemas/App-Schema/formula.json @@ -29,7 +29,7 @@ }, "level": 4, "attachingRules": { - "compatibleTypes": "->Target Size In Base Asset->Target Size In Quoted Asset->Target Rate->Phase->Simulated Actual Rate->Situation->Indicator Function->Order Rate->Social Bot Command->" + "compatibleTypes": "->Target Size In Base Asset->Target Size In Quoted Asset->Target Rate->Phase->Simulated Actual Rate->Situation->Indicator Function->Order Rate->Social Bot Command->Ask Portfolio Formula Manager->" }, "propertyNameAtParent": "formula" } \ No newline at end of file diff --git a/Projects/Foundations/Schemas/App-Schema/managed-stop-loss-pm-formula.json b/Projects/Foundations/Schemas/App-Schema/managed-stop-loss-pm-formula.json deleted file mode 100644 index 8fdc0a8c3..000000000 --- a/Projects/Foundations/Schemas/App-Schema/managed-stop-loss-pm-formula.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "Managed Stop Loss PM Formula", - "menuItems": [ - { - "action": "Delete UI Object", - "actionProject": "Visual-Scripting", - "askConfirmation": true, - "confirmationLabel": "Confirm to Delete", - "label": "Delete", - "iconPathOn": "delete-entity", - "iconPathOff": "delete-entity", - "actionFunction": "payload.executeAction" - } - ], - "addLeftIcons": true, - "initialValues": { - "config": "{}" - }, - "editors": { - "config": true - }, - "level": 4, - "attachingRules": { - "compatibleTypes": "->Managed Stop Loss->" - }, - "childrenNodesProperties": [ - ], - "propertyNameAtParent": "managedStopLossPMFormula" -} \ No newline at end of file diff --git a/Projects/Foundations/Schemas/App-Schema/managed-stop-loss.json b/Projects/Foundations/Schemas/App-Schema/managed-stop-loss.json index 85f84e10d..64175ae43 100644 --- a/Projects/Foundations/Schemas/App-Schema/managed-stop-loss.json +++ b/Projects/Foundations/Schemas/App-Schema/managed-stop-loss.json @@ -11,10 +11,10 @@ }, { "action": "Add UI Object", - "label": "Add Manged SL Portfolio Formula", + "label": "Add Portfolio Formula", "disableIfPropertyIsDefined": true, - "propertyToCheckFor": "managedStopLossPMFormula", - "relatedUiObject": "Managed Stop Loss PM Formula", + "propertyToCheckFor": "askPortfolioFormulaManager", + "relatedUiObject": "Ask Portfolio Formula Manager", "actionFunction": "payload.executeAction", "relatedUiObjectProject": "Foundations", "actionProject": "Visual-Scripting" @@ -43,9 +43,9 @@ "autoAdd": true }, { - "name": "managedStopLossPMFormula", + "name": "askPortfolioFormulaManager", "type": "node", - "childType": "Managed Stop Loss PM Formula" + "childType": "Ask Portfolio Formula Manager" } ], "propertyNameAtParent": "managedStopLoss" diff --git a/Projects/Foundations/Schemas/App-Schema/managed-take-profit-pm-formula.json b/Projects/Foundations/Schemas/App-Schema/managed-take-profit-pm-formula.json deleted file mode 100644 index 876496877..000000000 --- a/Projects/Foundations/Schemas/App-Schema/managed-take-profit-pm-formula.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "Managed Take Profit PM Formula", - "menuItems": [ - { - "action": "Delete UI Object", - "actionProject": "Visual-Scripting", - "askConfirmation": true, - "confirmationLabel": "Confirm to Delete", - "label": "Delete", - "iconPathOn": "delete-entity", - "iconPathOff": "delete-entity", - "actionFunction": "payload.executeAction" - } - ], - "addLeftIcons": true, - "initialValues": { - "config": "{}" - }, - "editors": { - "config": true - }, - "level": 4, - "attachingRules": { - "compatibleTypes": "->Managed Take Profit->" - }, - "childrenNodesProperties": [ - ], - "propertyNameAtParent": "managedTakeProfitPMFormula" -} \ No newline at end of file diff --git a/Projects/Foundations/Schemas/App-Schema/managed-take-profit.json b/Projects/Foundations/Schemas/App-Schema/managed-take-profit.json index 2f23d8154..ad4aa2c3a 100644 --- a/Projects/Foundations/Schemas/App-Schema/managed-take-profit.json +++ b/Projects/Foundations/Schemas/App-Schema/managed-take-profit.json @@ -11,10 +11,10 @@ }, { "action": "Add UI Object", - "label": "Add Manged TP Portfolio Formula", + "label": "Add Portfolio Formula", "disableIfPropertyIsDefined": true, - "propertyToCheckFor": "managedTakeProfitPMFormula", - "relatedUiObject": "Managed Take Profit PM Formula", + "propertyToCheckFor": "askPortfolioFormulaManager", + "relatedUiObject": "Ask Portfolio Formula Manager", "actionFunction": "payload.executeAction", "relatedUiObjectProject": "Foundations", "actionProject": "Visual-Scripting" @@ -43,9 +43,9 @@ "autoAdd": true }, { - "name": "managedTakeProfitPMFormula", + "name": "askPortfolioFormulaManager", "type": "node", - "childType": "Managed Take Profit PM Formula" + "childType": "Ask Portfolio Formula Manager" } ], "propertyNameAtParent": "managedTakeProfit" diff --git a/Projects/Foundations/Schemas/App-Schema/move-to-phase-event.json b/Projects/Foundations/Schemas/App-Schema/move-to-phase-event.json index 751b79b41..18526ad6f 100644 --- a/Projects/Foundations/Schemas/App-Schema/move-to-phase-event.json +++ b/Projects/Foundations/Schemas/App-Schema/move-to-phase-event.json @@ -11,10 +11,10 @@ }, { "action": "Add UI Object", - "label": "Add Move Phase Portfolio Event", + "label": "Add Portfolio Event", "disableIfPropertyIsDefined": true, - "propertyToCheckFor": "moveToPhasePMEvent", - "relatedUiObject": "Move To Phase PM Event", + "propertyToCheckFor": "askPortfolioEventsManager", + "relatedUiObject": "Ask Portfolio Events Manager", "actionFunction": "payload.executeAction", "relatedUiObjectProject": "Foundations", "actionProject": "Visual-Scripting" @@ -54,9 +54,9 @@ "autoAdd": true }, { - "name": "moveToPhasePMEvent", + "name": "askPortfolioEventsManager", "type": "node", - "childType": "Move To Phase PM Event" + "childType": "Ask Portfolio Events Manager" }, { "name": "announcements", diff --git a/Projects/Foundations/Schemas/App-Schema/move-to-phase-pm-event.json b/Projects/Foundations/Schemas/App-Schema/move-to-phase-pm-event.json deleted file mode 100644 index dd5f847b9..000000000 --- a/Projects/Foundations/Schemas/App-Schema/move-to-phase-pm-event.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "Move To Phase PM Event", - "menuItems": [ - { - "action": "Delete UI Object", - "actionProject": "Visual-Scripting", - "askConfirmation": true, - "confirmationLabel": "Confirm to Delete", - "label": "Delete", - "iconPathOn": "delete-entity", - "iconPathOff": "delete-entity", - "actionFunction": "payload.executeAction" - } - ], - "addLeftIcons": true, - "initialValues": { - "config": "{}" - }, - "editors": { - "config": true - }, - "level": 4, - "attachingRules": { - "compatibleTypes": "->Move To Phase Event->" - }, - "childrenNodesProperties": [ - ], - "propertyNameAtParent": "moveToPhasePMEvent" -} \ No newline at end of file diff --git a/Projects/Foundations/Schemas/App-Schema/next-phase-event.json b/Projects/Foundations/Schemas/App-Schema/next-phase-event.json index 86528a31c..92aecdf37 100644 --- a/Projects/Foundations/Schemas/App-Schema/next-phase-event.json +++ b/Projects/Foundations/Schemas/App-Schema/next-phase-event.json @@ -11,10 +11,10 @@ }, { "action": "Add UI Object", - "label": "Add Next Phase Portfolio Event", + "label": "Add Portfolio Event", "disableIfPropertyIsDefined": true, - "propertyToCheckFor": "nextPhasePMEvent", - "relatedUiObject": "Next Phase PM Event", + "propertyToCheckFor": "askPortfolioEventsManager", + "relatedUiObject": "Ask Portfolio Events Manager", "actionFunction": "payload.executeAction", "relatedUiObjectProject": "Foundations", "actionProject": "Visual-Scripting" @@ -51,9 +51,9 @@ "autoAdd": true }, { - "name": "nextPhasePMEvent", + "name": "askPortfolioEventsManager", "type": "node", - "childType": "Next Phase PM Event" + "childType": "Ask Portfolio Events Manager" }, { "name": "announcements", diff --git a/Projects/Foundations/Schemas/App-Schema/next-phase-pm-event.json b/Projects/Foundations/Schemas/App-Schema/next-phase-pm-event.json deleted file mode 100644 index a63674412..000000000 --- a/Projects/Foundations/Schemas/App-Schema/next-phase-pm-event.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "Next Phase PM Event", - "menuItems": [ - { - "action": "Delete UI Object", - "actionProject": "Visual-Scripting", - "askConfirmation": true, - "confirmationLabel": "Confirm to Delete", - "label": "Delete", - "iconPathOn": "delete-entity", - "iconPathOff": "delete-entity", - "actionFunction": "payload.executeAction" - } - ], - "addLeftIcons": true, - "initialValues": { - "config": "{}" - }, - "editors": { - "config": true - }, - "level": 4, - "attachingRules": { - "compatibleTypes": "->Next Phase Event->" - }, - "childrenNodesProperties": [ - ], - "propertyNameAtParent": "nextPhasePMEvent" -} \ No newline at end of file diff --git a/Projects/Foundations/Schemas/App-Schema/order-rate-pm-formula.json b/Projects/Foundations/Schemas/App-Schema/order-rate-pm-formula.json deleted file mode 100644 index 8e3ca04b7..000000000 --- a/Projects/Foundations/Schemas/App-Schema/order-rate-pm-formula.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "Order Rate PM Formula", - "menuItems": [ - { - "action": "Delete UI Object", - "actionProject": "Visual-Scripting", - "askConfirmation": true, - "confirmationLabel": "Confirm to Delete", - "label": "Delete", - "iconPathOn": "delete-entity", - "iconPathOff": "delete-entity", - "actionFunction": "payload.executeAction" - } - ], - "addLeftIcons": true, - "initialValues": { - "config": "{}" - }, - "editors": { - "config": true - }, - "level": 4, - "attachingRules": { - "compatibleTypes": "->Order Rate->" - }, - "childrenNodesProperties": [ - ], - "propertyNameAtParent": "orderRatePMFormula" -} \ No newline at end of file diff --git a/Projects/Foundations/Schemas/App-Schema/order-rate.json b/Projects/Foundations/Schemas/App-Schema/order-rate.json index fd6ec309b..4b44a5936 100644 --- a/Projects/Foundations/Schemas/App-Schema/order-rate.json +++ b/Projects/Foundations/Schemas/App-Schema/order-rate.json @@ -13,10 +13,10 @@ }, { "action": "Add UI Object", - "label": "Add Order Rate Portfolio Formula", + "label": "Add Portfolio Formula", "disableIfPropertyIsDefined": true, - "propertyToCheckFor": "orderRatePMFormula", - "relatedUiObject": "Order Rate PM Formula", + "propertyToCheckFor": "askPortfolioFormulaManager", + "relatedUiObject": "Ask Portfolio Formula Manager", "actionFunction": "payload.executeAction", "relatedUiObjectProject": "Foundations", "actionProject": "Visual-Scripting" @@ -45,9 +45,9 @@ "autoAdd": true }, { - "name": "orderRatePMFormula", + "name": "askPortfolioFormulaManager", "type": "node", - "childType": "Order Rate PM Formula" + "childType": "Ask Portfolio Formula Manager" } ], "propertyNameAtParent": "orderRate" diff --git a/Projects/Foundations/Schemas/App-Schema/take-position-event.json b/Projects/Foundations/Schemas/App-Schema/take-position-event.json index c37f494fa..99a67bc17 100644 --- a/Projects/Foundations/Schemas/App-Schema/take-position-event.json +++ b/Projects/Foundations/Schemas/App-Schema/take-position-event.json @@ -11,10 +11,10 @@ }, { "action": "Add UI Object", - "label": "Add Take Position Portfolio Event", + "label": "Add Portfolio Event", "disableIfPropertyIsDefined": true, - "propertyToCheckFor": "takePositionPMEvent", - "relatedUiObject": "Take Position PM Event", + "propertyToCheckFor": "askPortfolioEventsManager", + "relatedUiObject": "Ask Portfolio Events Manager", "actionFunction": "payload.executeAction", "relatedUiObjectProject": "Foundations", "actionProject": "Visual-Scripting" @@ -46,7 +46,7 @@ "label": "Add Incoming Signals", "relatedUiObject": "Incoming Signals", "relatedUiObjectProject": "Trading-Signals" - }, + }, { "action": "Delete UI Object", "actionProject": "Visual-Scripting", @@ -71,9 +71,9 @@ "autoAdd": true }, { - "name": "takePositionPMEvent", + "name": "askPortfolioEventsManager", "type": "node", - "childType": "Take Position PM Event" + "childType": "Ask Portfolio Events Manager" }, { "name": "announcements", diff --git a/Projects/Foundations/Schemas/App-Schema/take-position-pm-event.json b/Projects/Foundations/Schemas/App-Schema/take-position-pm-event.json deleted file mode 100644 index 25c110eeb..000000000 --- a/Projects/Foundations/Schemas/App-Schema/take-position-pm-event.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "Take Position PM Event", - "menuItems": [ - { - "action": "Delete UI Object", - "actionProject": "Visual-Scripting", - "askConfirmation": true, - "confirmationLabel": "Confirm to Delete", - "label": "Delete", - "iconPathOn": "delete-entity", - "iconPathOff": "delete-entity", - "actionFunction": "payload.executeAction" - } - ], - "addLeftIcons": true, - "initialValues": { - "config": "{}" - }, - "editors": { - "config": true - }, - "level": 2, - "attachingRules": { - "compatibleTypes": "->Take Position Event->" - }, - "childrenNodesProperties": [ - ], - "propertyNameAtParent": "takePositionPMEvent" -} \ No newline at end of file diff --git a/Projects/Foundations/Schemas/App-Schema/target-rate-pm-formula.json b/Projects/Foundations/Schemas/App-Schema/target-rate-pm-formula.json deleted file mode 100644 index f6bc4fd75..000000000 --- a/Projects/Foundations/Schemas/App-Schema/target-rate-pm-formula.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "Target Rate PM Formula", - "menuItems": [ - { - "action": "Delete UI Object", - "actionProject": "Visual-Scripting", - "askConfirmation": true, - "confirmationLabel": "Confirm to Delete", - "label": "Delete", - "iconPathOn": "delete-entity", - "iconPathOff": "delete-entity", - "actionFunction": "payload.executeAction" - } - ], - "addLeftIcons": true, - "initialValues": { - "config": "{}" - }, - "editors": { - "config": true - }, - "level": 4, - "attachingRules": { - "compatibleTypes": "->Target Rate->" - }, - "childrenNodesProperties": [ - ], - "propertyNameAtParent": "targetRatePMFormula" -} \ No newline at end of file diff --git a/Projects/Foundations/Schemas/App-Schema/target-rate.json b/Projects/Foundations/Schemas/App-Schema/target-rate.json index 20c4eeed6..1a3fd29af 100644 --- a/Projects/Foundations/Schemas/App-Schema/target-rate.json +++ b/Projects/Foundations/Schemas/App-Schema/target-rate.json @@ -13,10 +13,10 @@ }, { "action": "Add UI Object", - "label": "Add Target Rate Portfolio Formula", + "label": "Add Portfolio Formula", "disableIfPropertyIsDefined": true, - "propertyToCheckFor": "targetRatePMFormula", - "relatedUiObject": "Target Rate PM Formula", + "propertyToCheckFor": "askPortfolioFormulaManager", + "relatedUiObject": "Ask Portfolio Formula Manager", "actionFunction": "payload.executeAction", "relatedUiObjectProject": "Foundations", "actionProject": "Visual-Scripting" @@ -45,9 +45,9 @@ "autoAdd": true }, { - "name": "targetRatePMFormula", + "name": "askPortfolioFormulaManager", "type": "node", - "childType": "Target Rate PM Formula" + "childType": "Ask Portfolio Formula Manager" } ], "propertyNameAtParent": "targetRate" diff --git a/Projects/Foundations/Schemas/App-Schema/target-size-in-base-asset-pm-formula.json b/Projects/Foundations/Schemas/App-Schema/target-size-in-base-asset-pm-formula.json deleted file mode 100644 index 85cf1e49e..000000000 --- a/Projects/Foundations/Schemas/App-Schema/target-size-in-base-asset-pm-formula.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "Target Size In Base Asset PM Formula", - "menuItems": [ - { - "action": "Delete UI Object", - "actionProject": "Visual-Scripting", - "askConfirmation": true, - "confirmationLabel": "Confirm to Delete", - "label": "Delete", - "iconPathOn": "delete-entity", - "iconPathOff": "delete-entity", - "actionFunction": "payload.executeAction" - } - ], - "addLeftIcons": true, - "initialValues": { - "config": "{}" - }, - "editors": { - "config": true - }, - "level": 4, - "attachingRules": { - "compatibleTypes": "->Target Size In Base Asset->" - }, - "childrenNodesProperties": [ - ], - "propertyNameAtParent": "targetSizeInBaseAssetPMFormula" -} \ No newline at end of file diff --git a/Projects/Foundations/Schemas/App-Schema/target-size-in-base-asset.json b/Projects/Foundations/Schemas/App-Schema/target-size-in-base-asset.json index 43febaff7..2bfe0fbd4 100644 --- a/Projects/Foundations/Schemas/App-Schema/target-size-in-base-asset.json +++ b/Projects/Foundations/Schemas/App-Schema/target-size-in-base-asset.json @@ -13,10 +13,10 @@ }, { "action": "Add UI Object", - "label": "Add Target Base Size Portfolio Formula", + "label": "Add Portfolio Formula", "disableIfPropertyIsDefined": true, - "propertyToCheckFor": "targetSizeInBaseAssetPMFormula", - "relatedUiObject": "Target Size In Base Asset PM Formula", + "propertyToCheckFor": "askPortfolioFormulaManager", + "relatedUiObject": "Ask Portfolio Formula Manager", "actionFunction": "payload.executeAction", "relatedUiObjectProject": "Foundations", "actionProject": "Visual-Scripting" @@ -45,9 +45,9 @@ "autoAdd": true }, { - "name": "targetSizeInBaseAssetPMFormula", + "name": "askPortfolioFormulaManager", "type": "node", - "childType": "Target Size In Base Asset PM Formula" + "childType": "Ask Portfolio Formula Manager" } ], "propertyNameAtParent": "targetSizeInBaseAsset" diff --git a/Projects/Foundations/Schemas/App-Schema/target-size-in-quoted-asset-pm-formula.json b/Projects/Foundations/Schemas/App-Schema/target-size-in-quoted-asset-pm-formula.json deleted file mode 100644 index 36c943848..000000000 --- a/Projects/Foundations/Schemas/App-Schema/target-size-in-quoted-asset-pm-formula.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "Target Size In Quoted Asset PM Formula", - "menuItems": [ - { - "action": "Delete UI Object", - "actionProject": "Visual-Scripting", - "askConfirmation": true, - "confirmationLabel": "Confirm to Delete", - "label": "Delete", - "iconPathOn": "delete-entity", - "iconPathOff": "delete-entity", - "actionFunction": "payload.executeAction" - } - ], - "addLeftIcons": true, - "initialValues": { - "config": "{}" - }, - "editors": { - "config": true - }, - "level": 4, - "attachingRules": { - "compatibleTypes": "->Target Size In Quoted Asset->" - }, - "childrenNodesProperties": [ - ], - "propertyNameAtParent": "targetSizeInQuotedAssetPMFormula" -} \ No newline at end of file diff --git a/Projects/Foundations/Schemas/App-Schema/target-size-in-quoted-asset.json b/Projects/Foundations/Schemas/App-Schema/target-size-in-quoted-asset.json index 284e0c4f4..fc3add331 100644 --- a/Projects/Foundations/Schemas/App-Schema/target-size-in-quoted-asset.json +++ b/Projects/Foundations/Schemas/App-Schema/target-size-in-quoted-asset.json @@ -13,10 +13,10 @@ }, { "action": "Add UI Object", - "label": "Add Target Quoted Size Portfolio Formula", + "label": "Add Portfolio Formula", "disableIfPropertyIsDefined": true, - "propertyToCheckFor": "targetSizeInQuotedAssetPMFormula", - "relatedUiObject": "Target Size In Quoted Asset PM Formula", + "propertyToCheckFor": "askPortfolioFormulaManager", + "relatedUiObject": "Ask Portfolio Formula Manager", "actionFunction": "payload.executeAction", "relatedUiObjectProject": "Foundations", "actionProject": "Visual-Scripting" @@ -45,9 +45,9 @@ "autoAdd": true }, { - "name": "targetSizeInQuotedAssetPMFormula", + "name": "askPortfolioFormulaManager", "type": "node", - "childType": "Target Size In Quoted Asset PM Formula" + "childType": "Ask Portfolio Formula Manager" } ], "propertyNameAtParent": "targetSizeInQuotedAsset" diff --git a/Projects/Foundations/Schemas/App-Schema/trigger-off-event.json b/Projects/Foundations/Schemas/App-Schema/trigger-off-event.json index 51ec3d7fb..7e9bc3336 100644 --- a/Projects/Foundations/Schemas/App-Schema/trigger-off-event.json +++ b/Projects/Foundations/Schemas/App-Schema/trigger-off-event.json @@ -11,10 +11,10 @@ }, { "action": "Add UI Object", - "label": "Add Trigger Off Portfolio Event", + "label": "Add Portfolio Event", "disableIfPropertyIsDefined": true, - "propertyToCheckFor": "triggerOffPMEvent", - "relatedUiObject": "Trigger Off PM Event", + "propertyToCheckFor": "askPortfolioEventsManager", + "relatedUiObject": "Ask Portfolio Events Manager", "actionFunction": "payload.executeAction", "relatedUiObjectProject": "Foundations", "actionProject": "Visual-Scripting" @@ -46,7 +46,7 @@ "label": "Add Incoming Signals", "relatedUiObject": "Incoming Signals", "relatedUiObjectProject": "Trading-Signals" - }, + }, { "action": "Delete UI Object", "actionProject": "Visual-Scripting", @@ -71,9 +71,9 @@ "autoAdd": true }, { - "name": "triggerOffPMEvent", + "name": "askPortfolioEventsManager", "type": "node", - "childType": "Trigger Off PM Event" + "childType": "Ask Portfolio Events Manager" }, { "name": "announcements", diff --git a/Projects/Foundations/Schemas/App-Schema/trigger-off-pm-event.json b/Projects/Foundations/Schemas/App-Schema/trigger-off-pm-event.json deleted file mode 100644 index aa154aec5..000000000 --- a/Projects/Foundations/Schemas/App-Schema/trigger-off-pm-event.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "Trigger Off PM Event", - "menuItems": [ - { - "action": "Delete UI Object", - "actionProject": "Visual-Scripting", - "askConfirmation": true, - "confirmationLabel": "Confirm to Delete", - "label": "Delete", - "iconPathOn": "delete-entity", - "iconPathOff": "delete-entity", - "actionFunction": "payload.executeAction" - } - ], - "addLeftIcons": true, - "initialValues": { - "config": "{}" - }, - "editors": { - "config": true - }, - "level": 2, - "attachingRules": { - "compatibleTypes": "->Trigger Off Event->" - }, - "childrenNodesProperties": [ - ], - "propertyNameAtParent": "triggerOffPMEvent" -} \ No newline at end of file diff --git a/Projects/Foundations/Schemas/App-Schema/trigger-on-event.json b/Projects/Foundations/Schemas/App-Schema/trigger-on-event.json index 32463f8fe..79b9c85e2 100644 --- a/Projects/Foundations/Schemas/App-Schema/trigger-on-event.json +++ b/Projects/Foundations/Schemas/App-Schema/trigger-on-event.json @@ -11,10 +11,10 @@ }, { "action": "Add UI Object", - "label": "Add Trigger On Portfolio Event", + "label": "Add Portfolio Event", "disableIfPropertyIsDefined": true, - "propertyToCheckFor": "triggerOnPMEvent", - "relatedUiObject": "Trigger On PM Event", + "propertyToCheckFor": "askPortfolioEventsManager", + "relatedUiObject": "Ask Portfolio Events Manager", "actionFunction": "payload.executeAction", "relatedUiObjectProject": "Foundations", "actionProject": "Visual-Scripting" @@ -46,7 +46,7 @@ "label": "Add Incoming Signals", "relatedUiObject": "Incoming Signals", "relatedUiObjectProject": "Trading-Signals" - }, + }, { "action": "Delete UI Object", "actionProject": "Visual-Scripting", @@ -71,9 +71,9 @@ "autoAdd": true }, { - "name": "triggerOnPMEvent", + "name": "askPortfolioEventsManager", "type": "node", - "childType": "Trigger On PM Event" + "childType": "Ask Portfolio Events Manager" }, { "name": "announcements", diff --git a/Projects/Foundations/Schemas/App-Schema/trigger-on-pm-event.json b/Projects/Foundations/Schemas/App-Schema/trigger-on-pm-event.json deleted file mode 100644 index 946f49c52..000000000 --- a/Projects/Foundations/Schemas/App-Schema/trigger-on-pm-event.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "Trigger On PM Event", - "menuItems": [ - { - "action": "Delete UI Object", - "actionProject": "Visual-Scripting", - "askConfirmation": true, - "confirmationLabel": "Confirm to Delete", - "label": "Delete", - "iconPathOn": "delete-entity", - "iconPathOff": "delete-entity", - "actionFunction": "payload.executeAction" - } - ], - "addLeftIcons": true, - "initialValues": { - "config": "{}" - }, - "editors": { - "config": true - }, - "level": 2, - "attachingRules": { - "compatibleTypes": "->Trigger On Event->" - }, - "childrenNodesProperties": [ - ], - "propertyNameAtParent": "triggerOnPMEvent" -} \ No newline at end of file diff --git a/Projects/Portfolio-Management/Schemas/App-Schema/ask-portfolio-events-manager.json b/Projects/Portfolio-Management/Schemas/App-Schema/ask-portfolio-events-manager.json new file mode 100644 index 000000000..4ce42a8f1 --- /dev/null +++ b/Projects/Portfolio-Management/Schemas/App-Schema/ask-portfolio-events-manager.json @@ -0,0 +1,36 @@ +{ + "type": "Ask Portfolio Events Manager", + "menuItems": [ + { + "action": "Configure", + "actionFunction": "uiObject.configEditor.activate", + "label": "Configure", + "iconPathOn": "configuration", + "iconPathOff": "configuration" + }, + { + "action": "Delete UI Object", + "actionProject": "Visual-Scripting", + "askConfirmation": true, + "confirmationLabel": "Confirm to Delete", + "label": "Delete", + "iconPathOn": "delete-entity", + "iconPathOff": "delete-entity", + "actionFunction": "payload.executeAction" + } + ], + "addLeftIcons": true, + "initialValues": { + "config": "{ \n \"confirmEvent\": \"true|false\", \n \"raiseEvent\": \"true|false\" \n}" + }, + "editors": { + "config": true + }, + "level": 2, + "attachingRules": { + "compatibleTypes": "->Trigger On Event->Trigger Off Event->Take Position Event->Create Order Event->Cancel Order Event->Close Stage Event->Next Phase Event->Move To Phase Event->" + }, + "childrenNodesProperties": [ + ], + "propertyNameAtParent": "askPortfolioEventsManager" +} \ No newline at end of file diff --git a/Projects/Portfolio-Management/Schemas/App-Schema/ask-portfolio-formula-manager.json b/Projects/Portfolio-Management/Schemas/App-Schema/ask-portfolio-formula-manager.json new file mode 100644 index 000000000..cba935ba2 --- /dev/null +++ b/Projects/Portfolio-Management/Schemas/App-Schema/ask-portfolio-formula-manager.json @@ -0,0 +1,42 @@ +{ + "type": "Ask Portfolio Formula Manager", + "menuItems": [ + { + "action": "Configure", + "actionFunction": "uiObject.configEditor.activate", + "label": "Configure", + "iconPathOn": "configuration", + "iconPathOff": "configuration" + }, + { + "action": "Delete UI Object", + "actionProject": "Visual-Scripting", + "askConfirmation": true, + "confirmationLabel": "Confirm to Delete", + "label": "Delete", + "iconPathOn": "delete-entity", + "iconPathOff": "delete-entity", + "actionFunction": "payload.executeAction" + } + ], + "addLeftIcons": true, + "initialValues": { + "config": "{ \n \"confirmFormula\": \"true|false\", \n}" + }, + "editors": { + "config": true + }, + "level": 2, + "attachingRules": { + "compatibleTypes": "->Target Rate->Target Size In Base Asset->Target Size In Quoted Asset->Managed Stop Loss->Managed Take Profit->Order Rate->" + }, + "childrenNodesProperties": [ + { + "name": "formula", + "type": "node", + "childType": "Formula", + "autoAdd": true + } + ], + "propertyNameAtParent": "askPortfolioFormulaManager" +} \ No newline at end of file