consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

uses proposal total_votes for % helper methods

Browse Source
This commit is contained in:
Juanjo Bazán
2015-12-18 13:15:00 +01:00
parent 3f195d6234
commit cf271fe33a
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers/proposals_helper.rb
View File

@@ -3,13 +3,13 @@ module ProposalsHelper
def progress_bar_percentage(proposal) def progress_bar_percentage(proposal)
case proposal.cached_votes_up case proposal.cached_votes_up
when 0 then 0 when 0 then 0
when 1..Proposal.votes_needed_for_success then (proposal.cached_votes_up.to_f * 100 / Proposal.votes_needed_for_success).floor when 1..Proposal.votes_needed_for_success then (proposal.total_votes.to_f * 100 / Proposal.votes_needed_for_success).floor
else 100 else 100
end end
end end
def supports_percentage(proposal) def supports_percentage(proposal)
percentage = (proposal.cached_votes_up.to_f * 100 / Proposal.votes_needed_for_success) percentage = (proposal.total_votes.to_f * 100 / Proposal.votes_needed_for_success)
case percentage case percentage
when 0 then "0%" when 0 then "0%"
when 0..(0.1) then "0.1%" when 0..(0.1) then "0.1%"

10
spec/helpers/proposals_helper_spec.rb
View File

@@ -13,6 +13,11 @@ describe ProposalsHelper do
expect(progress_bar_percentage(proposal)).to eq 50 expect(progress_bar_percentage(proposal)).to eq 50
end end
it "should take into account the physical votes" do
proposal = create(:proposal, cached_votes_up: ((Proposal.votes_needed_for_success/2)-100), physical_votes: 100)
expect(progress_bar_percentage(proposal)).to eq 50
end
it "should be 100 if there are more votes than needed" do it "should be 100 if there are more votes than needed" do
proposal = create(:proposal, cached_votes_up: Proposal.votes_needed_for_success*2) proposal = create(:proposal, cached_votes_up: Proposal.votes_needed_for_success*2)
expect(progress_bar_percentage(proposal)).to eq 100 expect(progress_bar_percentage(proposal)).to eq 100
@@ -39,6 +44,11 @@ describe ProposalsHelper do
proposal = create(:proposal, cached_votes_up: Proposal.votes_needed_for_success*2) proposal = create(:proposal, cached_votes_up: Proposal.votes_needed_for_success*2)
expect(supports_percentage(proposal)).to eq "100%" expect(supports_percentage(proposal)).to eq "100%"
end end
it "should take into account the physical votes" do
proposal = create(:proposal, physical_votes: Proposal.votes_needed_for_success/2)
expect(supports_percentage(proposal)).to eq "50%"
end
end end
end end