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

Merge pull request #9003 from tchak/fix-dossiers-suivis-filter

Browse source 
ETQ Instructeur, je ne veux pas voir les dossiers terminés dans l'onglet "suivis"
This commit is contained in:
Colin Darie 2023-05-04 16:38:16 +00:00 committed by GitHub
commit e38c6ed73d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/dossier.rb
View file

@ -432,8 +432,8 @@ class Dossier < ApplicationRecord
when 'suivis'
instructeur
.followed_dossiers
.en_cours
.merge(visible_by_administration)
.en_cours
when 'traites'
visible_by_administration.termine
when 'tous'

21
spec/models/procedure_presentation_spec.rb
View file

@ -829,15 +829,33 @@ describe ProcedurePresentation do
end
describe '#filtered_sorted_ids' do
let(:procedure_presentation) { create(:procedure_presentation, assign_to:) }
let(:dossier_1) { create(:dossier) }
let(:dossier_2) { create(:dossier) }
let(:dossier_3) { create(:dossier) }
let(:dossiers) { Dossier.where(id: [dossier_1, dossier_2, dossier_3].map(&:id)) }
let(:sorted_ids) { [dossier_2, dossier_3, dossier_1].map(&:id) }
let(:statut) { 'tous' }
subject { procedure_presentation.filtered_sorted_ids(dossiers, 'tous') }
subject { procedure_presentation.filtered_sorted_ids(dossiers, statut) }
context 'with no filters' do
let(:statut) { 'suivis' }
let(:dossiers) { procedure.dossiers }
before do
create(:follow, dossier: en_construction_dossier, instructeur: procedure_presentation.instructeur)
create(:follow, dossier: accepte_dossier, instructeur: procedure_presentation.instructeur)
end
let(:en_construction_dossier) { create(:dossier, :en_construction, procedure:) }
let(:accepte_dossier) { create(:dossier, :accepte, procedure:) }
it { is_expected.to contain_exactly(en_construction_dossier.id) }
end
context 'with mocked sorted_ids' do
before do
expect(procedure_presentation).to receive(:sorted_ids).and_return(sorted_ids)
end
@ -855,6 +873,7 @@ describe ProcedurePresentation do
it { is_expected.to eq(sorted_ids) }
end
end
end
describe '#field_enum' do
context "field is groupe_instructeur" do