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

l'expert ne voit pas les dossiers supprimés par l'instructeur

Browse source
This commit is contained in:
Kara Diaby 2021-12-14 15:21:03 +01:00
parent 051d7b2028
commit b408811c5a
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/experts/avis_controller.rb
View file

@ -12,13 +12,13 @@ module Experts
DONNES_STATUS = 'donnes' DONNES_STATUS = 'donnes'
def index def index
avis = current_expert.avis.includes(dossier: [groupe_instructeur: :procedure]) avis = current_expert.avis.includes(dossier: [groupe_instructeur: :procedure]).not_hidden_by_administration
@avis_by_procedure = avis.to_a.group_by(&:procedure) @avis_by_procedure = avis.to_a.group_by(&:procedure)
end end
def procedure def procedure
@procedure = Procedure.find(params[:procedure_id]) @procedure = Procedure.find(params[:procedure_id])
expert_avis = current_expert.avis.includes(:dossier).where(dossiers: { groupe_instructeur: GroupeInstructeur.where(procedure: @procedure.id) }) expert_avis = current_expert.avis.includes(:dossier).not_hidden_by_administration.where(dossiers: { groupe_instructeur: GroupeInstructeur.where(procedure: @procedure.id) })
@avis_a_donner = expert_avis.without_answer @avis_a_donner = expert_avis.without_answer
@avis_donnes = expert_avis.with_answer @avis_donnes = expert_avis.with_answer

2
app/models/avis.rb
View file

@ -50,7 +50,7 @@ class Avis < ApplicationRecord
scope :updated_since?, -> (date) { where('avis.updated_at > ?', date) } scope :updated_since?, -> (date) { where('avis.updated_at > ?', date) }
scope :discarded_termine_expired, -> { unscope(:joins).where(dossier: Dossier.discarded_termine_expired) } scope :discarded_termine_expired, -> { unscope(:joins).where(dossier: Dossier.discarded_termine_expired) }
scope :discarded_en_construction_expired, -> { unscope(:joins).where(dossier: Dossier.discarded_en_construction_expired) } scope :discarded_en_construction_expired, -> { unscope(:joins).where(dossier: Dossier.discarded_en_construction_expired) }
scope :not_hidden_by_administration, -> { where(dossiers: { hidden_by_administration_at: nil }) }
# The form allows subtmitting avis requests to several emails at once, # The form allows subtmitting avis requests to several emails at once,
# hence this virtual attribute. # hence this virtual attribute.
attr_accessor :emails attr_accessor :emails

2
app/models/expert.rb
View file

@ -29,7 +29,7 @@ class Expert < ApplicationRecord
@avis_summary @avis_summary
else else
query = <<~EOF query = <<~EOF
COUNT(*) FILTER (where answer IS NULL) AS unanswered, COUNT(*) FILTER (where answer IS NULL AND dossiers.hidden_by_instructeur_at IS NULL) AS unanswered,
COUNT(*) AS total COUNT(*) AS total
EOF EOF
result = avis.select(query)[0] result = avis.select(query)[0]