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

Fix Shift date ranges when poll is on recounting phase

Browse Source
This commit is contained in:
Bertocq
2017-10-23 20:17:42 +02:00
parent f9458b9ef0
commit 3adfbcb830
5 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,7 +3,7 @@
<fieldset class="fieldset">
<legend>
<%= t("admin.poll_shifts.new.new_shift") %>
<%= t("admin.poll_shifts.new.new_shift") %>
</legend>
<div class="small-12 medium-3 column highlight padding">
@@ -24,12 +24,12 @@
<div class="small-12 medium-3 column">
<label><%= t("admin.poll_shifts.new.date") %></label>
<%= select 'shift[date]', 'vote_collection_date',
options_for_select(shift_vote_collection_dates(@booth, @booth.polls.current_or_incoming)),
{ prompt: t("admin.poll_shifts.new.select_date"),
options_for_select(shift_vote_collection_dates(@booth, @vote_collection_polls)),
{ prompt: @voting_polls.present? ? t("admin.poll_shifts.new.select_date") : t("admin.poll_shifts.new.no_voting_days"),
label: false },
class: 'js-shift-vote-collection-dates' %>
<%= select 'shift[date]', 'recount_scrutiny_date',
options_for_select(shift_recount_scrutiny_dates(@booth, @booth.polls.current_or_recounting_or_incoming)),
options_for_select(shift_recount_scrutiny_dates(@booth, @recount_polls)),
{ prompt: t("admin.poll_shifts.new.select_date"),
label: false },
class: 'js-shift-recount-scrutiny-dates',