diff --git a/app/components/contributor-list/template.hbs b/app/components/contributor-list/template.hbs index ffe226c..64f997f 100644 --- a/app/components/contributor-list/template.hbs +++ b/app/components/contributor-list/template.hbs @@ -6,7 +6,7 @@ {{contributor.name}} - {{contributor.balance}} + {{contributor.totalKreditsEarned}} ₭S diff --git a/app/controllers/index.js b/app/controllers/index.js index 82e24e1..825a03d 100644 --- a/app/controllers/index.js +++ b/app/controllers/index.js @@ -9,9 +9,9 @@ export default Controller.extend({ contributors: alias('kredits.contributors'), contributorsWithKredits: filter('contributors', function(contributor) { - return contributor.get('balanceRaw').gt(0); + return contributor.get('totalKreditsEarnedRaw').gt(0); }), - contributorsSorting: Object.freeze(['balance:desc']), + contributorsSorting: Object.freeze(['totalKreditsEarned:desc']), contributorsSorted: sort('contributorsWithKredits', 'contributorsSorting'), contributions: alias('kredits.contributions'), diff --git a/app/models/contributor.js b/app/models/contributor.js index 6bf771e..223dd16 100644 --- a/app/models/contributor.js +++ b/app/models/contributor.js @@ -8,6 +8,8 @@ export default EmberObject.extend({ id: bignumber('idRaw', 'toString'), account: null, balance: kreditsValue('balanceRaw'), + totalKreditsEarned: bignumber('totalKreditsEarnedRaw', 'toNumber'), + contributionsCount: bignumber('contributionsCountRaw', 'toNumber'), isCore: false, ipfsHash: null, diff --git a/app/services/kredits.js b/app/services/kredits.js index 5e4f3fc..5e75cc1 100644 --- a/app/services/kredits.js +++ b/app/services/kredits.js @@ -116,6 +116,14 @@ export default Service.extend({ }) }), + totalKreditsEarned: computed(function() { + return this.kredits.Contribution.functions.totalKreditsEarned(true) + .then(total => { + return total.toNumber(); + }); + }), + + loadInitialData() { return this.getContributors() .then(contributors => this.contributors.pushObjects(contributors)) diff --git a/app/templates/index.hbs b/app/templates/index.hbs index 947b32f..a766066 100644 --- a/app/templates/index.hbs +++ b/app/templates/index.hbs @@ -9,7 +9,7 @@ {{contributor-list contributors=contributorsSorted}}

- {{await kredits.totalSupply}} kredits issued and distributed among + {{await kredits.totalKreditsEarned}} kredits issued and distributed among {{contributorsWithKredits.length}} contributors.

diff --git a/tests/unit/controllers/index-test.js b/tests/unit/controllers/index-test.js index cd5f8e4..ed4ca55 100644 --- a/tests/unit/controllers/index-test.js +++ b/tests/unit/controllers/index-test.js @@ -8,10 +8,10 @@ module('Unit | Controller | index', function(hooks) { let addFixtures = function(controller) { [ - { github_username: "neo", github_uid: "318", balance: 10000 }, - { github_username: "morpheus", github_uid: "843", balance: 15000 }, - { github_username: "trinity", github_uid: "123", balance: 5000 }, - { github_username: "mouse", github_uid: "696", balance: 0 } + { github_username: "neo", github_uid: "318", totalKreditsEarned: 10000 }, + { github_username: "morpheus", github_uid: "843", totalKreditsEarned: 15000 }, + { github_username: "trinity", github_uid: "123", totalKreditsEarned: 5000 }, + { github_username: "mouse", github_uid: "696", totalKreditsEarned: 0 } ].forEach(fixture => { controller.get('kredits.contributors').push(Contributor.create(fixture)); });