fixes conflicts with polls

app/controllers/admin/poll/booth_assignments_controller.rb

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

app/controllers/officing/polls_controller.rb

@@ -2,7 +2,7 @@ class Officing::PollsController < Officing::BaseController
 
   def index
     @polls = current_user.poll_officer? ? current_user.poll_officer.assigned_polls : []
-    @polls = @polls.select {|poll| poll.current?(1.day.ago)}
+    @polls = @polls.select {|poll| poll.current?(Time.current) || poll.current?(1.day.ago)}
   end
 
 end

app/helpers/poll_recounts_helper.rb

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

app/models/poll/officer_assignment.rb

@@ -3,6 +3,7 @@ class Poll
     belongs_to :officer
     belongs_to :booth_assignment
     has_one :recount
+    has_many :voters
 
     validates :officer_id, presence: true
     validates :booth_assignment_id, presence: true

app/models/poll/voter.rb

@@ -4,6 +4,7 @@ class Poll
     belongs_to :user
     belongs_to :geozone
     belongs_to :booth_assignment
+    belongs_to :officer_assignment
 
     validates :poll_id, presence: true
     validates :user_id, presence: true

app/views/admin/poll/booth_assignments/show.html.erb

@@ -59,13 +59,23 @@
           </tr>
         </thead>
         <tbody>
-          <% @booth_assignment.recounts.sort_by{|r| r.date}.each do |recount| %>
+        <% (@poll.starts_at.to_date..@poll.ends_at.to_date).each do |voting_date| %>
-            <tr id="recount_<%= recount.id %>" class="<%= 'count-error' if recount.count != 0 %>">
+          <% recount = recount_for_date(@booth_assignment.recounts, voting_date) %>
-              <td><%= l recount.date.to_date %></td>
+          <% 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">0</td>
+              <td class="text-center"><%= system_count %></td>
+            </tr>
+          <% else %>
+            <tr id="recount_<%= voting_date.strftime('%Y%m%d') %>">
+              <td><%= l voting_date %></td>
+              <td class="text-center" title=""> - </td>
+              <td class="text-center"><%= system_count %></td>
             </tr>
           <% end %>
+        <% end %>
         </tbody>
       </table>
     <% end %>

db/dev_seeds.rb

@@ -2,7 +2,7 @@ require 'database_cleaner'
 
 DatabaseCleaner.clean_with :truncation
 
-puts "Creating Settings"
+print "Creating Settings"
 Setting.create(key: 'official_level_1_name', value: 'Empleados públicos')
 Setting.create(key: 'official_level_2_name', value: 'Organización Municipal')
 Setting.create(key: 'official_level_3_name', value: 'Directores generales')
@@ -42,17 +42,18 @@ Setting.create(key: 'meta_keywords', value: 'citizen participation, open governm
 Setting.create(key: 'verification_offices_url', value: 'http://oficinas-atencion-ciudadano.url/')
 Setting.create(key: 'min_age_to_participate', value: '16')
 
-puts "Creating Geozones"
+puts " ✅"
+print "Creating Geozones"
 
 Geozone.create(name: "city")
 Geozone.create(name: "Existent District", census_code: "01")
 ('A'..'Z').each { |i| Geozone.create(name: "District #{i}", external_code: i.ord, census_code: i.ord) }
 
-puts "Creating Users"
+puts " ✅"
+print "Creating Users"
 
 def create_user(email, username = Faker::Name.name)
   pwd = '12345678'
-  puts "    #{username}"
   User.create!(username: username, email: email, password: pwd, password_confirmation: pwd, confirmed_at: Time.current, terms_of_service: "1")
 end
 
@@ -111,7 +112,8 @@ end
 org_user_ids = User.organizations.pluck(:id)
 not_org_users = User.where(['users.id NOT IN(?)', org_user_ids])
 
-puts "Creating Tags Categories"
+puts " ✅"
+print "Creating Tags Categories"
 
 ActsAsTaggableOn::Tag.create!(name:  "Asociaciones", featured: true, kind: "category")
 ActsAsTaggableOn::Tag.create!(name:  "Cultura", featured: true, kind: "category")
@@ -129,7 +131,8 @@ ActsAsTaggableOn::Tag.create!(name:  "Transparencia", featured: true, kind: "cat
 ActsAsTaggableOn::Tag.create!(name:  "Seguridad y Emergencias", featured: true, kind: "category")
 ActsAsTaggableOn::Tag.create!(name:  "Medio Ambiente", featured: true, kind: "category")
 
-puts "Creating Debates"
+puts " ✅"
+print "Creating Debates"
 
 tags = Faker::Lorem.words(25)
 (1..30).each do
@@ -142,7 +145,6 @@ tags = Faker::Lorem.words(25)
                           tag_list: tags.sample(3).join(','),
                           geozone: Geozone.reorder("RANDOM()").first,
                           terms_of_service: "1")
-  puts "    #{debate.title}"
 end
 
 
@@ -157,11 +159,11 @@ tags = ActsAsTaggableOn::Tag.where(kind: 'category')
                           tag_list: tags.sample(3).join(','),
                           geozone: Geozone.reorder("RANDOM()").first,
                           terms_of_service: "1")
