diff --git a/app/controllers/admin/poll/booth_assignments_controller.rb b/app/controllers/admin/poll/booth_assignments_controller.rb
index 06eb233bd..8ffa455c8 100644
--- a/app/controllers/admin/poll/booth_assignments_controller.rb
+++ b/app/controllers/admin/poll/booth_assignments_controller.rb
@@ -15,7 +15,7 @@ class Admin::Poll::BoothAssignmentsController < Admin::Poll::BaseController
end
def show
- @booth_assignment = @poll.booth_assignments.includes(:total_results, :voters,
+ @booth_assignment = @poll.booth_assignments.includes(:recounts, :voters,
officer_assignments: [officer: [:user]]).find(params[:id])
@voters_by_date = @booth_assignment.voters.group_by {|v| v.created_at.to_date}
end
diff --git a/app/controllers/admin/poll/officer_assignments_controller.rb b/app/controllers/admin/poll/officer_assignments_controller.rb
index 7fa120aa6..fd62df8b3 100644
--- a/app/controllers/admin/poll/officer_assignments_controller.rb
+++ b/app/controllers/admin/poll/officer_assignments_controller.rb
@@ -18,7 +18,7 @@ class Admin::Poll::OfficerAssignmentsController < Admin::Poll::BaseController
@officer = ::Poll::Officer.includes(:user).find(officer_assignment_params[:officer_id])
@officer_assignments = ::Poll::OfficerAssignment.
joins(:booth_assignment).
- includes(:total_results, booth_assignment: :booth).
+ includes(:recounts, booth_assignment: :booth).
where("officer_id = ? AND poll_booth_assignments.poll_id = ?", @officer.id, @poll.id).
order(:date)
end
diff --git a/app/controllers/admin/poll/recounts_controller.rb b/app/controllers/admin/poll/recounts_controller.rb
index 6d4a9a442..32c533eec 100644
--- a/app/controllers/admin/poll/recounts_controller.rb
+++ b/app/controllers/admin/poll/recounts_controller.rb
@@ -3,7 +3,7 @@ class Admin::Poll::RecountsController < Admin::Poll::BaseController
def index
@booth_assignments = @poll.booth_assignments.
- includes(:booth, :total_results, :voters).
+ includes(:booth, :recounts, :voters).
order("poll_booths.name").
page(params[:page]).per(50)
end
diff --git a/app/controllers/officing/results_controller.rb b/app/controllers/officing/results_controller.rb
index 3ad7a91ea..f517f081a 100644
--- a/app/controllers/officing/results_controller.rb
+++ b/app/controllers/officing/results_controller.rb
@@ -26,9 +26,7 @@ class Officing::ResultsController < Officing::BaseController
@partial_results = ::Poll::PartialResult.includes(:question).
where(booth_assignment_id: index_params[:booth_assignment_id]).
where(date: index_params[:date])
- @whites = ::Poll::WhiteResult.where(booth_assignment_id: @booth_assignment.id, date: index_params[:date]).sum(:amount)
- @nulls = ::Poll::NullResult.where(booth_assignment_id: @booth_assignment.id, date: index_params[:date]).sum(:amount)
- @total = ::Poll::TotalResult.where(booth_assignment_id: @booth_assignment.id, date: index_params[:date]).sum(:amount)
+ @recounts = ::Poll::Recount.where(booth_assignment_id: @booth_assignment.id, date: index_params[:date])
end
end
@@ -52,14 +50,14 @@ class Officing::ResultsController < Officing::BaseController
go_back_to_new if question.blank?
results.each_pair do |answer_index, count|
- next unless count.present?
+ next if count.blank?
answer = question.valid_answers[answer_index.to_i]
go_back_to_new if question.blank?
partial_result = ::Poll::PartialResult.find_or_initialize_by(booth_assignment_id: @officer_assignment.booth_assignment_id,
- date: results_params[:date],
- question_id: question_id,
- answer: answer)
+ date: results_params[:date],
+ question_id: question_id,
+ answer: answer)
partial_result.officer_assignment_id = @officer_assignment.id
partial_result.amount = count.to_i
partial_result.author = current_user
@@ -68,45 +66,21 @@ class Officing::ResultsController < Officing::BaseController
end
end
- build_white_results
- build_null_results
- build_total_results
+ build_recounts
end
- def build_white_results
- if results_params[:whites].present?
- white_result = ::Poll::WhiteResult.find_or_initialize_by(booth_assignment_id: @officer_assignment.booth_assignment_id,
- date: results_params[:date])
- white_result.officer_assignment_id = @officer_assignment.id
- white_result.amount = results_params[:whites].to_i
- white_result.author = current_user
- white_result.origin = 'booth'
- @results << white_result
- end
- end
-
- def build_null_results
- if results_params[:nulls].present?
- null_result = ::Poll::NullResult.find_or_initialize_by(booth_assignment_id: @officer_assignment.booth_assignment_id,
- date: results_params[:date])
- null_result.officer_assignment_id = @officer_assignment.id
- null_result.amount = results_params[:nulls].to_i
- null_result.author = current_user
- null_result.origin = 'booth'
- @results << null_result
- end
- end
-
- def build_total_results
- if results_params[:total].present?
- total_result = ::Poll::TotalResult.find_or_initialize_by(booth_assignment_id: @officer_assignment.booth_assignment_id,
- date: results_params[:date])
- total_result.officer_assignment_id = @officer_assignment.id
- total_result.amount = results_params[:total].to_i
- total_result.author = current_user
- total_result.origin = 'booth'
- @results << total_result
+ def build_recounts
+ recount = ::Poll::Recount.find_or_initialize_by(booth_assignment_id: @officer_assignment.booth_assignment_id,
+ date: results_params[:date])
+ recount.officer_assignment_id = @officer_assignment.id
+ recount.author = current_user
+ recount.origin = 'booth'
+ [:whites, :nulls, :total].each do |recount_type|
+ if results_params[recount_type].present?
+ recount["#{recount_type.to_s.singularize}_amount"] = results_params[recount_type].to_i
+ end
end
+ @results << recount
end
def go_back_to_new(alert = nil)
diff --git a/app/helpers/poll_recounts_helper.rb b/app/helpers/poll_recounts_helper.rb
index 716b71d85..45eefd696 100644
--- a/app/helpers/poll_recounts_helper.rb
+++ b/app/helpers/poll_recounts_helper.rb
@@ -1,7 +1,7 @@
module PollRecountsHelper
def total_recounts_by_booth(booth_assignment)
- booth_assignment.total_results.any? ? booth_assignment.total_results.to_a.sum(&:amount) : nil
+ booth_assignment.recounts.any? ? booth_assignment.recounts.to_a.sum(&:total_amount) : nil
end
end
diff --git a/app/models/poll.rb b/app/models/poll.rb
index 24ffa3a06..091c7fbb4 100644
--- a/app/models/poll.rb
+++ b/app/models/poll.rb
@@ -2,9 +2,7 @@ class Poll < ActiveRecord::Base
has_many :booth_assignments, class_name: "Poll::BoothAssignment"
has_many :booths, through: :booth_assignments
has_many :partial_results, through: :booth_assignments
- has_many :white_results, through: :booth_assignments
- has_many :null_results, through: :booth_assignments
- has_many :total_results, through: :booth_assignments
+ has_many :recounts, through: :booth_assignments
has_many :voters
has_many :officer_assignments, through: :booth_assignments
has_many :officers, through: :officer_assignments
diff --git a/app/models/poll/booth_assignment.rb b/app/models/poll/booth_assignment.rb
index 8b4b655ef..8489c3cf0 100644
--- a/app/models/poll/booth_assignment.rb
+++ b/app/models/poll/booth_assignment.rb
@@ -7,8 +7,6 @@ class Poll
has_many :officers, through: :officer_assignments
has_many :voters
has_many :partial_results
- has_many :white_results
- has_many :null_results
- has_many :total_results
+ has_many :recounts
end
end
diff --git a/app/models/poll/officer_assignment.rb b/app/models/poll/officer_assignment.rb
index 8e86d309c..9fcf02890 100644
--- a/app/models/poll/officer_assignment.rb
+++ b/app/models/poll/officer_assignment.rb
@@ -3,9 +3,7 @@ class Poll
belongs_to :officer
belongs_to :booth_assignment
has_many :partial_results
- has_many :white_results
- has_many :null_results
- has_many :total_results
+ has_many :recounts
has_many :voters
validates :officer_id, presence: true
diff --git a/app/views/admin/poll/officer_assignments/by_officer.html.erb b/app/views/admin/poll/officer_assignments/by_officer.html.erb
index 6ea421e2d..cefe161d9 100644
--- a/app/views/admin/poll/officer_assignments/by_officer.html.erb
+++ b/app/views/admin/poll/officer_assignments/by_officer.html.erb
@@ -43,8 +43,8 @@
| <%= l(officer_assignment.date.to_date) %> |
<%= booth_name_with_location(officer_assignment.booth_assignment.booth) %> |
- <% if officer_assignment.total_results.any? %>
- <%= officer_assignment.total_results.to_a.sum(&:amount) %>
+ <% if officer_assignment.recounts.any? %>
+ <%= officer_assignment.recounts.to_a.sum(&:total_amount) %>
<% else %>
-
<% end %>
diff --git a/app/views/admin/poll/results/index.html.erb b/app/views/admin/poll/results/index.html.erb
index 64a93aa10..c65b3ead7 100644
--- a/app/views/admin/poll/results/index.html.erb
+++ b/app/views/admin/poll/results/index.html.erb
@@ -18,9 +18,9 @@
|
- | <%= @poll.white_results.sum(:amount) %> |
- <%= @poll.null_results.sum(:amount) %> |
- <%= @poll.total_results.sum(:amount) %> |
+ <%= @poll.recounts.sum(:white_amount) %> |
+ <%= @poll.recounts.sum(:null_amount) %> |
+ <%= @poll.recounts.sum(:total_amount) %> |
diff --git a/app/views/officing/results/index.html.erb b/app/views/officing/results/index.html.erb
index 3b14e3c97..924d7fc13 100644
--- a/app/views/officing/results/index.html.erb
+++ b/app/views/officing/results/index.html.erb
@@ -21,9 +21,9 @@
- | <%= @whites %> |
- <%= @nulls %> |
- <%= @total %> |
+ <%= @recounts.sum(:white_amount) %> |
+ <%= @recounts.sum(:null_amount) %> |
+ <%= @recounts.sum(:total_amount) %> |
diff --git a/spec/features/admin/poll/polls_spec.rb b/spec/features/admin/poll/polls_spec.rb
index 6eb64f6e1..8d30dc5eb 100644
--- a/spec/features/admin/poll/polls_spec.rb
+++ b/spec/features/admin/poll/polls_spec.rb
@@ -249,18 +249,18 @@ feature 'Admin polls' do
booth_assignment_final_recounted = create(:poll_booth_assignment, poll: poll)
3.times do |i|
- create(:poll_total_result,
+ create(:poll_recount,
booth_assignment: booth_assignment,
date: poll.starts_at + i.days,
- amount: 21)
+ total_amount: 21)
end
2.times { create(:poll_voter, booth_assignment: booth_assignment_final_recounted) }
- create(:poll_total_result,
+ create(:poll_recount,
booth_assignment: booth_assignment_final_recounted,
date: poll.ends_at,
- amount: 55555)
+ total_amount: 55555)
visit admin_poll_path(poll)
@@ -318,12 +318,10 @@ feature 'Admin polls' do
answer: 'Tomorrow',
amount: 5)
end
- create(:poll_white_result,
+ create(:poll_recount,
booth_assignment: booth_assignment_1,
- amount: 21)
- create(:poll_null_result,
- booth_assignment: booth_assignment_3,
- amount: 44)
+ white_amount: 21,
+ null_amount: 44)
visit admin_poll_path(poll)
diff --git a/spec/features/officing/results_spec.rb b/spec/features/officing/results_spec.rb
index 835903ab9..f7e1ad8ef 100644
--- a/spec/features/officing/results_spec.rb
+++ b/spec/features/officing/results_spec.rb
@@ -127,21 +127,13 @@ feature 'Officing Results' do
date: @poll.ends_at,
question: @question_1,
amount: 33)
- white_result = create(:poll_white_result,
+ poll_recount = create(:poll_recount,
officer_assignment: @officer_assignment,
booth_assignment: @officer_assignment.booth_assignment,
date: @poll.ends_at,
- amount: 21)
- null_result = create(:poll_null_result,
- officer_assignment: @officer_assignment,
- booth_assignment: @officer_assignment.booth_assignment,
- date: @poll.ends_at,
- amount: 44)
- total_result = create(:poll_total_result,
- officer_assignment: @officer_assignment,
- booth_assignment: @officer_assignment.booth_assignment,
- date: @poll.ends_at,
- amount: 66)
+ white_amount: 21,
+ null_amount: 44,
+ total_amount: 66)
visit officing_poll_results_path(@poll,
date: I18n.l(@poll.ends_at.to_date),