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

correctif(export.pdf): ETQ expert, lorsque j'exporte un dossier au format PDF, celui ci contenient les avis non confidentiels ainsi que mes avis

Browse source
This commit is contained in:
Martin 2023-03-28 16:56:02 +02:00
parent 4f9c45c489
commit c6e9674de2
5 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -147,7 +147,7 @@ module Experts
end
def telecharger_pjs
files = ActiveStorage::DownloadableFile.create_list_from_dossiers(Dossier.where(id: @dossier.id))
files = ActiveStorage::DownloadableFile.create_list_from_dossiers(Dossier.where(id: @dossier.id), include_avis_for_expert: current_expert)
cleaned_files = ActiveStorage::DownloadableFile.cleanup_list_from_dossier(files)
zipline(cleaned_files, "dossier-#{@dossier.id}.zip")

10
app/lib/active_storage/downloadable_file.rb
View file

@ -1,6 +1,12 @@
class ActiveStorage::DownloadableFile
def self.create_list_from_dossiers(dossiers, with_bills: false, with_champs_private: false, include_infos_administration: false)
PiecesJustificativesService.generate_dossier_export(dossiers, include_infos_administration:) +
def self.create_list_from_dossiers(
dossiers,
with_bills: false,
with_champs_private: false,
include_infos_administration: false,
include_avis_for_expert: false
)
PiecesJustificativesService.generate_dossier_export(dossiers, include_infos_administration:, include_avis_for_expert:) +
PiecesJustificativesService.liste_documents(dossiers, with_bills:, with_champs_private:)
end

3
app/services/pieces_justificatives_service.rb
View file

@ -83,7 +83,7 @@ class PiecesJustificativesService
end
end
def self.generate_dossier_export(dossiers, include_infos_administration: false)
def self.generate_dossier_export(dossiers, include_infos_administration: false, include_avis_for_expert: false)
return [] if dossiers.empty?
pdfs = []
@ -98,6 +98,7 @@ class PiecesJustificativesService
.render(template: 'dossiers/show', formats: [:pdf],
assigns: {
include_infos_administration:,
include_avis_for_expert:,
dossier: dossier
})

8
app/views/dossiers/show.pdf.prawn
View file

@ -288,10 +288,10 @@ prawn_document(page_size: "A4") do |pdf|
end
if @include_avis_for_expert && @dossier.avis.present?
add_title(pdf, "Avis")
@dossier.avis_for_expert(@include_avis_for_expert).each do |avis|
add_avis(pdf, avis)
end
add_title(pdf, "Avis")
@dossier.avis_for_expert(@include_avis_for_expert).each do |avis|
add_avis(pdf, avis)
end
end
if @dossier.commentaires.present?

2
spec/controllers/instructeurs/dossiers_controller_spec.rb
View file

@ -873,7 +873,7 @@ describe Instructeurs::DossiersController, type: :controller do
end
before do
allow(PiecesJustificativesService).to receive(:generate_dossier_export).with([dossier], include_infos_administration: true).and_call_original
allow(PiecesJustificativesService).to receive(:generate_dossier_export).with([dossier], include_infos_administration: true, include_avis_for_expert: false).and_call_original
end
it 'includes an attachment' do