diff --git a/app/models/poll.rb b/app/models/poll.rb index a6526f8cf..bba437132 100644 --- a/app/models/poll.rb +++ b/app/models/poll.rb @@ -81,6 +81,10 @@ class Poll < ApplicationRecord ends_at < timestamp end + def recounts_confirmed? + ends_at < 1.month.ago + end + def self.current_or_recounting current + recounting end diff --git a/app/views/admin/poll/recounts/index.html.erb b/app/views/admin/poll/recounts/index.html.erb index 577316838..151a8335d 100644 --- a/app/views/admin/poll/recounts/index.html.erb +++ b/app/views/admin/poll/recounts/index.html.erb @@ -17,7 +17,10 @@ <% unless @poll.budget_poll? %> <%= t("admin.recounts.index.total_final") %> <% end %> - <%= t("admin.recounts.index.total_system") %> + + <% unless @poll.recounts_confirmed? %> + <%= t("admin.recounts.index.total_system") %> + <% end %> @@ -26,7 +29,10 @@ <% unless @poll.budget_poll? %> <%= @stats.total_participants_booth %> <% end %> - <%= @stats.total_registered_booth %> + + <% unless @poll.recounts_confirmed? %> + <%= @stats.total_registered_booth %> + <% end %> @@ -37,7 +43,10 @@ <% unless @poll.budget_poll? %> <%= t("admin.recounts.index.table_total_recount") %> <% end %> - <%= t("admin.recounts.index.table_system_count") %> + + <% unless @poll.recounts_confirmed? %> + <%= t("admin.recounts.index.table_system_count") %> + <% end %> <% @booth_assignments.each do |booth_assignment| %> @@ -50,7 +59,7 @@ <% unless @poll.budget_poll? %> - " id="<%= dom_id(booth_assignment) %>_recount"> + <% if total_recounts.present? %> <%= total_recounts %> <% else %> @@ -58,13 +67,16 @@ <% end %> <% end %> - - <% if system_count.present? %> - <%= system_count %> - <% else %> - 0 - <% end %> - + + <% unless @poll.recounts_confirmed? %> + + <% if system_count.present? %> + <%= system_count %> + <% else %> + 0 + <% end %> + + <% end %> <% end %> diff --git a/spec/factories/polls.rb b/spec/factories/polls.rb index b41d22641..6fbe1da34 100644 --- a/spec/factories/polls.rb +++ b/spec/factories/polls.rb @@ -17,6 +17,11 @@ FactoryBot.define do ends_at { 15.days.ago } end + trait :old do + starts_at { 3.months.ago } + ends_at { 2.months.ago } + end + trait :recounting do starts_at { 1.month.ago } ends_at { Date.current } diff --git a/spec/features/admin/poll/polls_spec.rb b/spec/features/admin/poll/polls_spec.rb index 0f2dacfbb..f5df4f678 100644 --- a/spec/features/admin/poll/polls_spec.rb +++ b/spec/features/admin/poll/polls_spec.rb @@ -328,6 +328,27 @@ describe "Admin polls" do expect(page).to have_content("2") end end + + scenario "Recounts list with old polls" do + poll = create(:poll, :old) + booth_assignment = create(:poll_booth_assignment, poll: poll) + + create(:poll_recount, booth_assignment: booth_assignment, total_amount: 10) + create(:poll_voter, :from_booth, poll: poll, booth_assignment: booth_assignment) + + visit admin_poll_recounts_path(poll) + + within("#totals") do + within("#total_final") do + expect(page).to have_content("10") + end + + expect(page).not_to have_selector "#total_system" + end + + expect(page).to have_selector "#poll_booth_assignment_#{booth_assignment.id}_recounts" + expect(page).not_to have_selector "#poll_booth_assignment_#{booth_assignment.id}_system" + end end end diff --git a/spec/models/poll/poll_spec.rb b/spec/models/poll/poll_spec.rb index 3cfe2f335..86b2f8528 100644 --- a/spec/models/poll/poll_spec.rb +++ b/spec/models/poll/poll_spec.rb @@ -414,4 +414,30 @@ describe Poll do end end end + + describe "#recounts_confirmed" do + it "is false for current polls" do + poll = create(:poll, :current) + + expect(poll.recounts_confirmed?).to be false + end + + it "is false for recounting polls" do + poll = create(:poll, :recounting) + + expect(poll.recounts_confirmed?).to be false + end + + it "is false for polls which finished less than a month ago" do + poll = create(:poll, starts_at: 3.months.ago, ends_at: 27.days.ago ) + + expect(poll.recounts_confirmed?).to be false + end + + it "is true for polls which finished more than a month ago" do + poll = create(:poll, starts_at: 3.months.ago, ends_at: 1.month.ago - 1.day) + + expect(poll.recounts_confirmed?).to be true + end + end end