-  puts "    #{debate.title}"
 end
 
 
-puts "Creating Proposals"
+puts " ✅"
+print "Creating Proposals"
 
 tags = Faker::Lorem.words(25)
 (1..30).each do |i|
@@ -178,10 +180,10 @@ tags = Faker::Lorem.words(25)
                               tag_list: tags.sample(3).join(','),
                               geozone: Geozone.reorder("RANDOM()").first,
                               terms_of_service: "1")
-  puts "    #{proposal.title}"
 end
 
-puts "Creating Archived Proposals"
+puts " ✅"
+print "Creating Archived Proposals"
 
 tags = Faker::Lorem.words(25)
 (1..5).each do
@@ -198,10 +200,10 @@ tags = Faker::Lorem.words(25)
                               geozone: Geozone.reorder("RANDOM()").first,
                               terms_of_service: "1",
                               created_at: Setting["months_to_archive_proposals"].to_i.months.ago)
-  puts "    #{proposal.title}"
 end
 
-puts "Creating Successful Proposals"
+puts " ✅"
+print "Creating Successful Proposals"
 
 tags = Faker::Lorem.words(25)
 (1..10).each do |i|
@@ -219,7 +221,6 @@ tags = Faker::Lorem.words(25)
                               geozone: Geozone.reorder("RANDOM()").first,
                               terms_of_service: "1",
                               cached_votes_up: Setting["votes_for_proposal_success"])
-  puts "    #{proposal.title}"
 end
 
 
@@ -238,11 +239,11 @@ tags = ActsAsTaggableOn::Tag.where(kind: 'category')
                               tag_list: tags.sample(3).join(','),
                               geozone: Geozone.reorder("RANDOM()").first,
                               terms_of_service: "1")
-  puts "    #{proposal.title}"
 end
 
 
-puts "Commenting Debates"
+puts " ✅"
+print "Commenting Debates"
 
 (1..100).each do
   author = User.reorder("RANDOM()").first
@@ -254,7 +255,8 @@ puts "Commenting Debates"
 end
 
 
-puts "Commenting Proposals"
+puts " ✅"
+print "Commenting Proposals"
 
 (1..100).each do |i|
   author = User.reorder("RANDOM()").first
@@ -266,7 +268,8 @@ puts "Commenting Proposals"
 end
 
 
-puts "Commenting Comments"
+puts " ✅"
+print "Commenting Comments"
 
 (1..200).each do
   author = User.reorder("RANDOM()").first
@@ -280,7 +283,8 @@ puts "Commenting Comments"
 end
 
 
-puts "Voting Debates, Proposals & Comments"
+puts " ✅"
+print "Voting Debates, Proposals & Comments"
 
 (1..100).each do
   voter  = not_org_users.reorder("RANDOM()").first
@@ -303,7 +307,8 @@ end
 end
 
 
-puts "Flagging Debates & Comments"
+puts " ✅"
+print "Flagging Debates & Comments"
 
 (1..40).each do
   debate = Debate.reorder("RANDOM()").first
@@ -323,7 +328,8 @@ end
   Flag.flag(flagger, proposal)
 end
 
-puts "Creating Spending Proposals"
+puts " ✅"
+print "Creating Spending Proposals"
 
 tags = Faker::Lorem.words(10)
 
@@ -346,17 +352,18 @@ tags = Faker::Lorem.words(10)
                               tag_list: tags.sample(3).join(','),
                               price: rand(1000000),
                               terms_of_service: "1")
