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

Load the Booth polls instead of all current/incoming on Shift creation for date ranges

Browse Source
This commit is contained in:
Bertocq
2017-10-04 11:02:09 +02:00
parent e67ca1f86b
commit 15039b6c5d
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/admin/poll/shifts_controller.rb
View File

@@ -1,7 +1,6 @@
class Admin::Poll::ShiftsController < Admin::Poll::BaseController class Admin::Poll::ShiftsController < Admin::Poll::BaseController
before_action :load_booth before_action :load_booth
before_action :load_polls
before_action :load_officer before_action :load_officer
def new def new
@@ -39,10 +38,6 @@ class Admin::Poll::ShiftsController < Admin::Poll::BaseController
@booth = ::Poll::Booth.find(params[:booth_id]) @booth = ::Poll::Booth.find(params[:booth_id])
end end
def load_polls
@polls = ::Poll.current_or_incoming
end
def load_shifts def load_shifts
@shifts = @booth.shifts @shifts = @booth.shifts
end end

4
app/views/admin/poll/shifts/_form.html.erb
View File

@@ -24,12 +24,12 @@
<div class="small-12 medium-3 column"> <div class="small-12 medium-3 column">
<label><%= t("admin.poll_shifts.new.date") %></label> <label><%= t("admin.poll_shifts.new.date") %></label>
<%= select 'shift[date]', 'vote_collection_date', <%= select 'shift[date]', 'vote_collection_date',
options_for_select(shift_vote_collection_dates(@polls)), options_for_select(shift_vote_collection_dates(@booth.polls)),
{ prompt: t("admin.poll_shifts.new.select_date"), { prompt: t("admin.poll_shifts.new.select_date"),
label: false }, label: false },
class: 'js-shift-vote-collection-dates' %> class: 'js-shift-vote-collection-dates' %>
<%= select 'shift[date]', 'recount_scrutiny_date', <%= select 'shift[date]', 'recount_scrutiny_date',
options_for_select(shift_recount_scrutiny_dates(@polls)), options_for_select(shift_recount_scrutiny_dates(@booth.polls)),
{ prompt: t("admin.poll_shifts.new.select_date"), { prompt: t("admin.poll_shifts.new.select_date"),
label: false }, label: false },
class: 'js-shift-recount-scrutiny-dates', class: 'js-shift-recount-scrutiny-dates',

2
spec/features/admin/poll/shifts_spec.rb
View File

@@ -31,6 +31,8 @@ feature 'Admin shifts' do
end end
scenario "Create Vote Collection Shift and Recount & Scrutiny Shift on same date", :js do scenario "Create Vote Collection Shift and Recount & Scrutiny Shift on same date", :js do
create(:poll)
create(:poll, :incoming)
poll = create(:poll, :current) poll = create(:poll, :current)
booth = create(:poll_booth) booth = create(:poll_booth)
assignment = create(:poll_booth_assignment, poll: poll, booth: booth) assignment = create(:poll_booth_assignment, poll: poll, booth: booth)