diff --git a/app/controllers/admin/poll/recounts_controller.rb b/app/controllers/admin/poll/recounts_controller.rb index 32c533eec..a09e2af19 100644 --- a/app/controllers/admin/poll/recounts_controller.rb +++ b/app/controllers/admin/poll/recounts_controller.rb @@ -6,6 +6,10 @@ class Admin::Poll::RecountsController < Admin::Poll::BaseController 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/views/admin/poll/recounts/index.html.erb b/app/views/admin/poll/recounts/index.html.erb index ff4e7bceb..f55facfbd 100644 --- a/app/views/admin/poll/recounts/index.html.erb +++ b/app/views/admin/poll/recounts/index.html.erb @@ -9,6 +9,24 @@ <%= t("admin.recounts.index.no_recounts") %> <% else %> + + + + + + + + + + + + + + + + +
<%= t("admin.recounts.index.total_final") %><%= t("admin.recounts.index.total_system") %>
<%= t("admin.recounts.index.all_booths_total") %><%= @all_booths_counts[:final] %><%= @all_booths_counts[:system] %>
+ diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 94997331e..5b541991d 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -1049,6 +1049,9 @@ en: index: title: "Recounts" no_recounts: "There is nothing to be recounted" + all_booths_total: "Cumulative total from all booths:" + total_final: "Final recounts" + total_system: "Votes (automatic)" table_booth_name: "Booth" table_total_recount: "Total recount (by officer)" table_system_count: "Votes (automatic)" diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 81339ada9..a02030100 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -1048,6 +1048,9 @@ es: index: title: "Recuentos" no_recounts: "No hay nada de lo que hacer recuento" + all_booths_total: "Acumulado en todas las urnas:" + total_final: "Recuentos finales" + total_system: "Votos (automático)" table_booth_name: "Urna" table_total_recount: "Recuento total (presidente de mesa)" table_system_count: "Votos (automático)"
<%= t("admin.recounts.index.table_booth_name") %>