-  puts "    #{spending_proposal.title}"
 end
 
-puts "Creating Valuation Assignments"
+puts " ✅"
+print "Creating Valuation Assignments"
 
 (1..17).to_a.sample.times do
   SpendingProposal.reorder("RANDOM()").first.valuators << valuator.valuator
 end
 
 
-puts "Creating Budgets"
+puts " ✅"
+print "Creating Budgets"
 
 Budget::PHASES.each_with_index do |phase, i|
   descriptions = Hash[Budget::PHASES.map{ |p| ["description_#{p}",
@@ -369,8 +376,6 @@ Budget::PHASES.each_with_index do |phase, i|
     )
   )
 
-  puts budget.name
-
   (1..([1, 2, 3].sample)).each do
     group = budget.groups.create!(name: Faker::StarWars.planet)
 
@@ -381,13 +386,12 @@ Budget::PHASES.each_with_index do |phase, i|
                                                price: rand(1 .. 100) * 100000)
 
     end
-    print "#{group.name} "
   end
-  puts ""
 end
 
 
-puts "Creating Investments"
+puts " ✅"
+print "Creating Investments"
 tags = Faker::Lorem.words(10)
 (1..100).each do |i|
   heading = Budget::Heading.reorder("RANDOM()").first
@@ -407,47 +411,53 @@ tags = Faker::Lorem.words(10)
     tag_list: tags.sample(3).join(','),
     price: rand(1 .. 100) * 100000,
     terms_of_service: "1")
-  puts "    #{investment.title}"
 end
 
-puts "Selecting Investments"
+puts " ✅"
+print "Selecting Investments"
 Budget.balloting.reorder("RANDOM()").limit(3).each do |budget|
   budget.investments.feasible.reorder("RANDOM()").limit(10).update_all(selected: true)
 end
 
-puts "Creating Valuation Assignments"
+puts " ✅"
+print "Creating Valuation Assignments"
 
 (1..17).to_a.sample.times do
   Budget::Investment.reorder("RANDOM()").first.valuators << valuator.valuator
 end
 
 
-puts "Creating Legislation"
+puts " ✅"
+print "Creating Legislation"
 
 Legislation.create!(title: 'Participatory Democracy', body: 'In order to achieve...')
 
 
-puts "Ignoring flags in Debates, comments & proposals"
+puts " ✅"
+print "Ignoring flags in Debates, comments & proposals"
 
 Debate.flagged.reorder("RANDOM()").limit(10).each(&:ignore_flag)
 Comment.flagged.reorder("RANDOM()").limit(30).each(&:ignore_flag)
 Proposal.flagged.reorder("RANDOM()").limit(10).each(&:ignore_flag)
 
 
-puts "Hiding debates, comments & proposals"
+puts " ✅"
+print "Hiding debates, comments & proposals"
 
 Comment.with_hidden.flagged.reorder("RANDOM()").limit(30).each(&:hide)
 Debate.with_hidden.flagged.reorder("RANDOM()").limit(5).each(&:hide)
 Proposal.with_hidden.flagged.reorder("RANDOM()").limit(10).each(&:hide)
 
 
-puts "Confirming hiding in debates, comments & proposals"
+puts " ✅"
+print "Confirming hiding in debates, comments & proposals"
 
 Comment.only_hidden.flagged.reorder("RANDOM()").limit(10).each(&:confirm_hide)
 Debate.only_hidden.flagged.reorder("RANDOM()").limit(5).each(&:confirm_hide)
 Proposal.only_hidden.flagged.reorder("RANDOM()").limit(5).each(&:confirm_hide)
 
-puts "Creating banners"
+puts " ✅"
+print "Creating banners"
 
 Proposal.last(3).each do |proposal|
   title = Faker::Lorem.sentence(word_count = 3)
@@ -462,18 +472,18 @@ Proposal.last(3).each do |proposal|
                           post_started_at: rand((Time.current - 1.week) .. (Time.current - 1.day)),
                           post_ended_at:   rand((Time.current  - 1.day) .. (Time.current + 1.week)),
                           created_at: rand((Time.current - 1.week) .. Time.current))
-  puts "    #{banner.title}"
 end
 
-puts "Creating polls"
+puts " ✅"
+print "Creating polls"
 
