DGNum/demarches-normaliennes
13
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
Download patch file Download diff file Expand all files Collapse all files

18
app/models/procedure_overview.rb
View file

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