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

[Fix #2613] Filter by date creation entreprise

Browse source
This commit is contained in:
Frederic Merizen 2018-09-20 18:46:32 +02:00
parent f4b95d3f40
commit 26ece1d144
2 changed files with 35 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/services/dossier_field_service.rb
View file

@ -79,19 +79,19 @@ class DossierFieldService
.includes(relation)
.where("champs.type_de_champ_id = ?", filter['column'].to_i)
.where("champs.value ILIKE ?", "%#{filter['value']}%")
when 'entreprise'
table = 'etablissement'
if filter['column'] == 'date_creation'
when 'etablissement'
table = filter['table']
if filter['column'] == 'entreprise_date_creation'
date = filter['value'].to_date rescue nil
dossiers
.includes(table)
.where("#{table.pluralize}.entreprise_#{filter['column']} = ?", date)
.where("#{table.pluralize}.#{filter['column']} = ?", date)
else
dossiers
.includes(table)
.where("#{table.pluralize}.entreprise_#{filter['column']} ILIKE ?", "%#{filter['value']}%")
.where("#{table.pluralize}.#{filter['column']} ILIKE ?", "%#{filter['value']}%")
end
when 'user', 'etablissement'
when 'user'
dossiers
.includes(filter['table'])
.where("#{filter['table'].pluralize}.#{filter['column']} ILIKE ?", "%#{filter['value']}%")