Merge branch 'develop' into staging

app/controllers/users/dossiers_controller.rb

@@ -48,6 +48,15 @@ class Users::DossiersController < UsersController
     @facade = facade
     @siret = current_user.siret unless current_user.siret.nil?
 
+    if @facade.procedure.for_individual? && current_user.loged_in_with_france_connect?
+      individual = @facade.dossier.individual
+
+      individual.update_column :gender, @facade.dossier.france_connect_information.gender
+      individual.update_column :nom, @facade.dossier.france_connect_information.family_name
+      individual.update_column :prenom, @facade.dossier.france_connect_information.given_name
+      individual.update_column :birthdate, @facade.dossier.france_connect_information.birthdate.strftime("%d/%m/%Y")
+    end
+
   rescue ActiveRecord::RecordNotFound
     flash.alert = t('errors.messages.dossier_not_found')
     redirect_to url_for users_dossiers_path
@@ -132,7 +141,7 @@ class Users::DossiersController < UsersController
   end
 
   def update_params
-    params.require(:dossier).permit(:id, :autorisation_donnees, individual_attributes: [:nom, :prenom, :birthdate])
+    params.require(:dossier).permit(:id, :autorisation_donnees, individual_attributes: [:gender, :nom, :prenom, :birthdate])
   end
 
   def checked_autorisation_donnees?

app/views/dossiers/etapes/etape_2/_individual.html.haml

@@ -13,6 +13,11 @@
       = f.hidden_field :id
 
       = f.fields_for :individual, @facade.individual do |ff|
+        .form-group
+          %label
+            %h4
+              Civilité
+            = ff.select :gender, ['Mr', 'Mme']
         .form-group
           %label
             %h4

db/migrate/20161006085422_add_gender_in_individual_table.rb

@@ -0,0 +1,5 @@
+class AddGenderInIndividualTable < ActiveRecord::Migration
+  def change
+    add_column :individuals, :gender, :string
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20161005144657) do
+ActiveRecord::Schema.define(version: 20161006085422) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -218,6 +218,7 @@ ActiveRecord::Schema.define(version: 20161005144657) do
     t.string  "prenom"
     t.string  "birthdate"
     t.integer "dossier_id"
+    t.string  "gender"
   end
 
   create_table "invites", force: :cascade do |t|