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

Les admins peuvent associer une démarche à une thématique prédéfinie

Browse source
This commit is contained in:
Kara Diaby 2024-10-01 09:44:33 +02:00
parent f025e08336
commit fd7dcc7048
No known key found for this signature in database
GPG key ID: C4D1B0CF9F24D759
2 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/controllers/administrateurs/procedures_controller.rb
View file

@ -476,7 +476,16 @@ module Administrateurs
procedures_result = procedures_result.where(procedures_zones: { zone_id: filter.zone_ids }) if filter.zone_ids.present? procedures_result = procedures_result.where(procedures_zones: { zone_id: filter.zone_ids }) if filter.zone_ids.present?
procedures_result = procedures_result.where(hidden_at_as_template: nil) procedures_result = procedures_result.where(hidden_at_as_template: nil)
procedures_result = procedures_result.where(aasm_state: filter.statuses) if filter.statuses.present? procedures_result = procedures_result.where(aasm_state: filter.statuses) if filter.statuses.present?
procedures_result = procedures_result.where("tags @> ARRAY[?]::text[]", filter.tags) if filter.tags.present? if filter.tags.present?
tag_ids = ProcedureTag.where(name: filter.tags).pluck(:id).flatten
if tag_ids.any?
procedures_result = procedures_result
.joins(:procedure_tags)
.where(procedure_tags: { id: tag_ids })
.distinct
end
end
procedures_result = procedures_result.where(template: true) if filter.template? procedures_result = procedures_result.where(template: true) if filter.template?
procedures_result = procedures_result.where(published_at: filter.from_publication_date..) if filter.from_publication_date.present? procedures_result = procedures_result.where(published_at: filter.from_publication_date..) if filter.from_publication_date.present?
procedures_result = procedures_result.where(service: service) if filter.service_siret.present? procedures_result = procedures_result.where(service: service) if filter.service_siret.present?
@ -532,7 +541,7 @@ module Administrateurs
:lien_dpo, :lien_dpo,
:opendata, :opendata,
:procedure_expires_when_termine_enabled, :procedure_expires_when_termine_enabled,
{ zone_ids: [], tags: [] } { zone_ids: [], procedure_tag_names: [] }
] ]
editable_params << :piece_justificative_multiple if @procedure && !@procedure.piece_justificative_multiple? editable_params << :piece_justificative_multiple if @procedure && !@procedure.piece_justificative_multiple?
@ -545,6 +554,12 @@ module Administrateurs
if permited_params[:auto_archive_on].present? if permited_params[:auto_archive_on].present?
permited_params[:auto_archive_on] = Date.parse(permited_params[:auto_archive_on]) + 1.day permited_params[:auto_archive_on] = Date.parse(permited_params[:auto_archive_on]) + 1.day
end end
if permited_params[:procedure_tag_names].present?
tag_ids = ProcedureTag.where(name: permited_params[:procedure_tag_names]).pluck(:id)
permited_params[:procedure_tag_ids] = tag_ids
permited_params.delete(:procedure_tag_names)
end
permited_params permited_params
end end

8
app/views/administrateurs/procedures/_informations.html.haml
View file

@ -125,11 +125,11 @@
%react-fragment %react-fragment
= render ReactComponent.new "ComboBox/MultiComboBox", = render ReactComponent.new "ComboBox/MultiComboBox",
id: "procedure_tags_combo", id: "procedure_tags_combo",
items: Procedure.tags, items: ProcedureTag.order(:name).pluck(:name),
selected_keys: @procedure.tags, selected_keys: @procedure.procedure_tags.pluck(:name),
name: 'procedure[tags][]', name: 'procedure[procedure_tag_names][]',
value_separator: ',|;', value_separator: ',|;',
allows_custom_value: true, allows_custom_value: false,
'aria-label': 'Tags', 'aria-label': 'Tags',
'aria-describedby': 'procedure-tags' 'aria-describedby': 'procedure-tags'