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

remove deleted dossier from filter and search

Browse source
This commit is contained in:
Lisa Durand 2024-07-22 11:35:59 +02:00
parent 30df5aa89a
commit a0a9270a61
No known key found for this signature in database
GPG key ID: 0DF91F2CA1E8B816
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/users/dossiers_controller.rb
View file

@ -26,15 +26,13 @@ module Users
def index def index
ordered_dossiers = Dossier.includes(:procedure).order_by_updated_at ordered_dossiers = Dossier.includes(:procedure).order_by_updated_at
deleted_dossiers = current_user.deleted_dossiers.includes(:procedure).order_by_updated_at @dossiers_supprimes_historique = current_user.deleted_dossiers.includes(:procedure).order_by_updated_at
user_revisions = ProcedureRevision.where(dossiers: current_user.dossiers.visible_by_user) user_revisions = ProcedureRevision.where(dossiers: current_user.dossiers.visible_by_user)
invite_revisions = ProcedureRevision.where(dossiers: current_user.dossiers_invites.visible_by_user) invite_revisions = ProcedureRevision.where(dossiers: current_user.dossiers_invites.visible_by_user)
deleted_dossier_procedures = Procedure.where(id: deleted_dossiers.pluck(:procedure_id))
all_dossier_procedures = Procedure.where(revisions: user_revisions.or(invite_revisions)) all_dossier_procedures = Procedure.where(revisions: user_revisions.or(invite_revisions))
@procedures_for_select = all_dossier_procedures @procedures_for_select = all_dossier_procedures
.or(deleted_dossier_procedures)
.distinct(:procedure_id) .distinct(:procedure_id)
.order(:libelle) .order(:libelle)
.pluck(:libelle, :id) .pluck(:libelle, :id)
@ -42,14 +40,12 @@ module Users
@procedure_id = params[:procedure_id] @procedure_id = params[:procedure_id]
if @procedure_id.present? if @procedure_id.present?
ordered_dossiers = ordered_dossiers.where(procedures: { id: @procedure_id }) ordered_dossiers = ordered_dossiers.where(procedures: { id: @procedure_id })
deleted_dossiers = deleted_dossiers.where(procedures: { id: @procedure_id })
end end
@search_terms = params[:q] @search_terms = params[:q]
if @search_terms.present? if @search_terms.present?
dossiers_filter_by_search = DossierSearchService.matching_dossiers_for_user(@search_terms, current_user).page dossiers_filter_by_search = DossierSearchService.matching_dossiers_for_user(@search_terms, current_user).page
ordered_dossiers = ordered_dossiers.merge(dossiers_filter_by_search) ordered_dossiers = ordered_dossiers.merge(dossiers_filter_by_search)
deleted_dossiers = nil
end end
@dossiers_visibles = ordered_dossiers.visible_by_user.preload(:etablissement, :individual, :invites) @dossiers_visibles = ordered_dossiers.visible_by_user.preload(:etablissement, :individual, :invites)