Include blank and null ballots in booth totals

Just the same way it's done for all polls.
This commit is contained in:
Javi Martín
2019-05-30 14:21:01 +02:00
parent 123196e4ed
commit 31515ddd45
2 changed files with 18 additions and 1 deletions

View File

@@ -1,7 +1,11 @@
module PollRecountsHelper
def total_recounts_by_booth(booth_assignment)
booth_assignment.recounts.any? ? booth_assignment.recounts.to_a.sum(&:total_amount) : nil
if booth_assignment.recounts.any?
booth_assignment.recounts.sum(:total_amount) +
booth_assignment.recounts.sum(:white_amount) +
booth_assignment.recounts.sum(:null_amount)
end
end
end

View File

@@ -0,0 +1,13 @@
require "rails_helper"
describe PollRecountsHelper do
describe "#total_recounts_by_booth" do
it "includes blank and null votes" do
assignment = create(:poll_booth_assignment)
create(:poll_recount, :from_booth, booth_assignment: assignment, total_amount: 3, white_amount: 1)
create(:poll_recount, :from_booth, booth_assignment: assignment, total_amount: 4, null_amount: 2)
expect(total_recounts_by_booth(assignment)).to eq 10
end
end
end