DGNum/demarches-normaliennes
13
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

[#3477] Move compact nearer to the nil-generating place

Browse source
This commit is contained in:
Frederic Merizen 2019-02-26 16:27:43 +01:00 • committed by Frederic Merizen
parent 55d4dcc174
commit 664956d8c6
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/models/procedure_presentation.rb
View file

@ -107,7 +107,9 @@ class ProcedurePresentation < ApplicationRecord
values = filters.pluck('value')
case table
when 'self'
dates = values.map { |v| Time.zone.parse(v).beginning_of_day rescue nil }
dates = values
.map { |v| Time.zone.parse(v).beginning_of_day rescue nil }
.compact
Filter.new(
dossiers
).where_datetime_matches(table_column, dates)
@ -175,7 +177,7 @@ class ProcedurePresentation < ApplicationRecord
end
def where_datetime_matches(table_column, dates)
dates = dates.compact.flat_map { |d| [d, d + 1.day] }
dates = dates.flat_map { |d| [d, d + 1.day] }
if dates.present?
q = Array.new(dates.count / 2, "(#{table_column} BETWEEN ? AND ?)").join(' OR ')
@dossiers.where(q, *dates)