Merge pull request #1885 from consul/chore/remove_final_recounts

Remove Poll Final Recounts, replace with Total Results
2017-09-20 23:00:03 +02:00
parent 33c687ffec 9c6a974bec
commit 34568567a3
30 changed files with 69 additions and 201 deletions
--- a/app/controllers/admin/poll/booth_assignments_controller.rb
+++ b/app/controllers/admin/poll/booth_assignments_controller.rb
@@ -15,7 +15,7 @@ class Admin::Poll::BoothAssignmentsController < Admin::Poll::BaseController
  end

  def show
-    @booth_assignment = @poll.booth_assignments.includes(:final_recounts, :voters,
+    @booth_assignment = @poll.booth_assignments.includes(:total_results, :voters,
                                                         officer_assignments: [officer: [:user]]).find(params[:id])
    @voters_by_date = @booth_assignment.voters.group_by {|v| v.created_at.to_date}
  end