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

feat(instructeur): filter dossiers "en attente"

Browse source
This commit is contained in:
Colin Darie 2023-03-27 19:11:22 +02:00
parent 36efb31728
commit b14a70abf7
No known key found for this signature in database
GPG key ID: 4FB865FDBCA4BCC4
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/models/procedure_presentation.rb
View file

@ -183,6 +183,8 @@ class ProcedurePresentation < ApplicationRecord
.filter_map { |v| Time.zone.parse(v).beginning_of_day rescue nil } .filter_map { |v| Time.zone.parse(v).beginning_of_day rescue nil }
dossiers.filter_by_datetimes(column, dates) dossiers.filter_by_datetimes(column, dates)
elsif field['column'] == "state" && values.include?("pending_correction")
dossiers.joins(:resolutions).where(resolutions: DossierResolution.pending)
else else
dossiers.where("dossiers.#{column} IN (?)", values) dossiers.where("dossiers.#{column} IN (?)", values)
end end
@ -245,7 +247,11 @@ class ProcedurePresentation < ApplicationRecord
if [TYPE_DE_CHAMP, TYPE_DE_CHAMP_PRIVATE].include?(filter[TABLE]) if [TYPE_DE_CHAMP, TYPE_DE_CHAMP_PRIVATE].include?(filter[TABLE])
find_type_de_champ(filter[COLUMN]).dynamic_type.filter_to_human(filter['value']) find_type_de_champ(filter[COLUMN]).dynamic_type.filter_to_human(filter['value'])
elsif filter['column'] == 'state' elsif filter['column'] == 'state'
Dossier.human_attribute_name("state.#{filter['value']}") if filter['value'] == 'pending_correction'
Dossier.human_attribute_name("pending_correction.for_instructeur")
else
Dossier.human_attribute_name("state.#{filter['value']}")
end
elsif filter['table'] == 'groupe_instructeur' && filter['column'] == 'id' elsif filter['table'] == 'groupe_instructeur' && filter['column'] == 'id'
instructeur.groupe_instructeurs instructeur.groupe_instructeurs
.find { _1.id == filter['value'].to_i }&.label || filter['value'] .find { _1.id == filter['value'].to_i }&.label || filter['value']

1
config/locales/views/instructeurs/fr.yml
View file

@ -19,6 +19,7 @@ fr:
classe_sans_suite: Le %{processed_at}, %{email} a classé ce dossier sans suite classe_sans_suite: Le %{processed_at}, %{email} a classé ce dossier sans suite
filterable_state: filterable_state:
en_construction: "En construction" en_construction: "En construction"
pending_correction: "En attente"
en_instruction: "En instruction" en_instruction: "En instruction"
accepte: "Accepté" accepte: "Accepté"
refuse: "Refusé" refuse: "Refusé"