consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1378 from consul/recounting

Browse Source 
Final recounts info to Admin
This commit is contained in:
Raimond Garcia
2017-01-30 21:54:35 +01:00
committed by GitHub
parent 600158a772 4ee50c86c0
commit b0bc97eb37
13 changed files with 101 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admin/poll/booth_assignments_controller.rb
View File

@@ -24,7 +24,7 @@ class Admin::Poll::BoothAssignmentsController < Admin::BaseController
def show
@poll = ::Poll.find(params[:poll_id])
@booth_assignment = @poll.booth_assignments.includes(:recounts, :voters, officer_assignments: [officer: [:user]]).find(params[:id])
@booth_assignment = @poll.booth_assignments.includes(:recounts, :final_recounts, :voters, officer_assignments: [officer: [:user]]).find(params[:id])
@voters_by_date = @booth_assignment.voters.group_by {|v| v.created_at.to_date}
end

2
app/controllers/officing/final_recounts_controller.rb
View File

@@ -4,7 +4,7 @@ class Officing::FinalRecountsController < Officing::BaseController
def new
@officer_assignments = ::Poll::OfficerAssignment.
includes(:final_recounts, booth_assignment: :booth).
includes(:final_recounts, booth_assignment: [:booth]).
joins(:booth_assignment).
final.
where(id: current_user.poll_officer.officer_assignment_ids).

9
app/helpers/officing_helper.rb
View File

@@ -16,4 +16,13 @@ module OfficingHelper
options_for_select(options)
end
def recount_to_compare_with_final_recount(final_recount)
recount = final_recount.booth_assignment.recounts.select {|r| r.date == final_recount.date}.first
recount.present? ? recount.count : "-"
end
def system_recount_to_compare_with_final_recount(final_recount)
final_recount.booth_assignment.voters.select {|v| v.created_at.to_date == final_recount.date}.size
end
end

7
app/helpers/poll_final_recounts_helper.rb Normal file
View File

@@ -0,0 +1,7 @@
module PollFinalRecountsHelper
def final_recount_for_date(final_recounts, date)
final_recounts.select {|f| f.date == date}.first
end
end

2
app/helpers/poll_recounts_helper.rb
View File

@@ -1,7 +1,7 @@
module PollRecountsHelper
def recount_for_date(recounts, date)
recounts.select {|r| r.date.to_date == date}.first
recounts.select {|r| r.date == date}.first
end
end

28
app/views/admin/poll/booth_assignments/show.html.erb
View File

@@ -55,26 +55,30 @@
<tr>
<th><%= t("admin.poll_booth_assignments.show.date") %></th>
<th class="text-center"><%= t("admin.poll_booth_assignments.show.count_by_officer") %></th>
<th class="text-center"><%= t("admin.poll_booth_assignments.show.count_final") %></th>
<th class="text-center"><%= t("admin.poll_booth_assignments.show.count_by_system") %></th>
</tr>
</thead>
<tbody>
<% (@poll.starts_at.to_date..@poll.ends_at.to_date).each do |voting_date| %>
<% recount = recount_for_date(@booth_assignment.recounts, voting_date) %>
<% final_recount = final_recount_for_date(@booth_assignment.final_recounts, voting_date) %>
<% system_count = @voters_by_date[voting_date].present? ? @voters_by_date[voting_date].size : 0 %>
<% if recount.present? %>
<tr id="recount_<%= recount.id %>" class="<%= 'count-error' if recount.count != system_count %>">
<td><%= l voting_date %></td>
<td class="text-center" title="<%= recount.officer_assignment.officer.name %>"><%= recount.count %></td>
<td class="text-center"><%= system_count %></td>
</tr>
<% else %>
<tr id="recount_<%= voting_date.strftime('%Y%m%d') %>">
<td><%= l voting_date %></td>
<tr id="recounting_<%= voting_date.strftime('%Y%m%d') %>">
<td><%= l voting_date %></td>
<% if recount.present? %>
<td class="text-center <%= 'count-error' if recount.count != system_count %>" title="<%= recount.officer_assignment.officer.name %>"><%= recount.count %></td>
<% else %>
<td class="text-center" title=""> - </td>
<td class="text-center"><%= system_count %></td>
</tr>
<% end %>
<% end %>
<% if final_recount.present? %>
<td class="text-center <%= 'count-error' if final_recount.count != system_count %>" title="<%= final_recount.officer_assignment.officer.name %>"><%= final_recount.count %></td>
<% else %>
<td class="text-center" title=""> - </td>
<% end %>
<td class="text-center"><%= system_count %></td>
</tr>
<% end %>
</tbody>
</table>

8
app/views/officing/final_recounts/new.html.erb
View File

@@ -52,6 +52,8 @@
<th><%= t("officing.final_recounts.new.date") %></th>
<th><%= t("officing.final_recounts.new.booth") %></th>
<th><%= t("officing.final_recounts.new.count") %></th>
<th><%= "Recuento diario anterior" %></th>
<th><%= "Recuento del sistema" %></th>
</thead>
<tbody>
<% @final_recounts.each do |final_recount| %>
@@ -65,6 +67,12 @@
<td>
<strong><%= final_recount.count %></strong>
</td>
<td>
<strong><%= recount_to_compare_with_final_recount final_recount %></strong>
</td>
<td>
<strong><%= system_recount_to_compare_with_final_recount final_recount %></strong>
</td>
</tr>
<% end %>
</tbody>

1
config/locales/admin.en.yml
View File

@@ -288,6 +288,7 @@ en:
no_recounts: "There are not daily recounts of this booth yet"
date: "Date"
count_by_officer: "Votes (by officer)"
count_final: "Final recount"
count_by_system: "Votes (automatic)"
polls:
index:

