diff --git a/app/components/dossiers/user_filter_component.rb b/app/components/dossiers/user_filter_component.rb index 0c890aef8..24061ec9a 100644 --- a/app/components/dossiers/user_filter_component.rb +++ b/app/components/dossiers/user_filter_component.rb @@ -15,7 +15,7 @@ class Dossiers::UserFilterComponent < ApplicationComponent def states_collection(statut) case statut when 'en-cours' - (Dossier.states.values - Dossier::TERMINE) << "a_corriger" + (Dossier.states.values - Dossier::TERMINE) << Dossier::A_CORRIGER when 'traites' Dossier::TERMINE end.map { |state| [t("activerecord.attributes.dossier/state.#{state}"), state] } diff --git a/app/models/concerns/dossier_correctable_concern.rb b/app/models/concerns/dossier_correctable_concern.rb index 0c9b3455e..721d19a76 100644 --- a/app/models/concerns/dossier_correctable_concern.rb +++ b/app/models/concerns/dossier_correctable_concern.rb @@ -2,6 +2,7 @@ module DossierCorrectableConcern extend ActiveSupport::Concern included do + A_CORRIGER = 'a_corriger' has_many :corrections, class_name: 'DossierCorrection', dependent: :destroy scope :with_pending_corrections, -> { joins(:corrections).where(corrections: { resolved_at: nil }) } diff --git a/app/models/dossiers_filter.rb b/app/models/dossiers_filter.rb index dc12fc076..66163b534 100644 --- a/app/models/dossiers_filter.rb +++ b/app/models/dossiers_filter.rb @@ -21,8 +21,8 @@ class DossiersFilter def filter_procedures(dossiers) return dossiers if filter_params.blank? dossiers_result = dossiers - dossiers_result = dossiers_result.where(state: state) if state.present? && state != "a_corriger" - dossiers_result = dossiers_result.with_pending_corrections if state.present? && state == "a_corriger" + dossiers_result = dossiers_result.where(state: state) if state.present? && state != Dossier::A_CORRIGER + dossiers_result = dossiers_result.with_pending_corrections if state.present? && state == Dossier::A_CORRIGER dossiers_result = dossiers_result.where('dossiers.created_at >= ?', from_created_at_date) if from_created_at_date.present? dossiers_result = dossiers_result.where('dossiers.depose_at >= ?', from_depose_at_date) if from_depose_at_date.present? dossiers_result