From a4ae7189b928f948260e56339799dd5d942fa156 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Mon, 26 Jul 2021 14:04:12 +0200 Subject: [PATCH 1/3] reports improved --- .../Governance/Plugins/Pools/Superalgos.json | 40 +++++++++---------- .../Governance/UI/Utilities/CommonTables.js | 16 +++++++- 2 files changed, 35 insertions(+), 21 deletions(-) diff --git a/Projects/Governance/Plugins/Pools/Superalgos.json b/Projects/Governance/Plugins/Pools/Superalgos.json index b6203208b..4123d4e83 100644 --- a/Projects/Governance/Plugins/Pools/Superalgos.json +++ b/Projects/Governance/Plugins/Pools/Superalgos.json @@ -1378,8 +1378,8 @@ "id": "018f1bfc-c56a-4c25-8624-5822809449a2", "savedPayload": { "position": { - "x": 25012.29870102263, - "y": 30092.871886898894 + "x": 25084.652987491874, + "y": 30062.901760147506 }, "targetPosition": { "x": 25162.29870102263, @@ -1389,7 +1389,7 @@ "isPinned": false, "isFrozen": false, "isCollapsed": false, - "angleToParent": 2, + "angleToParent": 3, "distanceToParent": 3, "arrangementStyle": 0 }, @@ -1408,8 +1408,8 @@ "id": "607b4bee-2d75-4842-a5de-1eacc7dc0150", "savedPayload": { "position": { - "x": 25312.29870102263, - "y": 30092.871886898894 + "x": 25239.94441455339, + "y": 30062.901760147506 }, "targetPosition": { "x": 25162.29870102263, @@ -1419,7 +1419,7 @@ "isPinned": false, "isFrozen": false, "isCollapsed": false, - "angleToParent": 2, + "angleToParent": 3, "distanceToParent": 3, "arrangementStyle": 0 }, @@ -1469,8 +1469,8 @@ "id": "668d3f18-41dd-4c13-b057-a7916316c19a", "savedPayload": { "position": { - "x": 25452.076448909353, - "y": 30150.769725791542 + "x": 25524.430735378595, + "y": 30180.73985254293 }, "targetPosition": { "x": 25374.430735378595, @@ -1480,7 +1480,7 @@ "isPinned": false, "isFrozen": false, "isCollapsed": false, - "angleToParent": 2, + "angleToParent": 3, "distanceToParent": 3, "arrangementStyle": 0 }, @@ -1499,8 +1499,8 @@ "id": "aa157869-196c-48a9-beef-439a859e3438", "savedPayload": { "position": { - "x": 25664.208483265316, - "y": 30362.901760147506 + "x": 25634.238356513928, + "y": 30290.547473678263 }, "targetPosition": { "x": 25374.430735378595, @@ -1510,7 +1510,7 @@ "isPinned": false, "isFrozen": false, "isCollapsed": false, - "angleToParent": 2, + "angleToParent": 3, "distanceToParent": 3, "arrangementStyle": 0 }, @@ -1560,8 +1560,8 @@ "id": "53e2bf54-b312-417a-9a32-ca6b21046a87", "savedPayload": { "position": { - "x": 25722.106322157964, - "y": 30502.679508034227 + "x": 25752.076448909353, + "y": 30575.03379450347 }, "targetPosition": { "x": 25462.29870102263, @@ -1571,7 +1571,7 @@ "isPinned": false, "isFrozen": false, "isCollapsed": false, - "angleToParent": 2, + "angleToParent": 3, "distanceToParent": 3, "arrangementStyle": 0 }, @@ -1590,8 +1590,8 @@ "id": "68658a7c-2f2e-4157-9897-0e07b5757e21", "savedPayload": { "position": { - "x": 25722.106322157964, - "y": 30802.679508034227 + "x": 25752.076448909353, + "y": 30730.325221564985 }, "targetPosition": { "x": 25462.29870102263, @@ -1601,7 +1601,7 @@ "isPinned": false, "isFrozen": false, "isCollapsed": false, - "angleToParent": 2, + "angleToParent": 3, "distanceToParent": 3, "arrangementStyle": 0 }, @@ -1649,7 +1649,7 @@ "floatingObject": { "isPinned": false, "isFrozen": false, - "isCollapsed": true, + "isCollapsed": false, "angleToParent": 1, "distanceToParent": 3, "arrangementStyle": 0 @@ -1674,7 +1674,7 @@ "floatingObject": { "isPinned": false, "isFrozen": false, - "isCollapsed": true, + "isCollapsed": false, "angleToParent": 1, "distanceToParent": 3, "arrangementStyle": 0 diff --git a/Projects/Governance/UI/Utilities/CommonTables.js b/Projects/Governance/UI/Utilities/CommonTables.js index 680cfffc9..6b2e45f7a 100644 --- a/Projects/Governance/UI/Utilities/CommonTables.js +++ b/Projects/Governance/UI/Utilities/CommonTables.js @@ -66,9 +66,23 @@ function newGovernanceUtilitiesCommonTables() { */ for (let j = 0; j < nodes.length; j++) { let node = nodes[j] + let name = '' + if (node.payload.parentNode !== undefined) { + if (node.payload.parentNode.payload.parentNode !== undefined) { + if (node.payload.parentNode.payload.parentNode.payload.parentNode !== undefined) { + if (node.payload.parentNode.payload.parentNode.payload.parentNode.payload.parentNode !== undefined) { + name = name + node.payload.parentNode.payload.parentNode.payload.parentNode.payload.parentNode.name + ' - ' + } + name = name + node.payload.parentNode.payload.parentNode.payload.parentNode.name + ' - ' + } + name = name + node.payload.parentNode.payload.parentNode.name + ' - ' + } + name = name + node.payload.parentNode.name + ' - ' + } + name = name + node.name let tableRecord = { - "name": node.payload.parentNode.name + ' - ' + node.name, + "name": name, "tokensReward": node.payload.tokens | 0, "weight": node.payload.weight, "weightPower": node.payload.votingProgram.votes From 7b2423972028cc784ddc6fecca9caa5d84247b71 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Tue, 27 Jul 2021 08:36:19 +0200 Subject: [PATCH 2/3] value and status with angle at pools --- Projects/Governance/UI/Function-Libraries/Tokens.js | 4 ++++ Projects/Governance/UI/Function-Libraries/VotingProgram.js | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/Projects/Governance/UI/Function-Libraries/Tokens.js b/Projects/Governance/UI/Function-Libraries/Tokens.js index 967ddc972..bed6f8103 100644 --- a/Projects/Governance/UI/Function-Libraries/Tokens.js +++ b/Projects/Governance/UI/Function-Libraries/Tokens.js @@ -175,6 +175,10 @@ function newGovernanceFunctionLibraryTokens() { } if (node.payload !== undefined) { + + node.payload.uiObject.statusAngleOffset = 0 + node.payload.uiObject.statusAtAngle = true + node.payload.uiObject.setStatus(status) } } diff --git a/Projects/Governance/UI/Function-Libraries/VotingProgram.js b/Projects/Governance/UI/Function-Libraries/VotingProgram.js index e602277ce..f7c0156e3 100644 --- a/Projects/Governance/UI/Function-Libraries/VotingProgram.js +++ b/Projects/Governance/UI/Function-Libraries/VotingProgram.js @@ -447,6 +447,10 @@ function newGovernanceFunctionLibraryVotingProgram() { } const votesText = parseFloat(votes.toFixed(0)).toLocaleString('en') + ' ' + voteType + + node.payload.uiObject.valueAngleOffset = 0 + node.payload.uiObject.valueAtAngle = true + node.payload.uiObject.setValue(votesText) if (percentage !== undefined) { From 2b69df26d0e43c2563c0748e0a73f4d7425f7189 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Tue, 27 Jul 2021 09:08:16 +0200 Subject: [PATCH 3/3] Governance Bonus Calculation Bug Fixed --- .../Plugins/User-Profiles/Luis-Fernando-Molina.json | 8 ++++---- .../Governance/UI/Function-Libraries/StakingProgram.js | 2 +- Projects/Governance/UI/Utilities/BonusProgram.js | 2 +- Projects/Governance/UI/Utilities/DecendentProgram.js | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Projects/Governance/Plugins/User-Profiles/Luis-Fernando-Molina.json b/Projects/Governance/Plugins/User-Profiles/Luis-Fernando-Molina.json index 8fb1956a7..563510637 100644 --- a/Projects/Governance/Plugins/User-Profiles/Luis-Fernando-Molina.json +++ b/Projects/Governance/Plugins/User-Profiles/Luis-Fernando-Molina.json @@ -239,7 +239,7 @@ "floatingObject": { "isPinned": false, "isFrozen": false, - "isCollapsed": true, + "isCollapsed": false, "angleToParent": 3, "distanceToParent": 3, "arrangementStyle": 0 @@ -4116,7 +4116,7 @@ "floatingObject": { "isPinned": false, "isFrozen": false, - "isCollapsed": false, + "isCollapsed": true, "angleToParent": 3, "distanceToParent": 3, "arrangementStyle": 0 @@ -4236,7 +4236,7 @@ { "type": "Token Power Switch", "name": "Delegation", - "config": "{}", + "config": "{\n \"percentage\": 20\n}", "project": "Governance", "tokenPowerSwitch": [], "delegationProgram": { @@ -4531,7 +4531,7 @@ "floatingObject": { "isPinned": false, "isFrozen": false, - "isCollapsed": true, + "isCollapsed": false, "angleToParent": 2, "distanceToParent": 3, "arrangementStyle": 0 diff --git a/Projects/Governance/UI/Function-Libraries/StakingProgram.js b/Projects/Governance/UI/Function-Libraries/StakingProgram.js index 61cbff8eb..0b065daf3 100644 --- a/Projects/Governance/UI/Function-Libraries/StakingProgram.js +++ b/Projects/Governance/UI/Function-Libraries/StakingProgram.js @@ -144,7 +144,7 @@ function newGovernanceFunctionLibraryStakingProgram() { programNode.payload.uiObject.setErrorMessage("Tokens Awarded Node is needed in order for this Program to get Tokens from the Program Pool.") return } - programNode.payload.stakingProgram.awarded.tokens = programNode.payload.stakingProgram.ownPower * totalPowerRewardRatio + programNode.payload.stakingProgram.awarded.tokens = programNode.payload.stakingProgram.ownPower / totalPowerRewardRatio drawProgram(programNode) } diff --git a/Projects/Governance/UI/Utilities/BonusProgram.js b/Projects/Governance/UI/Utilities/BonusProgram.js index b3398e830..5087f7b31 100644 --- a/Projects/Governance/UI/Utilities/BonusProgram.js +++ b/Projects/Governance/UI/Utilities/BonusProgram.js @@ -137,7 +137,7 @@ function newGovernanceUtilitiesBonusProgram() { programNode.payload.uiObject.setErrorMessage("Tokens Bonus Node is needed in order for this Program to get Tokens from the Bonus Program Pool.") return } - programNode.payload[programPropertyName].bonus.tokens = programNode.payload[programPropertyName].bonusPower * totalPowerRewardRatio + programNode.payload[programPropertyName].bonus.tokens = programNode.payload[programPropertyName].bonusPower / totalPowerRewardRatio drawProgram(programNode) } diff --git a/Projects/Governance/UI/Utilities/DecendentProgram.js b/Projects/Governance/UI/Utilities/DecendentProgram.js index 530816350..4378d2db6 100644 --- a/Projects/Governance/UI/Utilities/DecendentProgram.js +++ b/Projects/Governance/UI/Utilities/DecendentProgram.js @@ -373,7 +373,7 @@ function newGovernanceUtilitiesDecendentProgram() { programNode.payload.uiObject.setErrorMessage("Tokens Awarded Node is needed in order for this Program to get Tokens from the Program Pool.") return } - programNode.payload[programPropertyName].awarded.tokens = programNode.payload[programPropertyName].incomingPower * totalPowerRewardRatio + programNode.payload[programPropertyName].awarded.tokens = programNode.payload[programPropertyName].incomingPower / totalPowerRewardRatio drawProgram(programNode) }