diff --git a/app/controllers/admin/poll/recounts_controller.rb b/app/controllers/admin/poll/recounts_controller.rb index a09e2af19..7e1756894 100644 --- a/app/controllers/admin/poll/recounts_controller.rb +++ b/app/controllers/admin/poll/recounts_controller.rb @@ -2,14 +2,12 @@ class Admin::Poll::RecountsController < Admin::Poll::BaseController before_action :load_poll def index + @stats = Poll::Stats.new(@poll) + @booth_assignments = @poll.booth_assignments. includes(:booth, :recounts, :voters). order("poll_booths.name"). page(params[:page]).per(50) - @all_booths_counts = { - final: ::Poll::Recount.select(:total_amount).where(booth_assignment_id: @poll.booth_assignment_ids).sum(:total_amount), - system: ::Poll::Voter.where(booth_assignment_id: @poll.booth_assignment_ids).count - } end private diff --git a/app/models/poll/stats.rb b/app/models/poll/stats.rb index d7e0031da..4a3815dfd 100644 --- a/app/models/poll/stats.rb +++ b/app/models/poll/stats.rb @@ -93,6 +93,10 @@ class Poll::Stats super + total_unregistered_booth end + def total_registered_booth + voters.where(origin: "booth").count + end + private def participant_ids @@ -107,10 +111,6 @@ class Poll::Stats @recounts ||= poll.recounts end - def total_registered_booth - voters.where(origin: "booth").count - end - def total_unregistered_booth [total_participants_booth - total_registered_booth, 0].max end diff --git a/app/views/admin/poll/recounts/index.html.erb b/app/views/admin/poll/recounts/index.html.erb index 61cda4668..577316838 100644 --- a/app/views/admin/poll/recounts/index.html.erb +++ b/app/views/admin/poll/recounts/index.html.erb @@ -24,9 +24,9 @@