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

[#3477] Introduce column variable

Browse source
This commit is contained in:
Frederic Merizen 2019-02-26 16:13:22 +01:00 committed by Frederic Merizen
parent 35d5322a9b
commit 55d4dcc174
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/models/procedure_presentation.rb
View file

@ -102,7 +102,7 @@ class ProcedurePresentation < ApplicationRecord
def filtered_ids(dossiers, statut) def filtered_ids(dossiers, statut)
dossiers.each { |dossier| assert_matching_procedure(dossier) } dossiers.each { |dossier| assert_matching_procedure(dossier) }
filters[statut].group_by { |filter| filter.slice('table', 'column') } .map do |field, filters| filters[statut].group_by { |filter| filter.slice('table', 'column') } .map do |field, filters|
table = field['table'] table, column = field.values_at('table', 'column')
table_column = sanitized_column(field) table_column = sanitized_column(field)
values = filters.pluck('value') values = filters.pluck('value')
case table case table
@ -116,10 +116,10 @@ class ProcedurePresentation < ApplicationRecord
Filter.new( Filter.new(
dossiers dossiers
.includes(relation) .includes(relation)
.where("champs.type_de_champ_id = ?", field['column'].to_i) .where("champs.type_de_champ_id = ?", column.to_i)
).where_ilike('champs.value', values) ).where_ilike('champs.value', values)
when 'etablissement' when 'etablissement'
if field['column'] == 'entreprise_date_creation' if column == 'entreprise_date_creation'
dates = values.map { |v| v.to_date rescue nil } dates = values.map { |v| v.to_date rescue nil }
Filter.new( Filter.new(
dossiers.includes(table) dossiers.includes(table)