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

add justificatif_motivation field to batch operation accepter

Browse source
This commit is contained in:
Lisa Durand 2022-12-19 15:03:39 +01:00
parent 1bc0609543
commit 59468fe351
4 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/components/dossiers/batch_operation_component/batch_operation_component.html.haml
View file

@ -24,6 +24,10 @@
.motivation.hidden{ class: 'accept' }
= form.text_area :motivation, class: 'motivation-text-area'
.optional-justificatif{ id: "justificatif_motivation_suggest_accept", onclick: "DS.showImportJustificatif('accept');" }
.button Ajouter un justificatif (optionnel)
.hidden{ id: "justificatif_motivation_import_accept" }
= form.file_field :justificatif_motivation, direct_upload: true
.text-right
%span{ onclick: 'DS.motivationCancel();', class: 'fr-btn fr-btn--secondary' } Annuler

2
app/controllers/instructeurs/batch_operations_controller.rb
View file

@ -13,7 +13,7 @@ module Instructeurs
def batch_operation_params
params.require(:batch_operation)
.permit(:operation, :motivation, dossier_ids: [])
.permit(:operation, :motivation, :justificatif_motivation, dossier_ids: [])
.merge(instructeur: current_instructeur)
end

4
app/models/batch_operation.rb
View file

@ -27,7 +27,7 @@ class BatchOperation < ApplicationRecord
has_many :groupe_instructeurs, through: :dossier_operations
belongs_to :instructeur
store_accessor :payload, :motivation
store_accessor :payload, :motivation, :justificatif_motivation
validates :operation, presence: true
@ -73,7 +73,7 @@ class BatchOperation < ApplicationRecord
when BatchOperation.operations.fetch(:passer_en_instruction)
dossier.passer_en_instruction(instructeur: instructeur)
when BatchOperation.operations.fetch(:accepter)
dossier.accepter(instructeur: instructeur, motivation: motivation)
dossier.accepter(instructeur: instructeur, motivation: motivation, justificatif: justificatif_motivation)
end
end

16
spec/jobs/batch_operation_process_one_job_spec.rb
View file

@ -67,6 +67,22 @@ describe BatchOperationProcessOneJob, type: :job do
end
end
context 'when operation is "accepter" with justificatif' do
let(:fake_justificatif) { ActiveStorage::Blob.create_and_upload!(io: StringIO.new("ma justification"), filename: 'piece_justificative_0.pdf', content_type: 'application/pdf') }
let(:batch_operation) do
create(:batch_operation, :accepter,
options.merge(instructeur: create(:instructeur), motivation: 'motivation', justificatif_motivation: fake_justificatif.signed_id))
end
it 'accepts the dossier in the batch with a justificatif' do
expect { subject.perform_now }
.to change { dossier_job.reload.justificatif_motivation.filename }
.from(nil)
.to(fake_justificatif.filename)
end
end
context 'when the dossier is out of sync (ie: someone applied a transition somewhere we do not know)' do
let(:instructeur) { create(:instructeur) }
let(:procedure) { create(:simple_procedure, instructeurs: [instructeur]) }