From 968aa92d7735546a5bd406a3c1796ebf3a4d8589 Mon Sep 17 00:00:00 2001 From: Tanguy PATTE Date: Thu, 8 Oct 2015 11:22:55 +0200 Subject: [PATCH] [#920] prefill siret when user has a siret --- app/controllers/users/siret_controller.rb | 1 + app/views/users/siret/_pro.html.haml | 4 ++-- app/views/users/siret/index.html.haml | 5 ----- spec/features/france_connect/france_connect_spec.rb | 4 ++++ 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/controllers/users/siret_controller.rb b/app/controllers/users/siret_controller.rb index 99b861f27..713f69c26 100644 --- a/app/controllers/users/siret_controller.rb +++ b/app/controllers/users/siret_controller.rb @@ -1,6 +1,7 @@ class Users::SiretController < UsersController def index @procedure = Procedure.find(params['procedure_id']) + @siret = current_user.siret rescue ActiveRecord::RecordNotFound error_procedure end diff --git a/app/views/users/siret/_pro.html.haml b/app/views/users/siret/_pro.html.haml index 758c0ce8b..2ca1981c7 100644 --- a/app/views/users/siret/_pro.html.haml +++ b/app/views/users/siret/_pro.html.haml @@ -1,11 +1,11 @@ %p.lead{id: 'pro_section'} %h2#titre_procedure.text-info - =@procedure.libelle + = @procedure.libelle %br = form_tag(url_for({controller: :dossiers, action: :create}), class: 'form-inline', method: 'POST') do |f| .form-group.form-group-lg - = text_field_tag :siret, nil, :class => "form-control", :placeholder => "Entrez votre Siret", :id => "siret", :name => "siret", :maxlength => 14, :style => 'margin-bottom:10px' + = text_field_tag :siret, nil, :class => "form-control", :placeholder => "Entrez votre Siret", :id => "siret", :name => "siret", :maxlength => 14, :style => 'margin-bottom:10px', value: @siret %br = submit_tag "Commencer", class: %w(btn btn-lg btn-success), style: 'margin-top:20px;', data: { disable_with: "Commencer", submit: true} %input{type: 'hidden', value: "#{@procedure.id}", name: 'procedure_id', id: 'procedure_id'} diff --git a/app/views/users/siret/index.html.haml b/app/views/users/siret/index.html.haml index 521d6f472..246f1cd91 100644 --- a/app/views/users/siret/index.html.haml +++ b/app/views/users/siret/index.html.haml @@ -1,9 +1,4 @@ .container.center#users_siret_index - %h1.cover-heading TéléProcédure administrative Simplifiée - %br - %p{style: 'width:67%; margin-left:auto; margin-right:auto'} - Site de démonstration d’un service public de saisie d’un projet ou de dépôt d’une démarche administrative, auprès d’un ou plusieurs organismes publics, simplifié des informations déjà connues des administrations, grâce à la fourniture du numéro SIRET. - .row = render partial: 'pro' diff --git a/spec/features/france_connect/france_connect_spec.rb b/spec/features/france_connect/france_connect_spec.rb index 59852a582..59d96805f 100644 --- a/spec/features/france_connect/france_connect_spec.rb +++ b/spec/features/france_connect/france_connect_spec.rb @@ -72,6 +72,10 @@ feature 'France Connect Connexion' do scenario 'he is redirected to siret page' do expect(page).to have_css('#users_siret_index') end + + scenario 'the siret is already written in form' do + expect(page.find_by_id('siret').value).to have_content(siret) + end end end end