diff --git a/app/controllers/admin/poll/recounts_controller.rb b/app/controllers/admin/poll/recounts_controller.rb index fec546d79..57289a207 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::BaseController def index @booth_assignments = @poll.booth_assignments. - includes(:booth, :recounts, :final_recounts, :voters). + includes(:booth, :final_recounts, :voters). order("poll_booths.name"). page(params[:page]).per(50) end @@ -13,4 +13,4 @@ class Admin::Poll::RecountsController < Admin::BaseController def load_poll @poll = ::Poll.find(params[:poll_id]) end -end \ No newline at end of file +end diff --git a/app/views/admin/poll/recounts/index.html.erb b/app/views/admin/poll/recounts/index.html.erb index 98055f553..a4b0c6125 100644 --- a/app/views/admin/poll/recounts/index.html.erb +++ b/app/views/admin/poll/recounts/index.html.erb @@ -12,7 +12,6 @@ - @@ -27,13 +26,6 @@ <%= link_to booth_assignment.booth.name, admin_poll_booth_assignment_path(@poll, booth_assignment, anchor: 'tab-recounts') %> -
<%= t("admin.recounts.index.table_booth_name") %><%= t("admin.recounts.index.table_recounts") %> <%= t("admin.recounts.index.table_final_recount") %> <%= t("admin.recounts.index.table_system_count") %>
- <% if recount.present? %> - <%= recount %> - <% else %> - - - <% end %> - <% if final_recount.present? %> <%= final_recount %> @@ -55,4 +47,4 @@ <%= paginate @booth_assignments %> <% end %> - \ No newline at end of file + diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index ed9605e6c..685d6b517 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -595,7 +595,6 @@ en: title: "Recounts" no_recounts: "There is nothing to be recounted" table_booth_name: "Booth" - table_recounts: "Accumulated daily recounts (by officer)" table_final_recount: "Final recount (by officer)" table_system_count: "Votes (automatic)" results: diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 604df1048..ac1a6e116 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -595,7 +595,6 @@ es: title: "Recuentos" no_recounts: "No hay nada de lo que hacer recuento" table_booth_name: "Urna" - table_recounts: "Recuentos diarios acumulados (presidente de mesa)" table_final_recount: "Recuento final (presidente de mesa)" table_system_count: "Votos (automático)" results: diff --git a/spec/features/admin/poll/polls_spec.rb b/spec/features/admin/poll/polls_spec.rb index 4508e5bba..ee90d2ada 100644 --- a/spec/features/admin/poll/polls_spec.rb +++ b/spec/features/admin/poll/polls_spec.rb @@ -248,13 +248,6 @@ feature 'Admin polls' do booth_assignment_recounted = create(:poll_booth_assignment, poll: poll) booth_assignment_final_recounted = create(:poll_booth_assignment, poll: poll) - 3.times do |i| - create(:poll_recount, - booth_assignment: booth_assignment, - date: poll.starts_at + i.days, - count: 33) - end - 3.times do |i| create(:poll_final_recount, booth_assignment: booth_assignment, @@ -264,11 +257,6 @@ feature 'Admin polls' do 2.times { create(:poll_voter, booth_assignment: booth_assignment_final_recounted) } - create(:poll_recount, - booth_assignment: booth_assignment_recounted, - date: poll.ends_at, - count: 777) - create(:poll_final_recount, booth_assignment: booth_assignment_final_recounted, date: poll.ends_at, @@ -282,19 +270,16 @@ feature 'Admin polls' do within("#poll_booth_assignment_#{booth_assignment.id}_recounts") do expect(page).to have_content(booth_assignment.booth.name) - expect(page).to have_content('99') expect(page).to have_content('63') end within("#poll_booth_assignment_#{booth_assignment_recounted.id}_recounts") do expect(page).to have_content(booth_assignment_recounted.booth.name) - expect(page).to have_content('777') expect(page).to have_content('-') end within("#poll_booth_assignment_#{booth_assignment_final_recounted.id}_recounts") do expect(page).to have_content(booth_assignment_final_recounted.booth.name) - expect(page).to have_content('-') expect(page).to have_content('55555') expect(page).to have_content('2') end