1
config/locales/admin.es.yml
View File

@@ -288,6 +288,7 @@ es:
no_recounts: "No hay recuentos diarios de esta urna"
date: "Fecha"
count_by_officer: "Votos (presidente de mesa)"
count_final: "Recuento final"
count_by_system: "Votos (automático)"
polls:
index:

4
config/locales/officing.en.yml
View File

@@ -46,8 +46,8 @@ en:
date: "Date"
select_booth: "Select booth"
select_date: "Select date"
count: "Vote count"
count_placeholder: "Vote count"
count: "Final vote count"
count_placeholder: "Final vote count"
submit: Save
final_recount_list: "Your final recounts"
residence:

4
config/locales/officing.es.yml
View File

@@ -46,8 +46,8 @@ es:
date: "Día"
select_booth: "Elige urna"
select_date: "Elige día"
count: "Número de votos"
count_placeholder: "Número de votos"
count: "Recuento final"
count_placeholder: "Número final de votos"
submit: "Guardar"
final_recount_list: "Tus recuentos finales"
residence:

24
spec/features/admin/poll/booth_assigments_spec.rb
View File

@@ -90,11 +90,12 @@ feature 'Admin booths assignments' do
end
scenario 'Lists all recounts for the booth assignment' do
poll = create(:poll)
poll = create(:poll, starts_at: 2.weeks.ago, ends_at: 1.week.ago)
booth = create(:poll_booth)
booth_assignment = create(:poll_booth_assignment, poll: poll, booth: booth)
officer_assignment_1 = create(:poll_officer_assignment, booth_assignment: booth_assignment, date: poll.starts_at)
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)
recount_1 = create(:poll_recount,
booth_assignment: booth_assignment,
@@ -105,7 +106,12 @@ feature 'Admin booths assignments' do
booth_assignment: booth_assignment,
officer_assignment: officer_assignment_2,
date: officer_assignment_2.date,
count: 1)
count: 78)
final_recount = create(:poll_final_recount,
booth_assignment: booth_assignment,
officer_assignment: final_officer_assignment,
date: final_officer_assignment.date,
count: 5678)
booth_assignment_2 = create(:poll_booth_assignment, poll: poll)
other_recount = create(:poll_recount, booth_assignment: booth_assignment_2, count: 100)
@@ -119,14 +125,18 @@ feature 'Admin booths assignments' do
within('#recounts_list') do
expect(page).to_not have_content other_recount.count
within("#recount_#{recount_1.id}") do
within("#recounting_#{recount_1.date.strftime('%Y%m%d')}") do
expect(page).to have_content recount_1.count
end
within("#recount_#{recount_2.id}") do
within("#recounting_#{recount_2.date.strftime('%Y%m%d')}") do
expect(page).to have_content recount_2.count
end
within("#recounting_#{final_recount.date.strftime('%Y%m%d')}") do
expect(page).to have_content final_recount.count
end
end
end
@@ -147,8 +157,8 @@ feature 'Admin booths assignments' do
click_link 'Recounts'
within('#recounts_list') do
expect(page).to have_css("#recount_#{recount.id}.count-error")
within("#recount_#{recount.id}") do
expect(page).to have_css("#recounting_#{recount.date.strftime('%Y%m%d')} td.count-error")
within("#recounting_#{recount.date.strftime('%Y%m%d')}") do
expect(page).to have_content recount.count
expect(page).to have_content 0
end
@@ -161,7 +171,7 @@ feature 'Admin booths assignments' do
within('#recounts_list') do
expect(page).to_not have_css('.count-error')
within("#recount_#{recount.id}") do
within("#recounting_#{recount.date.strftime('%Y%m%d')}") do
expect(page).to have_content(recount.count)
end
end

36
spec/features/officing/final_recount_spec.rb
View File

@@ -63,7 +63,7 @@ feature 'Officing Final Recount' do
end
end
scenario 'Edit recount' do
scenario 'Edit final recount' do
final_recount = create(:poll_final_recount,
officer_assignment: @officer_assignment,
booth_assignment: @officer_assignment.booth_assignment,
@@ -97,4 +97,38 @@ feature 'Officing Final Recount' do
end
expect(page).to_not have_content('100')
end
scenario 'Show daily, final and system recounts to compare' do
voting_officer_assignment = create(:poll_officer_assignment, date: 7.days.ago)
poll = voting_officer_assignment.booth_assignment.poll
poll.update(ends_at: 1.day.ago)
daily_recount = create(:poll_recount,
officer_assignment: voting_officer_assignment,
booth_assignment: voting_officer_assignment.booth_assignment,
date: voting_officer_assignment.date,
count: 500)
final_officer_assignment = create(:poll_officer_assignment, :final,
booth_assignment: voting_officer_assignment.booth_assignment,
date: poll.ends_at + 1.day,
officer: @poll_officer)
final_recount = create(:poll_final_recount,
officer_assignment: final_officer_assignment,
booth_assignment: final_officer_assignment.booth_assignment,
date: daily_recount.date,
count: 100)
33.times { create(:poll_voter, :valid_document,
poll: poll,
booth_assignment: final_officer_assignment.booth_assignment,
created_at: daily_recount.date) }
visit new_officing_poll_final_recount_path(poll)
within("#poll_final_recount_#{final_recount.id}") do
expect(page).to have_content(I18n.l(final_recount.date.to_date, format: :long))
expect(page).to have_content(final_officer_assignment.booth_assignment.booth.name)
expect(page).to have_content('500')
expect(page).to have_content('100')
expect(page).to have_content('33')
end
end
end