diff --git a/app/views/admin/poll/booth_assignments/show.html.erb b/app/views/admin/poll/booth_assignments/show.html.erb
index b6917bca6..f01270bd4 100644
--- a/app/views/admin/poll/booth_assignments/show.html.erb
+++ b/app/views/admin/poll/booth_assignments/show.html.erb
@@ -45,25 +45,34 @@
<%= t("admin.poll_booth_assignments.show.recounts_list") %>
+
+
+
+
+ | <%= t("admin.poll_booth_assignments.show.count_final") %> |
+ <%= t("admin.poll_booth_assignments.show.total_system") %> |
+
+
+
+
+ | <%= total_recounts_by_booth(@booth_assignment) || '-' %> |
+ <%= @booth_assignment.voters.count %> |
+
+
+
+
| <%= t("admin.poll_booth_assignments.show.date") %> |
- <%= t("admin.poll_booth_assignments.show.total_recount") %> |
<%= t("admin.poll_booth_assignments.show.count_by_system") %> |
<% (@poll.starts_at.to_date..@poll.ends_at.to_date).each do |voting_date| %>
- <% total_recount = @booth_assignment.total_results.where(date: voting_date).first %>
<% system_count = @voters_by_date[voting_date].present? ? @voters_by_date[voting_date].size : 0 %>
| <%= l voting_date %> |
- <% if total_recount.present? %>
- <%= total_recount.amount %> |
- <% else %>
- - |
- <% end %>
<%= system_count %> |
<% end %>
diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml
index 8bbe1a5c8..f233579c9 100644
--- a/config/locales/en/admin.yml
+++ b/config/locales/en/admin.yml
@@ -532,8 +532,9 @@ en:
recounts: "Recounts"
recounts_list: "Recount list for this booth"
date: "Date"
- total_recount: "Total recount (by officer)"
+ count_final: "Final recount (by officer)"
count_by_system: "Votes (automatic)"
+ total_system: Total votes (automatic)
index:
booths_title: "List of booths"
no_booths: "There are no booths assigned to this poll."
diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml
index 93d2d6532..ec804132d 100644
--- a/config/locales/es/admin.yml
+++ b/config/locales/es/admin.yml
@@ -532,8 +532,9 @@ es:
recounts: "Recuentos"
recounts_list: "Lista de recuentos de esta urna"
date: "Fecha"
- total_recount: "Recuento total (presidente de mesa)"
+ count_final: "Recuento final (presidente de mesa)"
count_by_system: "Votos (automático)"
+ total_system: "Votos totales acumulados(automático)"
index:
booths_title: "Listado de urnas asignadas"
no_booths: "No hay urnas asignadas a esta votación."
diff --git a/spec/features/admin/poll/booth_assigments_spec.rb b/spec/features/admin/poll/booth_assigments_spec.rb
index 09a21dd72..77881efaa 100644
--- a/spec/features/admin/poll/booth_assigments_spec.rb
+++ b/spec/features/admin/poll/booth_assigments_spec.rb
@@ -97,11 +97,8 @@ feature 'Admin booths assignments' do
officer_assignment_2 = create(:poll_officer_assignment, booth_assignment: booth_assignment, date: poll.ends_at)
final_officer_assignment = create(:poll_officer_assignment, :final, booth_assignment: booth_assignment, date: poll.ends_at)
- total_recount = create(:poll_total_result,
- booth_assignment: booth_assignment,
- officer_assignment: final_officer_assignment,
- date: final_officer_assignment.date,
- amount: 5678)
+ create(:poll_voter, poll: poll, booth_assignment: booth_assignment, created_at: poll.starts_at.to_date)
+ create(:poll_voter, poll: poll, booth_assignment: booth_assignment, created_at: poll.ends_at.to_date)
booth_assignment_2 = create(:poll_booth_assignment, poll: poll)
@@ -111,9 +108,20 @@ feature 'Admin booths assignments' do
within('#assigned_booths_list') { click_link booth.name }
click_link 'Recounts'
+
+ within('#totals') do
+ within("#total_system") { expect(page).to have_content "2" }
+ end
+
within('#recounts_list') do
- within("#recounting_#{total_recount.date.strftime('%Y%m%d')}") do
- expect(page).to have_content total_recount.amount
+ within("#recounting_#{poll.starts_at.to_date.strftime('%Y%m%d')}") do
+ expect(page).to have_content 1
+ end
+ within("#recounting_#{(poll.ends_at.to_date - 5.days).strftime('%Y%m%d')}") do
+ expect(page).to have_content '-'
+ end
+ within("#recounting_#{poll.ends_at.to_date.strftime('%Y%m%d')}") do
+ expect(page).to have_content 1
end
end
end