From d2615078db2b467383251561c1cbde15f95ef8d8 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Thu, 24 Jun 2021 12:10:58 +0200 Subject: [PATCH] Status and Values rearranged --- .../User-Profiles/Luis-Fernando-Molina.json | 32 +++++++++---------- .../Schemas/App-Schema/tokens-awarded.json | 2 +- .../Schemas/App-Schema/voting-program.json | 15 --------- .../UI/Function-Libraries/ClaimsProgram.js | 4 +-- .../UI/Function-Libraries/VotingProgram.js | 9 ------ .../Governance/UI/Utilities/BonusProgram.js | 2 +- .../UI/Utilities/DecendentProgram.js | 8 ++--- 7 files changed, 24 insertions(+), 48 deletions(-) diff --git a/Projects/Governance/Plugins/User-Profiles/Luis-Fernando-Molina.json b/Projects/Governance/Plugins/User-Profiles/Luis-Fernando-Molina.json index a57924a08..8bbad4855 100644 --- a/Projects/Governance/Plugins/User-Profiles/Luis-Fernando-Molina.json +++ b/Projects/Governance/Plugins/User-Profiles/Luis-Fernando-Molina.json @@ -400,12 +400,12 @@ "id": "edf1a5c9-7802-4856-918c-3cd5a7a9caf7", "savedPayload": { "position": { - "x": 30541.44352053292, - "y": 24401.82684154666 + "x": 30298.31782969946, + "y": 24540.985747266444 }, "targetPosition": { - "x": 30335.75245832439, - "y": 24183.443721943684 + "x": 30214.18961290766, + "y": 24253.023174803577 }, "floatingObject": { "isPinned": false, @@ -427,8 +427,8 @@ "id": "ebad23ed-1a02-4edf-a9d7-fc4b2fd0dacb", "savedPayload": { "position": { - "x": 30335.75245832439, - "y": 24183.443721943684 + "x": 30214.18961290766, + "y": 24253.023174803577 }, "targetPosition": { "x": 30130.06139611586, @@ -438,7 +438,7 @@ "isPinned": false, "isFrozen": false, "isCollapsed": false, - "angleToParent": 2, + "angleToParent": 3, "distanceToParent": 3, "arrangementStyle": 0 }, @@ -462,8 +462,8 @@ "id": "e745f3cd-4cd9-421b-b9ab-f62650fb56f8", "savedPayload": { "position": { - "x": 30168.106583981345, - "y": 24262.63843027868 + "x": 30121.086756265042, + "y": 24264.92633202576 }, "targetPosition": { "x": 30130.06139611586, @@ -473,7 +473,7 @@ "isPinned": false, "isFrozen": false, "isCollapsed": false, - "angleToParent": 2, + "angleToParent": 3, "distanceToParent": 3, "arrangementStyle": 0 }, @@ -497,8 +497,8 @@ "id": "3ae7f0f9-be37-4e6c-b3b1-4343e51f80a9", "savedPayload": { "position": { - "x": 29985.928740982057, - "y": 24228.16852263974 + "x": 30028.862399901012, + "y": 24247.47654233898 }, "targetPosition": { "x": 30130.06139611586, @@ -508,7 +508,7 @@ "isPinned": false, "isFrozen": false, "isCollapsed": false, - "angleToParent": 2, + "angleToParent": 3, "distanceToParent": 3, "arrangementStyle": 0 }, @@ -532,8 +532,8 @@ "id": "d8ab7844-f98f-4ce1-a634-c0ff98af28ca", "savedPayload": { "position": { - "x": 29858.804673355116, - "y": 24093.20033215587 + "x": 29946.544106381356, + "y": 24202.381912737612 }, "targetPosition": { "x": 30130.06139611586, @@ -543,7 +543,7 @@ "isPinned": false, "isFrozen": false, "isCollapsed": false, - "angleToParent": 2, + "angleToParent": 3, "distanceToParent": 3, "arrangementStyle": 0 }, diff --git a/Projects/Governance/Schemas/App-Schema/tokens-awarded.json b/Projects/Governance/Schemas/App-Schema/tokens-awarded.json index cf14e5af3..997aa3a30 100644 --- a/Projects/Governance/Schemas/App-Schema/tokens-awarded.json +++ b/Projects/Governance/Schemas/App-Schema/tokens-awarded.json @@ -15,7 +15,7 @@ "addLeftIcons": true, "level": 2, "attachingRules": { - "compatibleTypes": "->Referral Program->Mentorship Program->Support Program->Voting Program->Claims Program->Staking Program->" + "compatibleTypes": "->Referral Program->Mentorship Program->Support Program->Claims Program->Staking Program->" }, "propertyNameAtParent": "tokensAwarded" } \ No newline at end of file diff --git a/Projects/Governance/Schemas/App-Schema/voting-program.json b/Projects/Governance/Schemas/App-Schema/voting-program.json index 1c5ed21b6..b69362ff9 100644 --- a/Projects/Governance/Schemas/App-Schema/voting-program.json +++ b/Projects/Governance/Schemas/App-Schema/voting-program.json @@ -15,15 +15,6 @@ "label": "Add Votes Switch", "relatedUiObject": "Votes Switch" }, - { - "action": "Add UI Object", - "actionProject": "Foundations", - "disableIfPropertyIsDefined": true, - "propertyToCheckFor": "tokensAwarded", - "actionFunction": "payload.executeAction", - "label": "Add Tokens Awarded", - "relatedUiObject": "Tokens Awarded" - }, { "action": "Add UI Object", "actionProject": "Foundations", @@ -63,12 +54,6 @@ "childType": "Votes Switch", "autoAdd": false }, - { - "name": "tokensAwarded", - "type": "node", - "childType": "Tokens Awarded", - "autoAdd": true - }, { "name": "tokensBonus", "type": "node", diff --git a/Projects/Governance/UI/Function-Libraries/ClaimsProgram.js b/Projects/Governance/UI/Function-Libraries/ClaimsProgram.js index 15bb18e23..885b00eef 100644 --- a/Projects/Governance/UI/Function-Libraries/ClaimsProgram.js +++ b/Projects/Governance/UI/Function-Libraries/ClaimsProgram.js @@ -457,9 +457,9 @@ function newGovernanceFunctionLibraryClaimsProgram() { const tokensAwardedText = parseFloat(node.payload.claimsProgram.awarded.tokens.toFixed(2)).toLocaleString('en') node.tokensAwarded.payload.uiObject.valueAngleOffset = 0 - node.tokensAwarded.payload.uiObject.valueAtAngle = false + node.tokensAwarded.payload.uiObject.valueAtAngle = true node.tokensAwarded.payload.uiObject.statusAngleOffset = 0 - node.tokensAwarded.payload.uiObject.statusAtAngle = false + node.tokensAwarded.payload.uiObject.statusAtAngle = true node.tokensAwarded.payload.uiObject.setValue(tokensAwardedText + ' SA Tokens') node.tokensAwarded.payload.uiObject.setStatus('From ' + node.payload.claimsProgram.count + ' Claims.') diff --git a/Projects/Governance/UI/Function-Libraries/VotingProgram.js b/Projects/Governance/UI/Function-Libraries/VotingProgram.js index 6bc480f5a..9a23718e0 100644 --- a/Projects/Governance/UI/Function-Libraries/VotingProgram.js +++ b/Projects/Governance/UI/Function-Libraries/VotingProgram.js @@ -346,15 +346,6 @@ function newGovernanceFunctionLibraryVotingProgram() { node.payload.uiObject.setStatus(ownPowerText + ' Voting Power') } - if (node.tokensAwarded !== undefined && node.tokensAwarded.payload !== undefined) { - - const tokensAwardedText = parseFloat(node.payload.votingProgram.awarded.tokens.toFixed(2)).toLocaleString('en') - - node.tokensAwarded.payload.uiObject.valueAngleOffset = 0 - node.tokensAwarded.payload.uiObject.valueAtAngle = false - - node.tokensAwarded.payload.uiObject.setValue(tokensAwardedText + ' SA Tokens') - } } } } diff --git a/Projects/Governance/UI/Utilities/BonusProgram.js b/Projects/Governance/UI/Utilities/BonusProgram.js index 47bc18ed3..be737a778 100644 --- a/Projects/Governance/UI/Utilities/BonusProgram.js +++ b/Projects/Governance/UI/Utilities/BonusProgram.js @@ -136,7 +136,7 @@ function newFoundationsUtilitiesBonusProgram() { const tokensBonusText = parseFloat(node.payload[programPropertyName].bonus.tokens.toFixed(2)).toLocaleString('en') node.tokensBonus.payload.uiObject.valueAngleOffset = 0 - node.tokensBonus.payload.uiObject.valueAtAngle = false + node.tokensBonus.payload.uiObject.valueAtAngle = true node.tokensBonus.payload.uiObject.setValue(tokensBonusText + ' SA Tokens') } diff --git a/Projects/Governance/UI/Utilities/DecendentProgram.js b/Projects/Governance/UI/Utilities/DecendentProgram.js index da38b64ae..23aba5cee 100644 --- a/Projects/Governance/UI/Utilities/DecendentProgram.js +++ b/Projects/Governance/UI/Utilities/DecendentProgram.js @@ -329,7 +329,7 @@ function newFoundationsUtilitiesDecendentProgram() { node.payload.uiObject.setPercentage(percentage) node.payload.uiObject.statusAngleOffset = 0 - node.payload.uiObject.statusAtAngle = false + node.payload.uiObject.statusAtAngle = true node.payload.uiObject.setStatus(outgoingPowerText + ' ' + ' Outgoing Power') } @@ -344,16 +344,16 @@ function newFoundationsUtilitiesDecendentProgram() { node.payload.uiObject.statusAngleOffset = 0 node.payload.uiObject.statusAtAngle = false - node.payload.uiObject.setStatus(ownPowerText + ' Own ' + programPowerName + ' - ' + incomingPowerText + ' Incoming ' + programPowerName + '') + node.payload.uiObject.setStatus(ownPowerText + ' Own Power' + ' - ' + incomingPowerText + ' Incoming Power' + '') } if (node.tokensAwarded !== undefined && node.tokensAwarded.payload !== undefined) { const tokensAwardedText = parseFloat(node.payload[programPropertyName].awarded.tokens.toFixed(2)).toLocaleString('en') node.tokensAwarded.payload.uiObject.statusAngleOffset = 0 - node.tokensAwarded.payload.uiObject.statusAtAngle = false + node.tokensAwarded.payload.uiObject.statusAtAngle = true node.tokensAwarded.payload.uiObject.valueAngleOffset = 0 - node.tokensAwarded.payload.uiObject.valueAtAngle = false + node.tokensAwarded.payload.uiObject.valueAtAngle = true node.tokensAwarded.payload.uiObject.setValue(tokensAwardedText + ' SA Tokens') node.tokensAwarded.payload.uiObject.setStatus('From ' + node.payload[programPropertyName].count + ' Descendants.')