Revert "Merge pull request #5710 from betagouv/revert-5705-feat/5701"
This reverts commitaae77c77b0
, reversing changes made to4c2c5c630c
.
This commit is contained in:
parent
70f30560f0
commit
4b2e3b5be7
8 changed files with 45 additions and 1 deletions
BIN
app/assets/images/logo-france-connect.png
Normal file
BIN
app/assets/images/logo-france-connect.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 7.3 KiB |
|
@ -188,6 +188,9 @@ prawn_document(page_size: "A4") do |pdf|
|
|||
|
||||
add_title(pdf, "Identité du demandeur")
|
||||
|
||||
if @dossier.user.france_connect_information.present?
|
||||
format_in_2_columns(pdf, 'Informations France Connect', "Le dossier a été déposé par le compte de #{@dossier.individual.prenom} #{@dossier.individual.nom}, authentifié par France Connect le #{@dossier.individual.updated_at.strftime('%d/%m/%Y')}")
|
||||
end
|
||||
format_in_2_columns(pdf, "Email", @dossier.user.email)
|
||||
add_identite_individual(pdf, @dossier) if @dossier.individual.present?
|
||||
render_identite_etablissement(pdf, @dossier.etablissement) if @dossier.etablissement.present?
|
||||
|
|
|
@ -5,6 +5,8 @@
|
|||
|
||||
.tab-title Identité du demandeur
|
||||
.card
|
||||
- if dossier.user.france_connect_information.present?
|
||||
= render partial: "shared/dossiers/france_connect_informations", locals: { individual: dossier.individual }
|
||||
= render partial: "shared/dossiers/user_infos", locals: { user: dossier.user }
|
||||
|
||||
- if dossier.etablissement.present?
|
||||
|
|
|
@ -21,7 +21,8 @@
|
|||
Votre dossier est enregistré automatiquement après chaque modification. Vous pouvez à tout moment fermer la fenêtre et reprendre plus tard là où vous en étiez.
|
||||
- else
|
||||
Pour enregistrer votre dossier et le reprendre plus tard, cliquez sur le bouton « Enregistrer le brouillon » en bas à gauche du formulaire.
|
||||
|
||||
- if !apercu && dossier.user.france_connect_information.present?
|
||||
= render partial: "shared/dossiers/france_connect_informations", locals: { individual: dossier.individual }
|
||||
- if notice_url(dossier.procedure).present?
|
||||
= link_to notice_url(dossier.procedure), target: '_blank', rel: 'noopener', class: 'button notice', title: "Pour vous aider à remplir votre dossier, vous pouvez consulter le guide de cette démarche." do
|
||||
%span.icon.info>
|
||||
|
|
|
@ -0,0 +1,4 @@
|
|||
.card.featured
|
||||
.flex.justify-center
|
||||
= image_tag "logo-france-connect.png", alt: "France Connect logo", width: 200, class: "mb-2"
|
||||
.card-title Le dossier a été déposé par le compte de #{individual.prenom} #{individual.nom}, authentifié par France Connect le #{individual.updated_at.strftime('%d/%m/%Y')}.
|
|
@ -68,6 +68,10 @@ feature 'France Connect Particulier Connexion' do
|
|||
scenario 'he is redirected to user dossiers page' do
|
||||
expect(page).to have_content('Dossiers')
|
||||
end
|
||||
|
||||
scenario 'the updated_at date is well updated' do
|
||||
expect(france_connect_information.updated_at).not_to eq(france_connect_information.created_at)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -18,4 +18,19 @@ describe 'instructeurs/dossiers/show.html.haml', type: :view do
|
|||
expect(rendered).to have_text('Identité')
|
||||
expect(rendered).to have_text('Demande')
|
||||
end
|
||||
|
||||
context 'when the user is logged in with france connect' do
|
||||
let(:france_connect_information) { build(:france_connect_information) }
|
||||
let(:user) { build(:user, france_connect_information: france_connect_information) }
|
||||
let(:procedure1) { create(:procedure, :with_type_de_champ, for_individual: true) }
|
||||
let(:dossier) { create(:dossier, procedure: procedure1, user: user) }
|
||||
|
||||
before do
|
||||
render
|
||||
end
|
||||
|
||||
it 'fills the individual with the informations from France Connect' do
|
||||
expect(rendered).to have_text("Le dossier a été déposé par le compte de #{dossier.individual.prenom} #{dossier.individual.nom}, authentifié par France Connect le #{dossier.individual.updated_at.strftime('%d/%m/%Y')}")
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -33,4 +33,19 @@ describe 'users/dossiers/demande.html.haml', type: :view do
|
|||
|
||||
it { expect(rendered).not_to have_text('Déposé le') }
|
||||
end
|
||||
|
||||
context 'when the user is logged in with france connect' do
|
||||
let(:france_connect_information) { build(:france_connect_information) }
|
||||
let(:user) { build(:user, france_connect_information: france_connect_information) }
|
||||
let(:procedure1) { create(:procedure, :with_type_de_champ, for_individual: true) }
|
||||
let(:dossier) { create(:dossier, procedure: procedure1, user: user) }
|
||||
|
||||
before do
|
||||
render
|
||||
end
|
||||
|
||||
it 'fills the individual with the informations from France Connect' do
|
||||
expect(rendered).to have_text("Le dossier a été déposé par le compte de #{dossier.individual.prenom} #{dossier.individual.nom}, authentifié par France Connect le #{dossier.individual.updated_at.strftime('%d/%m/%Y')}")
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue