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

add filtering by group in procedure_overview

Browse source 
The weekly overview do not work for instructeurs in procedures with multiples groups ;
they see dossiers that they do not have access to. Now the correct filter is added
This commit is contained in:
clemkeirua 2020-01-15 14:57:40 +01:00
parent 6a7f48e00a
commit 7e15c6a4a4
4 changed files with 34 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/instructeur.rb
View file

@ -76,7 +76,7 @@ class Instructeur < ApplicationRecord
active_procedure_overviews = procedures active_procedure_overviews = procedures
.publiees .publiees
.map { |procedure| procedure.procedure_overview(start_date) } .map { |procedure| procedure.procedure_overview(start_date, groupe_instructeurs) }
.filter(&:had_some_activities?) .filter(&:had_some_activities?)
if active_procedure_overviews.count == 0 if active_procedure_overviews.count == 0

4
app/models/procedure.rb
View file

@ -464,8 +464,8 @@ class Procedure < ApplicationRecord
export(dossiers).to_ods export(dossiers).to_ods
end end
def procedure_overview(start_date) def procedure_overview(start_date, groups)
ProcedureOverview.new(self, start_date) ProcedureOverview.new(self, start_date, groups)
end end
def initiated_mail_template def initiated_mail_template

18
app/models/procedure_overview.rb
View file

@ -6,24 +6,24 @@ class ProcedureOverview
:dossiers_en_construction_count, :dossiers_en_construction_count,
:old_dossiers_en_construction :old_dossiers_en_construction
def initialize(procedure, start_date) def initialize(procedure, start_date, groups)
@start_date = start_date @start_date = start_date
@procedure = procedure @procedure = procedure
@dossiers_en_instruction_count = procedure.dossiers.state_en_instruction.count dossiers = procedure.dossiers
@old_dossiers_en_instruction = procedure dossiers = dossiers.where(groupe_instructeur: groups) if procedure.routee?
.dossiers
@dossiers_en_instruction_count = dossiers.state_en_instruction.count
@old_dossiers_en_instruction = dossiers
.state_en_instruction .state_en_instruction
.where('en_instruction_at < ?', 1.week.ago) .where('en_instruction_at < ?', 1.week.ago)
@dossiers_en_construction_count = procedure.dossiers.state_en_construction.count @dossiers_en_construction_count = dossiers.state_en_construction.count
@old_dossiers_en_construction = procedure @old_dossiers_en_construction = dossiers
.dossiers
.state_en_construction .state_en_construction
.where('en_construction_at < ?', 1.week.ago) .where('en_construction_at < ?', 1.week.ago)
@created_dossiers_count = procedure @created_dossiers_count = dossiers
.dossiers
.where(created_at: start_date..Time.zone.now) .where(created_at: start_date..Time.zone.now)
.state_not_brouillon .state_not_brouillon
.count .count

23
spec/models/procedure_overview_spec.rb
View file

@ -8,7 +8,7 @@ describe ProcedureOverview, type: :model do
before { Timecop.freeze(friday) } before { Timecop.freeze(friday) }
after { Timecop.return } after { Timecop.return }
let(:procedure_overview) { ProcedureOverview.new(procedure, monday) } let(:procedure_overview) { ProcedureOverview.new(procedure, monday, []) }
describe 'dossiers_en_instruction_count' do describe 'dossiers_en_instruction_count' do
let!(:en_instruction_dossier) do let!(:en_instruction_dossier) do
@ -56,6 +56,27 @@ describe ProcedureOverview, type: :model do
it { expect(procedure_overview.created_dossiers_count).to eq(1) } it { expect(procedure_overview.created_dossiers_count).to eq(1) }
end end
describe 'with a procedure routee' do
let!(:gi_2) { procedure.groupe_instructeurs.create(label: 'groupe instructeur 2') }
let!(:gi_3) { procedure.groupe_instructeurs.create(label: 'groupe instructeur 3') }
def create_dossier_in_group(g)
create(:dossier, procedure: procedure, created_at: monday, state: Dossier.states.fetch(:en_instruction), groupe_instructeur: g)
end
let!(:created_dossier_during_the_week_on_group_2) { create_dossier_in_group(gi_2) }
let!(:created_dossier_during_the_week_on_group_3_a) { create_dossier_in_group(gi_3) }
let!(:created_dossier_during_the_week_on_group_3_b) { create_dossier_in_group(gi_3) }
let(:procedure_overview_gi_2) { ProcedureOverview.new(procedure, monday, [gi_2]) }
let(:procedure_overview_gi_3) { ProcedureOverview.new(procedure, monday, [gi_3]) }
let(:procedure_overview_default) { ProcedureOverview.new(procedure, monday, [procedure.defaut_groupe_instructeur]) }
it { expect(procedure_overview_gi_2.created_dossiers_count).to eq(1) }
it { expect(procedure_overview_gi_3.created_dossiers_count).to eq(2) }
it { expect(procedure_overview_default.created_dossiers_count).to eq(0) }
end
describe 'had_some_activities?' do describe 'had_some_activities?' do
subject { procedure_overview.had_some_activities? } subject { procedure_overview.had_some_activities? }