-puts "Active Polls"
+puts " ✅"
+print "Active Polls"
 (1..3).each do |i|
   poll = Poll.create(name: "Active Poll #{i}",
                      starts_at: 1.month.ago,
                      ends_at:   1.month.from_now,
                      geozone_restricted: false)
-  puts "    #{poll.name}"
 end
 (4..5).each do |i|
   poll = Poll.create(name: "Active Poll #{i}",
@@ -482,26 +492,26 @@ end
                      geozone_restricted: true,
                      geozones: Geozone.reorder("RANDOM()").limit(3)
                     )
-  puts "    #{poll.name}"
 end
 
 
 
 
 
-puts "Upcoming Poll"
+puts " ✅"
+print "Upcoming Poll"
 poll = Poll.create(name: "Upcoming Poll",
                    starts_at: 1.month.from_now,
                    ends_at:   2.months.from_now)
-puts "    #{poll.name}"
 
-puts "Expired Poll"
+puts " ✅"
+print "Expired Poll"
 poll = Poll.create(name: "Expired Poll",
                      starts_at: 2.months.ago,
                      ends_at:   1.months.ago)
-puts "    #{poll.name}"
 
-puts "Creating Poll Questions"
+puts " ✅"
+print "Creating Poll Questions"
 
 (1..50).each do |i|
   poll = Poll.reorder("RANDOM()").first
@@ -514,21 +524,23 @@ puts "Creating Poll Questions"
                                     description: description,
                                     valid_answers: Faker::Lorem.words(3).join(', '),
                                     poll: poll)
-  puts "    #{question.title}"
 end
 
-puts "Creating Poll Booths"
+puts " ✅"
+print "Creating Poll Booths"
 30.times.each_with_index do |i|
   Poll::Booth.create(name: "Booth #{i}", polls: [Poll.all.sample])
 end
 
-puts "Creating Booth Assignments"
+puts " ✅"
+print "Creating Booth Assignments"
 Poll::Booth.all.each do |booth|
   Poll::BoothAssignment.create(booth: booth, poll: Poll.all.sample)
 end
 
-puts "Creating Poll Officer Assignments"
+puts " ✅"
-(1..10).to_a.sample.times do |i|
+print "Creating Poll Officer Assignments"
+(1..15).to_a.sample.times do |i|
   Poll::BoothAssignment.all.sample(i).each do |booth_assignment|
     Poll::OfficerAssignment.create(officer: poll_officer.poll_officer,
                                    booth_assignment: booth_assignment,
@@ -536,7 +548,21 @@ puts "Creating Poll Officer Assignments"
   end
 end
 
-puts "Creating Poll Question from Proposals"
+puts " ✅"
+print "Creating Poll Recounts" do
+(1..15).to_a.sample.times do |i|
+  poll_officer.poll_officer.officer_assignments.all.sample(i).each do |officer_assignment|
+    Poll::Recount.create(officer_assignment: officer_assignment,
+                         booth_assignment: officer_assignment.booth_assignment,
+                         date: officer_assignment.date,
+                         count: (1..5000).to_a.sample)
+  end
+end
+
+end
+
+puts " ✅"
+print "Creating Poll Questions from Proposals"
 
 (1..3).each do
   proposal = Proposal.reorder("RANDOM()").first
@@ -544,11 +570,10 @@ puts "Creating Poll Question from Proposals"
   question = Poll::Question.create(valid_answers: "Yes, No")
   question.copy_attributes_from_proposal(proposal)
   question.save!
-
-  puts " #{question.title} (from proposal)"
 end
 
-puts "Creating Successful Proposals"
+puts " ✅"
+print "Creating Successful Proposals"
 
 (1..10).each do
   proposal = Proposal.reorder("RANDOM()").first
@@ -556,11 +581,10 @@ puts "Creating Successful Proposals"
   question = Poll::Question.create(valid_answers: "Yes, No")
   question.copy_attributes_from_proposal(proposal)
   question.save!
-
-  puts " #{question.title} (from proposal)"
 end
 
-puts "Commenting Poll Questions"
+puts " ✅"
+print "Commenting Poll Questions"
 
 (1..30).each do
   author = User.reorder("RANDOM()").first
@@ -571,10 +595,14 @@ puts "Commenting Poll Questions"
                   body: Faker::Lorem.sentence)
 end
 
