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

Excluded officer shift dates from each task date range

Browse Source
This commit is contained in:
María Checa
2017-10-16 12:22:54 +02:00
parent 1c5a1d1677
commit 45f73aa1ba
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/helpers/shifts_helper.rb
View File

@@ -1,15 +1,15 @@
module ShiftsHelper
def shift_vote_collection_dates(polls)
date_options((start_date(polls)..end_date(polls)))
date_options((start_date(polls)..end_date(polls)), 0)
end
def shift_recount_scrutiny_dates(polls)
date_options(polls.map(&:ends_at).map(&:to_date).sort.inject([]) { |total, date| total << (date..date + 1.week).to_a }.flatten.uniq)
date_options(polls.map(&:ends_at).map(&:to_date).sort.inject([]) { |total, date| total << (date..date + 1.week).to_a }.flatten.uniq, 1)
end
def date_options(dates)
dates.map { |date| [l(date, format: :long), l(date)] }
def date_options(dates, task_id)
dates.reject { |date| officer_shifts(task_id).include?(date) }.map { |date| [l(date, format: :long), l(date)] }
end
def start_date(polls)
@@ -24,4 +24,9 @@ module ShiftsHelper
officers.collect { |officer| [officer.name, officer.id] }
end
private
def officer_shifts(task_id)
@officer.shifts.where(task: task_id).map(&:date)
end
end