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

move facet_find to Facet.find

Browse source
This commit is contained in:
simon lehericey 2024-07-19 17:28:20 +02:00 • committed by mfo
parent 969282e453
commit 437e632f6a
No known key found for this signature in database
GPG key ID: 7CE3E1F5B794A8EC
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/models/facet.rb
View file

@ -25,6 +25,10 @@ class Facet
} }
end end
def self.find(procedure:, id:)
facets(procedure:).find { _1.id == id }
end
def self.dossier_facets(procedure:) def self.dossier_facets(procedure:)
[ [
new(table: 'self', column: 'created_at', type: :date), new(table: 'self', column: 'created_at', type: :date),

14
app/models/procedure_presentation.rb
View file

@ -199,7 +199,7 @@ class ProcedurePresentation < ApplicationRecord
def add_filter(statut, facet_id, value) def add_filter(statut, facet_id, value)
if value.present? if value.present?
facet = find_facet(facet_id) facet = Facet.find(procedure:, id: facet_id)
label = facet.label label = facet.label
column = facet.column column = facet.column
table = facet.table table = facet.table
@ -224,7 +224,7 @@ class ProcedurePresentation < ApplicationRecord
end end
def remove_filter(statut, facet_id, value) def remove_filter(statut, facet_id, value)
facet = find_facet(facet_id) facet = Facet.find(procedure:, id: facet_id)
table, column = facet.table, facet.column table, column = facet.table, facet.column
updated_filters = filters.dup updated_filters = filters.dup
@ -240,7 +240,7 @@ class ProcedurePresentation < ApplicationRecord
facet_ids = [] facet_ids = []
end end
facets = facet_ids.map { |id| find_facet(id) } facets = facet_ids.map { |id| Facet.find(procedure:, id:) }
update!(displayed_fields: facets) update!(displayed_fields: facets)
@ -272,11 +272,11 @@ class ProcedurePresentation < ApplicationRecord
end end
def field_type(facet_id) def field_type(facet_id)
find_facet(facet_id).type Facet.find(procedure:, id: facet_id).type
end end
def field_enum(facet_id) def field_enum(facet_id)
facet = find_facet(facet_id) facet = Facet.find(procedure:, id: facet_id)
if facet.scope.present? if facet.scope.present?
I18n.t(facet.scope).map(&:to_a).map(&:reverse) I18n.t(facet.scope).map(&:to_a).map(&:reverse)
elsif facet.table == 'groupe_instructeur' elsif facet.table == 'groupe_instructeur'
@ -314,10 +314,6 @@ class ProcedurePresentation < ApplicationRecord
[sort[TABLE], sort[COLUMN]].join(SLASH) [sort[TABLE], sort[COLUMN]].join(SLASH)
end end
def find_facet(facet_id)
Facet.facets(procedure:).find { _1.id == facet_id }
end
def find_type_de_champ(column) def find_type_de_champ(column)
TypeDeChamp TypeDeChamp
.joins(:revision_types_de_champ) .joins(:revision_types_de_champ)