-puts "Creating Poll Voters"
+puts " ✅"
+print "Creating Poll Voters"
 
 (1..10).each do
   poll = Poll.all.sample
   document_number = Faker::Number.number(10)
   Poll::Voter.create!(poll: poll, document_number: document_number)
 end
+
+puts " ✅"
+puts "All dev seeds created successfuly 👍"

db/migrate/20170127173553_add_officer_assignment_to_votes.rb

@@ -0,0 +1,5 @@
+class AddOfficerAssignmentToVotes < ActiveRecord::Migration
+  def change
+    add_column :poll_voters, :officer_assignment_id, :integer, default: nil
+  end
+end

db/schema.rb

@@ -461,15 +461,16 @@ ActiveRecord::Schema.define(version: 20170128214244) do
   create_table "poll_voters", force: :cascade do |t|
     t.string   "document_number"
     t.string   "document_type"
-    t.datetime "created_at",          null: false
+    t.datetime "created_at",            null: false
-    t.datetime "updated_at",          null: false
+    t.datetime "updated_at",            null: false
-    t.integer  "poll_id",             null: false
+    t.integer  "poll_id",               null: false
     t.integer  "booth_assignment_id"
     t.integer  "age"
     t.string   "gender"
     t.integer  "geozone_id"
     t.integer  "answer_id"
     t.integer  "user_id"
+    t.integer  "officer_assignment_id"
   end
 
   add_index "poll_voters", ["document_number"], name: "index_poll_voters_on_document_number", using: :btree

spec/features/admin/poll/booth_assigments_spec.rb

@@ -92,10 +92,22 @@ feature 'Admin booths assignments' do
       poll = create(:poll)
       booth = create(:poll_booth)
       booth_assignment = create(:poll_booth_assignment, poll: poll, booth: booth)
-      recount = create(:poll_recount, booth_assignment: booth_assignment, count: 33)
+      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)
+
+      recount_1 = create(:poll_recount,
+                         booth_assignment: booth_assignment,
+                         officer_assignment: officer_assignment_1,
+                         date: officer_assignment_1.date,
+                         count: 33)
+      recount_2 = create(:poll_recount,
+                         booth_assignment: booth_assignment,
+                         officer_assignment: officer_assignment_2,
+                         date: officer_assignment_2.date,
+                         count: 1)
 
       booth_assignment_2 = create(:poll_booth_assignment, poll: poll)
-      recount_2 = create(:poll_recount, booth_assignment: booth_assignment_2, count: 100)
+      other_recount = create(:poll_recount, booth_assignment: booth_assignment_2, count: 100)
 
       visit admin_poll_path(poll)
       click_link 'Booths (2)'
@@ -104,9 +116,55 @@ feature 'Admin booths assignments' do
 
       click_link 'Recounts'
       within('#recounts_list') do
-        expect(page).to have_content recount.count
+        expect(page).to_not have_content other_recount.count
-        expect(page).to_not have_content recount_2.count
+
+        within("#recount_#{recount_1.id}") do
+          expect(page).to have_content recount_1.count
+        end
+
+        within("#recount_#{recount_2.id}") do
+          expect(page).to have_content recount_2.count
+        end
+
       end
     end
+
+    scenario 'Marks recount values with count-errors' do
+      poll = create(:poll)
+      booth = create(:poll_booth)
+      booth_assignment = create(:poll_booth_assignment, poll: poll, booth: booth)
+      today = Time.current.to_date
+      officer_assignment = create(:poll_officer_assignment, booth_assignment: booth_assignment, date: today)
+
+      recount = create(:poll_recount,
+                         booth_assignment: booth_assignment,
+                         officer_assignment: officer_assignment,
+                         date: officer_assignment.date,
+                         count: 1)
+
+      visit admin_poll_booth_assignment_path(poll, booth_assignment)
+      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_content recount.count
+          expect(page).to have_content 0
+        end
+      end
+
+      create(:poll_voter, :valid_document, poll: poll, booth_assignment: booth_assignment)
+
+      visit admin_poll_booth_assignment_path(poll, booth_assignment)
+      click_link 'Recounts'
+
+      within('#recounts_list') do
+        expect(page).to_not have_css('.count-error')
+        within("#recount_#{recount.id}") do
+          expect(page).to have_content(recount.count)
+        end
+      end
+    end
+
   end
 end