Merge branch 'staging'

2016-10-27 14:49:46 +02:00 · 2016-10-27 14:49:46 +02:00 · 2502c51185
commit 2502c51185
parent 3b2c61f090 d96462fb79
69 changed files with 1956 additions and 275 deletions
--- a/app/assets/javascripts/description.js
+++ b/app/assets/javascripts/description.js
@ -23,6 +23,7 @@ function action_type_de_champs() {
    });

    address_type_init();
+    toggle_header_section_composents();
 }

 function toggleErrorClass(node, boolean) {
@ -45,3 +46,21 @@ function validateEmail(email) {
 function validateInput(input, regex) {
    return regex.test(input);
 }
+
+function toggle_header_section_composents() {
+    $("a.mask_section_button").on('click', function (e) {
+        target = e.currentTarget;
+
+        header_section_id = target.id.split('mask_button_')[1];
+        header_section_composents = $(".header_section_" + header_section_id);
+
+        header_section_composents.slideToggle(200, function () {
+            if (header_section_composents.css('display') == 'none') {
+                $(target).html('Afficher la section <i class="fa fa-chevron-down" />')
+            }
+            else {
+                $(target).html('Masquer la section <i class="fa fa-chevron-up" />')
+            }
+        });
+    });
+}
--- a/app/assets/stylesheets/description.scss
+++ b/app/assets/stylesheets/description.scss
@ -57,7 +57,7 @@
  }
 }

-.type_champ-drop_down_list {
+.type_champ-drop_down_list, .type_champ-regions, .type_champ-departements, .type_champ-pays {
  @extend .col-md-4;
  @extend .col-lg-4;

--- a/app/controllers/admin/gestionnaires_controller.rb
+++ b/app/controllers/admin/gestionnaires_controller.rb
@ -21,8 +21,11 @@ class Admin::GestionnairesController < AdminController
      assign_gestionnaire!
    end

-    return redirect_to admin_procedure_accompagnateurs_path(procedure_id: procedure_id) unless procedure_id.nil?
-    redirect_to admin_gestionnaires_path
+    if procedure_id
+      redirect_to admin_procedure_accompagnateurs_path(procedure_id: procedure_id)
+    else
+      redirect_to admin_gestionnaires_path
+    end
  end

  def destroy
@ -30,19 +33,18 @@ class Admin::GestionnairesController < AdminController
    redirect_to admin_gestionnaires_path
  end

-
-  def create_gestionnaire_params
-    params.require(:gestionnaire).permit(:email)
-        .merge(password: SecureRandom.hex(5))
-        .merge(administrateurs: [current_administrateur])
-  end
-
  private

  def new_gestionnaire!
-    @gestionnaire = Gestionnaire.create(create_gestionnaire_params)
+    attributes = params.require(:gestionnaire).permit(:email)
+      .merge(password: SecureRandom.hex(5))
+
+    @gestionnaire = Gestionnaire.create(attributes.merge(
+      administrateurs: [current_administrateur]
+    ))

    if @gestionnaire.errors.messages.empty?
+      User.create(attributes) if Features.unified_login
      flash.notice = 'Accompagnateur ajouté'
      GestionnaireMailer.new_gestionnaire(@gestionnaire.email, @gestionnaire.password).deliver_now!
      GestionnaireMailer.new_assignement(@gestionnaire.email, current_administrateur.email).deliver_now!
--- a/app/controllers/gestionnaires/passwords_controller.rb
+++ b/app/controllers/gestionnaires/passwords_controller.rb
@ -1,4 +1,6 @@
 class Gestionnaires::PasswordsController < Devise::PasswordsController
+  after_action :try_to_authenticate_user, only: %i(update)
+
  # GET /resource/password/new
  # def new
  #   super
@ -29,4 +31,11 @@ class Gestionnaires::PasswordsController < Devise::PasswordsController
  # def after_sending_reset_password_instructions_path_for(resource_name)
  #   super(resource_name)
  # end
+
+  def try_to_authenticate_user
+    if gestionnaire_signed_in?
+      user = User.find_by(email: current_gestionnaire.email)
+      sign_in user if user
+    end
+  end
 end
--- a/app/controllers/users/description_controller.rb
+++ b/app/controllers/users/description_controller.rb
@ -65,7 +65,7 @@ class Users::DescriptionController < UsersController
        @dossier.initiated!
      end

-      flash.notice = 'Félicitation, votre demande a bien été enregistrée.'
+      flash.notice = 'Félicitations, votre demande a bien été enregistrée.'
      redirect_to url_for(controller: :recapitulatif, action: :show, dossier_id: @dossier.id)
    else
      flash.notice = 'Votre brouillon a bien été sauvegardé.'
--- a/app/controllers/users/dossiers_controller.rb
+++ b/app/controllers/users/dossiers_controller.rb
@ -131,6 +131,15 @@ class Users::DossiersController < UsersController
    }
  end

+  def destroy
+    dossier = current_user.dossiers.find(params[:id])
+    if dossier.brouillon?
+      dossier.destroy
+      flash.notice = 'Brouillon supprimé'
+    end
+    redirect_to url_for users_dossiers_path
+  end
+
  private

  def check_siret
--- a/app/controllers/users/passwords_controller.rb
+++ b/app/controllers/users/passwords_controller.rb
@ -1,4 +1,6 @@
 class Users::PasswordsController < Devise::PasswordsController
+  after_action :try_to_authenticate_gestionnaire, only: %i(update)
+
  # GET /resource/password/new
  # def new
  #   super
@ -29,4 +31,11 @@ class Users::PasswordsController < Devise::PasswordsController
  # def after_sending_reset_password_instructions_path_for(resource_name)
  #   super(resource_name)
  # end
+
+  def try_to_authenticate_gestionnaire
+    if user_signed_in?
+      gestionnaire = Gestionnaire.find_by(email: current_user.email)
+      sign_in gestionnaire if gestionnaire
+    end
+  end
 end
--- a/app/controllers/users/recapitulatif_controller.rb
+++ b/app/controllers/users/recapitulatif_controller.rb
@ -1,4 +1,5 @@
 class Users::RecapitulatifController < UsersController
+
  before_action only: [:show] do
    authorized_routes? self.class
  end
@ -27,7 +28,7 @@ class Users::RecapitulatifController < UsersController

  def self.route_authorization
    {
-        states: [:initiated, :replied, :updated, :validated, :submitted, :closed]
+        states: [:initiated, :replied, :updated, :validated, :received, :submitted, :without_continuation, :closed]
    }
  end

--- a/app/controllers/users/sessions_controller.rb
+++ b/app/controllers/users/sessions_controller.rb
@ -22,27 +22,45 @@ class Users::SessionsController < Sessions::SessionsController

 #POST /resource/sign_in
  def create
-    super
+    try_to_authenticate(User)
+    try_to_authenticate(Gestionnaire) if Features.unified_login

-    current_user.update_attributes(loged_in_with_france_connect: '')
+    if user_signed_in?
+      current_user.update_attributes(loged_in_with_france_connect: '')
+    end
+
+    if user_signed_in?
+      redirect_to after_sign_in_path_for(:user)
+    elsif gestionnaire_signed_in?
+      redirect_to backoffice_path
+    else
+      new
+      render :new, status: 401
+    end
  end

 # DELETE /resource/sign_out
  def destroy
-    connected_with_france_connect = current_user.loged_in_with_france_connect
-    current_user.update_attributes(loged_in_with_france_connect: '')
-
-    signed_out = (Devise.sign_out_all_scopes ? sign_out : sign_out(resource_name))
-    set_flash_message :notice, :signed_out if signed_out && is_flashing_format?
-    yield if block_given?
-
-    if connected_with_france_connect == 'entreprise'
-      redirect_to FRANCE_CONNECT.entreprise_logout_endpoint
-    elsif connected_with_france_connect == 'particulier'
-      redirect_to FRANCE_CONNECT.particulier_logout_endpoint
-    else
-      respond_to_on_destroy
+    if gestionnaire_signed_in?
+      sign_out :gestionnaire
    end
+
+    if user_signed_in?
+      connected_with_france_connect = current_user.loged_in_with_france_connect
+      current_user.update_attributes(loged_in_with_france_connect: '')
+
+      sign_out :user
+
+      if connected_with_france_connect == 'entreprise'
+        redirect_to FRANCE_CONNECT.entreprise_logout_endpoint
+        return
+      elsif connected_with_france_connect == 'particulier'
+        redirect_to FRANCE_CONNECT.particulier_logout_endpoint
+        return
+      end
+    end
+
+    respond_to_on_destroy
  end

  def no_procedure
@ -62,4 +80,13 @@ class Users::SessionsController < Sessions::SessionsController

    NumberService.to_number session["user_return_to"].split("?procedure_id=").second
  end
+
+  def try_to_authenticate(klass)
+    if resource = klass.find_for_database_authentication(email: params[:user][:email])
+      if resource.valid_password?(params[:user][:password])
+        sign_in resource
+        set_flash_message :notice, :signed_in
+      end
+    end
+  end
 end
--- a/app/facades/dossiers_list_facades.rb
+++ b/app/facades/dossiers_list_facades.rb
@ -4,6 +4,7 @@ class DossiersListFacades
  def initialize current_devise_profil, liste, procedure = nil
    @current_devise_profil = current_devise_profil
    @liste = liste
+    @liste = 'all_state' if Features.opensimplif
    @procedure = procedure
  end

@ -20,7 +21,7 @@ class DossiersListFacades
  end

  def gestionnaire_procedures_name_and_id_list
-    @current_devise_profil.procedures.order('libelle ASC').inject([]) { |acc, procedure|  acc.push({id: procedure.id, libelle: procedure.libelle})}
+    @current_devise_profil.procedures.order('libelle ASC').inject([]) { |acc, procedure| acc.push({id: procedure.id, libelle: procedure.libelle}) }
  end

  def procedure_id
@ -35,6 +36,12 @@ class DossiersListFacades
    @list_table_columns ||= @current_devise_profil.preference_list_dossiers.where(procedure: @procedure).order(:id)
  end

+  def active_filter? preference
+    return true if @procedure.nil? || preference.table != 'champs' || (preference.table == 'champs' && !preference.filter.blank?)
+
+    preference_list_dossiers_filter.where(table: :champs).where.not(filter: '').size == 0
+  end
+
  def brouillon_class
    (@liste == 'brouillon' ? 'active' : '')
  end
@ -47,6 +54,10 @@ class DossiersListFacades
    (@liste == 'a_traiter' ? 'active' : '')
  end

+  def en_construction_class
+    (@liste == 'a_traiter' ? 'active' : '')
+  end
+
  def en_attente_class
    (@liste == 'en_attente' ? 'active' : '')
  end
@ -92,13 +103,15 @@ class DossiersListFacades
  end

  def a_traiter_total
-    return service.waiting_for_gestionnaire.count if gestionnaire?
-    service.waiting_for_user.count if user?
+    service.waiting_for_gestionnaire.count
+  end
+
+  def en_construction_total
+    service.en_construction.count
  end

  def en_attente_total
-    return service.waiting_for_user.count if gestionnaire?
-    service.waiting_for_gestionnaire.count if user?
+    service.waiting_for_user.count
  end

  def valides_total
@ -141,6 +154,10 @@ class DossiersListFacades
    base_url 'a_traiter'
  end

+  def en_construction_url
+    base_url 'a_traiter'
+  end
+
  def en_attente_url
    base_url 'en_attente'
  end
@ -174,4 +191,5 @@ class DossiersListFacades
  def base_url liste
    @procedure.nil? ? backoffice_dossiers_path(liste: liste) : backoffice_dossiers_procedure_path(id: @procedure.id, liste: liste)
  end
+
 end
--- a/app/models/champ.rb
+++ b/app/models/champ.rb
@ -33,4 +33,16 @@ class Champ < ActiveRecord::Base
    end
    false
  end
+
+  def self.regions
+    JSON.parse(Carto::GeoAPI::Driver.regions).sort_by{|e| e['nom']}.inject([]){|acc, liste| acc.push(liste['nom']) }
+  end
+
+  def self.departements
+    JSON.parse(Carto::GeoAPI::Driver.departements).inject([]){|acc, liste| acc.push(liste['code'] + ' - ' + liste['nom']) }.push('99 - Étranger')
+  end
+
+  def self.pays
+    JSON.parse(Carto::GeoAPI::Driver.pays).inject([]){|acc, liste| acc.push(liste['nom']) }
+  end
 end
--- a/app/models/dossier.rb
+++ b/app/models/dossier.rb
@ -47,12 +47,13 @@ class Dossier < ActiveRecord::Base
  NOUVEAUX = %w(initiated)
  WAITING_FOR_GESTIONNAIRE = %w(updated)
  WAITING_FOR_USER = %w(replied validated)
-  WAITING_FOR_USER_WITHOUT_VALIDATED = %w(replied)
+  EN_CONSTRUCTION = %w(initiated updated replied)
  VALIDES = %w(validated)
  DEPOSES = %w(submitted)
  EN_INSTRUCTION = %w(submitted received)
  A_INSTRUIRE = %w(received)
  TERMINE = %w(closed refused without_continuation)
+  ALL_STATE = %w(draft initiated updated replied validated submitted received closed refused without_continuation)

  def retrieve_last_piece_justificative_by_type(type)
    pieces_justificatives.where(type_de_piece_justificative_id: type).last
@ -169,6 +170,10 @@ class Dossier < ActiveRecord::Base
    state
  end

+  def all_state?
+    ALL_STATE.include?(state)
+  end
+
  def brouillon?
    BROUILLON.include?(state)
  end
@ -185,8 +190,8 @@ class Dossier < ActiveRecord::Base
    WAITING_FOR_USER.include?(state)
  end

-  def waiting_for_user_without_validated?
-    WAITING_FOR_USER_WITHOUT_VALIDATED.include?(state)
+  def en_construction?
+    EN_CONSTRUCTION.include?(state)
  end

  def deposes?
@ -209,6 +214,10 @@ class Dossier < ActiveRecord::Base
    TERMINE.include?(state)
  end

+  def self.all_state order = 'ASC'
+    where(state: ALL_STATE, archived: false).order("updated_at #{order}")
+  end
+
  def self.brouillon order = 'ASC'
    where(state: BROUILLON, archived: false).order("updated_at #{order}")
  end
@ -225,8 +234,8 @@ class Dossier < ActiveRecord::Base
    where(state: WAITING_FOR_USER, archived: false).order("updated_at #{order}")
  end

-  def self.waiting_for_user_without_validated order = 'ASC'
-    where(state: WAITING_FOR_USER_WITHOUT_VALIDATED, archived: false).order("updated_at #{order}")
+  def self.en_construction order = 'ASC'
+    where(state: EN_CONSTRUCTION, archived: false).order("updated_at #{order}")
  end

  def self.valides order = 'ASC'
--- a/app/models/gestionnaire.rb
+++ b/app/models/gestionnaire.rb
@ -14,6 +14,7 @@ class Gestionnaire < ActiveRecord::Base

  after_create :build_default_preferences_list_dossier
  after_create :build_default_preferences_smart_listing_page
+  after_update :sync_credentials, if: -> { Features.unified_login }

  def dossiers_follow
    dossiers.joins(:follows).where("follows.gestionnaire_id = #{id}")
@ -84,4 +85,16 @@ class Gestionnaire < ActiveRecord::Base

    couples.include?({table: table, column: column})
  end
+
+  def sync_credentials
+    if email_changed? || encrypted_password_changed?
+      user = User.find_by(email: email_was)
+      if user
+        return user.update_columns(
+          email: email,
+          encrypted_password: encrypted_password)
+      end
+    end
+    true
+  end
 end
--- a/app/models/mail_received.rb
+++ b/app/models/mail_received.rb
@ -6,7 +6,7 @@ class MailReceived < MailTemplate
    self.body ||= "Bonjour,
                    <br>
                    <br>
-                    Votre administration vous confirme la bonne réception de votre dossier n°--numero_dossier-- complet. Celui-ci sera instruit dans le délais légal déclaré par votre interlocuteur.<br>
+                    Votre administration vous confirme la bonne réception de votre dossier n°--numero_dossier-- complet. Celui-ci sera instruit dans le délai légal déclaré par votre interlocuteur.<br>
                    <br>
                    En vous souhaitant une bonne journée,
                    <br>
--- a/app/models/preference_list_dossier.rb
+++ b/app/models/preference_list_dossier.rb
@ -23,7 +23,8 @@ class PreferenceListDossier < ActiveRecord::Base
    }

    columns = columns.merge({
-                      champs: columns_champs_procedure(procedure_id)
+                      champs: columns_champs_procedure(procedure_id),
+                      champs_private: columns_champs_private_procedure(procedure_id)
                  }) unless procedure_id.nil?

    columns
@ -103,6 +104,17 @@ class PreferenceListDossier < ActiveRecord::Base
    end
  end

+  def self.columns_champs_private_procedure procedure_id
+    table = 'champs_private'
+
+    Procedure.find(procedure_id).types_de_champ_private.inject({}) do |acc, type_de_champ|
+      acc = acc.merge({
+                          "type_de_champ_private_#{type_de_champ.id}" => create_column(type_de_champ.libelle, table, type_de_champ.id, 'value', 2)
+                      }) if type_de_champ.field_for_list?
+      acc
+    end
+  end
+
  def self.create_column libelle, table, attr, attr_decorate, bootstrap_lg
    {
        libelle: libelle,
--- a/app/models/type_de_champ.rb
+++ b/app/models/type_de_champ.rb
@ -12,6 +12,10 @@ class TypeDeChamp < ActiveRecord::Base
           address: 'address',
           yes_no: 'yes_no',
           drop_down_list: 'drop_down_list',
+           pays: 'pays',
+           regions: 'regions',
+           departements: 'departements',
+           engagement: 'engagement',
           header_section: 'header_section'
       }

--- a/app/models/user.rb
+++ b/app/models/user.rb
@ -15,6 +15,7 @@ class User < ActiveRecord::Base

  delegate :given_name, :family_name, :email_france_connect, :gender, :birthdate, :birthplace, :france_connect_particulier_id, to: :france_connect_information
  accepts_nested_attributes_for :france_connect_information
+  after_update :sync_credentials, if: -> { Features.unified_login }

  def self.find_for_france_connect email, siret
    user = User.find_by_email(email)
@ -33,4 +34,18 @@ class User < ActiveRecord::Base
  def invite? dossier_id
    invites.pluck(:dossier_id).include?(dossier_id.to_i)
  end
+
+  private
+
+  def sync_credentials
+    if email_changed? || encrypted_password_changed?
+      gestionnaire = Gestionnaire.find_by(email: email_was)
+      if gestionnaire
+        return gestionnaire.update_columns(
+          email: email,
+          encrypted_password: encrypted_password)
+      end
+    end
+    true
+  end
 end
--- a/app/services/dossiers_list_gestionnaire_service.rb
+++ b/app/services/dossiers_list_gestionnaire_service.rb
@ -11,11 +11,16 @@ class DossiersListGestionnaireService
     'en_attente' => waiting_for_user,
     'deposes' => deposes,
     'a_instruire' => a_instruire,
-     'termine' => termine}[@liste]
+     'termine' => termine,
+     'all_state' => all_state}[@liste]
  end

  def self.dossiers_liste_libelle
-    ['nouveaux', 'a_traiter', 'en_attente', 'deposes', 'a_instruire', 'termine']
+    ['nouveaux', 'a_traiter', 'en_attente', 'deposes', 'a_instruire', 'termine', 'all_state']
+  end
+
+  def all_state
+    @all_state ||= filter_dossiers.all_state
  end

  def nouveaux
@ -44,6 +49,7 @@ class DossiersListGestionnaireService

  def filter_dossiers
    @filter_dossiers ||= @procedure.nil? ? @current_devise_profil.dossiers.joins(joins_filter).where(where_filter) : @procedure.dossiers.joins(joins_filter).where(where_filter)
+    @filter_dossiers.uniq
  end

  def filter_procedure_reset!
@ -105,9 +111,10 @@ class DossiersListGestionnaireService

    reset_sort!

-    @current_devise_profil.preference_list_dossiers
-        .find_by(table: table, attr: attr, procedure: @procedure)
-        .update order: order
+    preference = @current_devise_profil.preference_list_dossiers
+                     .find_by(table: table, attr: attr, procedure: @procedure)
+
+    preference.update order: order unless (preference.nil?)
  end

  def reset_sort!
@ -119,7 +126,7 @@ class DossiersListGestionnaireService

  def joins_filter
    filter_preference_list.inject([]) do |acc, preference|
-      acc.push(preference.table.to_sym) unless preference.table.blank?
+      acc.push(preference.table.to_sym) unless preference.table.blank? || preference.filter.blank?
      acc
    end
  end
@ -127,12 +134,21 @@ class DossiersListGestionnaireService
  def where_filter
    filter_preference_list.inject('') do |acc, preference|
      unless preference.filter.blank?
-        filter = preference.filter.gsub('*', '%')
+        filter = preference.filter.gsub('*', '%').gsub("'", "''")
        filter = "%"+filter+"%" unless filter.include? '%'

+        value = preference.table_with_s_attr
+
+        if preference.table_attr.include?('champs')
+          value = 'champs.value'
+
+          acc += (acc.to_s.empty? ? ''.to_s : " AND ") +
+              'champs.type_de_champ_id = ' + preference.attr
+        end
+
        acc += (acc.to_s.empty? ? ''.to_s : " AND ") +
            "CAST(" +
-            preference.table_with_s_attr +
+            value +
            " as TEXT)" +
            " LIKE " +
            "'" +
@ -152,7 +168,7 @@ class DossiersListGestionnaireService

    @current_devise_profil.preference_list_dossiers
        .find_by(table: table, attr: attr, procedure: @procedure)
-        .update filter: filter
+        .update filter: filter.strip
  end

  private
--- a/app/services/dossiers_list_user_service.rb
+++ b/app/services/dossiers_list_user_service.rb
@ -6,33 +6,28 @@ class DossiersListUserService

  def dossiers_to_display
    {'brouillon' => brouillon,
-     'nouveaux' => nouveaux,
-     'a_traiter' => waiting_for_user,
-     'en_attente' => waiting_for_gestionnaire,
+     'a_traiter' => en_construction,
     'valides' => valides,
     'en_instruction' => en_instruction,
     'termine' => termine,
-     'invite' => invite}[@liste]
+     'invite' => invite,
+     'all_state' => all_state}[@liste]
  end

  def self.dossiers_liste_libelle
-    ['brouillon', 'nouveaux', 'a_traiter', 'en_attente', 'valides', 'en_instruction', 'termine', 'invite']
+    ['brouillon', 'a_traiter', 'valides', 'en_instruction', 'termine', 'invite', 'all_state']
+  end
+
+  def all_state
+    @all_state ||= @current_devise_profil.dossiers.all_state
  end

  def brouillon
    @brouillon ||= @current_devise_profil.dossiers.brouillon
  end

-  def nouveaux
-    @nouveaux ||= @current_devise_profil.dossiers.nouveaux
-  end
-
-  def waiting_for_gestionnaire
-    @waiting_for_gestionnaire ||= @current_devise_profil.dossiers.waiting_for_gestionnaire
-  end
-
-  def waiting_for_user
-    @waiting_for_user ||= @current_devise_profil.dossiers.waiting_for_user_without_validated
+  def en_construction
+    @en_construction ||= @current_devise_profil.dossiers.en_construction
  end

  def invite
--- a/app/uploaders/piece_justificative_uploader.rb
+++ b/app/uploaders/piece_justificative_uploader.rb
@ -20,7 +20,11 @@ class PieceJustificativeUploader < CarrierWave::Uploader::Base

  def cache_dir
    if Rails.env.production?
-      '/tmp/tps-cache'
+      if Features.opensimplif?
+        '/tmp/opensimplif-cache'
+      else
+        '/tmp/tps-cache'
+      end
    else
      '/tmp/tps-dev-cache'
    end
--- a/app/views/admin/procedures/show.html.haml
+++ b/app/views/admin/procedures/show.html.haml
@ -2,13 +2,18 @@
  =render partial: 'head', locals: {active: 'Informations'}

  -unless @facade.procedure.published?
-    %a#publish.btn.btn-success{"data-target" => "#publishModal", "data-toggle" => "modal", :type => "button", style:'float: right; margin-top: 10px'}
-      %i.fa.fa-eraser
-      Publier
+    - if @facade.procedure.gestionnaires.size == 0
+      %a.action_button.btn.btn-success{style:'float: right; margin-top: 10px', disabled: 'disabled', 'data-toggle' => :tooltip, title: 'Vous ne pouvez pas publier une procédure sans qu\'aucun accompagnateur ne soit affecté à celle-ci.'}
+        %i.fa.fa-eraser
+        Publier
+    -else
+      %a#publish.btn.btn-success{"data-target" => "#publishModal", "data-toggle" => "modal", :type => "button", style:'float: right; margin-top: 10px'}
+        %i.fa.fa-eraser
+        Publier

    =render partial: '/admin/procedures/modal_publish'

-  %a#transfer.btn.btn-small.btn-default{"data-target" => "#transferModal", "data-toggle" => "modal", :type => "button", style:'float: right; margin-top: 10px'}
+  %a#transfer.btn.btn-small.btn-default{"data-target" => "#transferModal", "data-toggle" => "modal", :type => "button", style:'float: right; margin-top: 10px; margin-right: 10px'}
    %i.fa.fa-exchange
    Transférer

--- a/app/views/backoffice/dossiers/_list.html.haml
+++ b/app/views/backoffice/dossiers/_list.html.haml
@ -2,10 +2,11 @@
  %thead
    - @dossiers_list_facade.preference_list_dossiers_filter.each do |preference|
      %th{class: "col-md-#{preference.bootstrap_lg} col-lg-#{preference.bootstrap_lg}"}
-        - if preference.table == 'champs'
+        - if preference.table.to_s.include? 'champs'
          = preference.libelle
        -else
          = smart_listing.sortable preference.libelle, preference.table_attr
+        - if @dossiers_list_facade.active_filter? preference
          %i.filter.fa.fa-filter{style: "cursor: pointer; margin-left:3px; font-size: 1.1em; color:#{(preference.filter.blank? ? 'grey' : 'orange')}", id: "filter_"+preference.table_attr.sub('.', '_')}
          = render partial: 'backoffice/dossiers/filter_framed', locals:{preference: preference, filter_framed_id: "framed_filter_"+preference.table_attr.sub('.', '_')}

@ -21,6 +22,8 @@
              - value = dossier.decorate.public_send(preference.attr_decorate)
            - elsif preference.table == 'champs'
              - value = dossier.champs.find_by_type_de_champ_id(preference.attr).value
+            - elsif preference.table == 'champs_private'
+              - value = dossier.champs_private.find_by_type_de_champ_id(preference.attr).value
            - else
              - begin
                - value = dossier.public_send(preference.table).decorate.public_send(preference.attr_decorate)
--- a/app/views/backoffice/dossiers/_onglets.html.haml
+++ b/app/views/backoffice/dossiers/_onglets.html.haml
@ -1,6 +1,3 @@
-=link_to 'Tous mes dossiers en CSV', backoffice_download_dossiers_tps_path, {class: 'btn btn-success btn-sm', style: 'float: right; margin-right: 4%; margin-top: 7px'}
-%h1 Gestion des dossiers
-
 #filter_by_procedure{style:'margin-left: 5%'}
  %select{onchange: 'location = this.value', style:'margin-top: 10px; margin-bottom: 10px', id: 'filter_by_procedure_select'}
    %option{value: backoffice_dossiers_path}
@ -10,47 +7,48 @@

 #onglets
  %ul.nav.nav-tabs
-    %li{ class: (@dossiers_list_facade.nouveaux_class)}
-      %a{:href => "#{url_for @dossiers_list_facade.nouveaux_url}", 'data-toggle' => :tooltip, title: 'Les nouveaux dossiers non ouverts.'}
-        %h5.text-info
-          = "Nouveaux "
-          .badge.progress-bar-info
-            =@dossiers_list_facade.nouveaux_total
+    -unless Features.opensimplif
+      %li{ class: (@dossiers_list_facade.nouveaux_class)}
+        %a{:href => "#{url_for @dossiers_list_facade.nouveaux_url}", 'data-toggle' => :tooltip, title: 'Les nouveaux dossiers non ouverts.'}
+          %h5.text-info
+            = "Nouveaux "
+            .badge.progress-bar-info
+              =@dossiers_list_facade.nouveaux_total

-    %li{ class: (@dossiers_list_facade.a_traiter_class) }
-      %a{:href => "#{url_for @dossiers_list_facade.a_traiter_url}", 'data-toggle' => :tooltip, title: 'Les dossiers qui requièrent une action de votre part.'}
-        %h5.text-danger
-          = "Action requise"
-          .badge.progress-bar-danger
-            =@dossiers_list_facade.a_traiter_total
+      %li{ class: (@dossiers_list_facade.a_traiter_class) }
+        %a{:href => "#{url_for @dossiers_list_facade.a_traiter_url}", 'data-toggle' => :tooltip, title: 'Les dossiers qui requièrent une action de votre part.'}
+          %h5.text-danger
+            = "Action requise"
+            .badge.progress-bar-danger
+              =@dossiers_list_facade.a_traiter_total

-    %li{ class: (@dossiers_list_facade.en_attente_class) }
-      %a{:href => "#{url_for @dossiers_list_facade.en_attente_url}", 'data-toggle' => :tooltip, title: 'Les dossiers en attentes d\'une action de la part de l\'usager.'}
-        %h5.text-default
-          ="Attente usager "
-          .badge.progress-bar-default
-            =@dossiers_list_facade.en_attente_total
+      %li{ class: (@dossiers_list_facade.en_attente_class) }
+        %a{:href => "#{url_for @dossiers_list_facade.en_attente_url}", 'data-toggle' => :tooltip, title: 'Les dossiers en attentes d\'une action de la part de l\'usager.'}
+          %h5.text-default
+            ="Attente usager "
+            .badge.progress-bar-default
+              =@dossiers_list_facade.en_attente_total

-    %li{ class: (@dossiers_list_facade.deposes_class) }
-      %a{:href => "#{url_for @dossiers_list_facade.deposes_url}", 'data-toggle' => :tooltip, title: 'Les dossiers qui ont été validés et déposés par les usager qui attendent une réponse de bonne réception avant examen.'}
-        %h5.text-purple
-          ="À réceptionner"
-          .badge.progress-bar-purple
-            =@dossiers_list_facade.deposes_total
+      %li{ class: (@dossiers_list_facade.deposes_class) }
+        %a{:href => "#{url_for @dossiers_list_facade.deposes_url}", 'data-toggle' => :tooltip, title: 'Les dossiers qui ont été validés et déposés par les usager qui attendent une réponse de bonne réception avant examen.'}
+          %h5.text-purple
+            ="À réceptionner"
+            .badge.progress-bar-purple
+              =@dossiers_list_facade.deposes_total

-    %li{ class: (@dossiers_list_facade.a_instruire_class) }
-      %a{:href => "#{url_for @dossiers_list_facade.a_instruire_url}", 'data-toggle' => :tooltip, title: 'Les dossiers qui ont été notifiés comme bien réceptionnés et qui attendent un verdict final.'}
-        %h5.text-warning
-          = "À instruire"
-          .badge.progress-bar-warning
-            =@dossiers_list_facade.a_instruire_total
+      %li{ class: (@dossiers_list_facade.a_instruire_class) }
+        %a{:href => "#{url_for @dossiers_list_facade.a_instruire_url}", 'data-toggle' => :tooltip, title: 'Les dossiers qui ont été notifiés comme bien réceptionnés et qui attendent un verdict final.'}
+          %h5.text-warning
+            = "À instruire"
+            .badge.progress-bar-warning
+              =@dossiers_list_facade.a_instruire_total

-    %li{ class: (@dossiers_list_facade.termine_class) }
-      %a{:href => "#{url_for @dossiers_list_facade.termine_url}",'data-toggle' => :tooltip, title: 'Tous les dossiers qui ont été traité avec un statut "Validé", "Refusé" ou "Sans suite "'}
-        %h5.text-success
-          = "Terminé"
-          .badge.progress-bar-success
-            =@dossiers_list_facade.termine_total
+      %li{ class: (@dossiers_list_facade.termine_class) }
+        %a{:href => "#{url_for @dossiers_list_facade.termine_url}",'data-toggle' => :tooltip, title: 'Tous les dossiers qui ont été traité avec un statut "Validé", "Refusé" ou "Sans suite "'}
+          %h5.text-success
+            = "Terminé"
+            .badge.progress-bar-success
+              =@dossiers_list_facade.termine_total

    %ul.nav.nav-tabs.navbar-right{style:'border-bottom: none;'}
      %li#search{ class: (@dossiers_list_facade.search_class) }
--- a/app/views/backoffice/dossiers/_pref_list.html.haml
+++ b/app/views/backoffice/dossiers/_pref_list.html.haml
@ -23,7 +23,7 @@

 %table
  - PreferenceListDossier.available_columns_for(@dossiers_list_facade.procedure_id).each_with_index do |tables, index|
-    - if index%2 == 0 || tables.first == :champs
+    - if index%2 == 0 || tables.first.to_s.include?('champs')
      %tr

    %td.col-sm-5.col-md-5.col-lg-5{style: 'vertical-align: top', colspan: (tables.first == :champs ? 2 : 1)}
--- a/app/views/backoffice/dossiers/index.html.haml
+++ b/app/views/backoffice/dossiers/index.html.haml
@ -1,10 +1,15 @@
 #backoffice_index
  #pref_list_menu
    = render partial: 'backoffice/dossiers/pref_list'
+
+  =link_to 'Tous mes dossiers en CSV', backoffice_download_dossiers_tps_path, {class: 'btn btn-success btn-sm', style: 'float: right; margin-right: 4%; margin-top: 7px'}
+  %h1 Gestion des dossiers
+
  = render partial: 'backoffice/dossiers/onglets'

  = smart_listing_render :dossiers

  %br
  %br
-  = render partial: 'backoffice/dossiers/state_description', locals: {dossiers_list_facade: @dossiers_list_facade}
+  - unless Features.opensimplif
+    = render partial: 'backoffice/dossiers/state_description', locals: {dossiers_list_facade: @dossiers_list_facade}
--- a/app/views/backoffice/dossiers/search.js.erb
+++ b/app/views/backoffice/dossiers/search.js.erb
@ -0,0 +1,3 @@
+<%= smart_listing_update :dossiers %>
+
+filters_init();
--- a/app/views/dossiers/_infos_dossier.html.haml
+++ b/app/views/dossiers/_infos_dossier.html.haml
@ -4,6 +4,33 @@
      %h3
        = @facade.dossier.procedure.libelle

+      - if @facade.procedure.for_individual?
+        %br
+        .individual.text-info
+          %h4 Dépositaire
+
+          %table.table{style:'width: 60%'}
+            %tr
+              %th.col-md-3.col-lg-3
+                Civilité
+              %td.col-md-5.col-lg-5
+                = @facade.individual.gender
+            %tr
+              %th.col-md-3.col-lg-3
+                Nom
+              %td.col-md-5.col-lg-5
+                = @facade.individual.nom
+            %tr
+              %th.col-md-3.col-lg-3
+                Prénom
+              %td.col-md-5.col-lg-5
+                = @facade.individual.prenom
+            %tr
+              %th.col-md-3.col-lg-3
+                Date de naissance
+              %td.col-md-5.col-lg-5
+                = @facade.individual.birthdate
+
      - if @facade.dossier.mandataire_social && gestionnaire_signed_in?
        .mandataire_social.text-success.center
          %br
@ -66,22 +93,22 @@
    -if gestionnaire_signed_in?
      -if !@facade.dossier.read_only?
        = form_tag(url_for({controller: 'backoffice/dossiers', action: :valid, dossier_id: @facade.dossier.id}), class: 'form-inline', method: 'POST') do
-          %button#action_button.btn.btn-success
-            = 'Valider le dossier'
+          %button.action_button.btn.btn-success{'data-toggle' => :tooltip, title: 'En cliquant ici, vous figez le dossier et autorisez le dépôt du dossier pour instruction.'}
+            = 'Déclarer complet'

      -elsif @facade.dossier.submitted?
        = form_tag(url_for({controller: 'backoffice/dossiers', action: :receive, dossier_id: @facade.dossier.id}), class: 'form-inline', method: 'POST') do
-          %button#action_button.btn.btn-success
+          %button.action_button.btn.btn-success
            = 'Notifier de la bonne réception'

      -elsif @facade.dossier.received?
        = form_tag(url_for({controller: 'backoffice/dossiers', action: :close, dossier_id: @facade.dossier.id}), class: 'form-inline action_button', method: 'POST', style: 'display:inline', 'data-toggle' => :tooltip, title: 'Accepter') do
-          %button#action_button.btn.btn-success
+          %button.action_button.btn.btn-success
            %i.fa.fa-check
        = form_tag(url_for({controller: 'backoffice/dossiers', action: :refuse, dossier_id: @facade.dossier.id}), class: 'form-inline action_button', method: 'POST', style: 'display:inline', 'data-toggle' => :tooltip, title: 'Refuser') do
-          %button#action_button.btn.btn-danger
+          %button.action_button.btn.btn-danger
            %i.fa.fa-times
        = form_tag(url_for({controller: 'backoffice/dossiers', action: :without_continuation, dossier_id: @facade.dossier.id}), class: 'form-inline action_button', method: 'POST', style: 'display:inline', 'data-toggle' => :tooltip, title: 'Classer sans suite') do
-          %button#action_button.btn.btn-warning
+          %button.action_button.btn.btn-warning
            %i.fa.fa-circle-o

--- a/app/views/dossiers/_tab_objects_dossier.html.haml
+++ b/app/views/dossiers/_tab_objects_dossier.html.haml
@ -11,7 +11,7 @@
      %a{href: "#invites", 'aria-controls' => "invites", role: "tab", 'data-toggle' => "tab"}
        Invités

-  - if gestionnaire_signed_in?
+  - if gestionnaire_signed_in? && (!request.env['PATH_INFO'].include?('users/dossiers') )
    %li{role: "presentation"}
      %a{href: "#followers", 'aria-controls' => "followers", role: "tab", 'data-toggle' => "tab"}
        Abonnés
@ -30,7 +30,7 @@
  - if gestionnaire_signed_in? || @facade.dossier.owner?(current_user.email)
    %div{role: "tabpanel", class: "tab-pane fade", id:"invites"}
      = render partial: '/dossiers/invites'
-  - if gestionnaire_signed_in?
+  - if gestionnaire_signed_in? && !request.env['PATH_INFO'].include?('users/dossiers')
    %div{role: "tabpanel", class: "tab-pane fade", id:"followers"}
      = render partial: 'followers'
    %div{role: "tabpanel", class: "tab-pane fade", id:"champs_private"}
--- a/app/views/layouts/_navbar.html.haml
+++ b/app/views/layouts/_navbar.html.haml
@ -7,26 +7,32 @@
 %a{href: '/'}
  = image_tag('logo-tps.png', class: 'logo')

- if gestionnaire_signed_in?
-  %a{href: (current_gestionnaire.procedure_filter.blank? ? '/' : backoffice_dossiers_procedure_path(current_gestionnaire.procedure_filter)), class: 'btn btn-md'}
+- if gestionnaire_signed_in? && user_signed_in?
+  %a{href: (current_gestionnaire.procedure_filter.blank? ? backoffice_dossiers_path : backoffice_dossiers_procedure_path(current_gestionnaire.procedure_filter)), class: 'btn btn-md'}
+    Dossiers
+  %a{href: users_dossiers_path, class: 'btn btn-md'}
+    Mes Dossiers
+- elsif gestionnaire_signed_in?
+  %a{href: (current_gestionnaire.procedure_filter.blank? ? backoffice_dossiers_path : backoffice_dossiers_procedure_path(current_gestionnaire.procedure_filter)), class: 'btn btn-md'}
    Mes Dossiers
 - elsif user_signed_in?
-  %a{href: '/', class: 'btn btn-md'}
+  %a{href: users_dossiers_path, class: 'btn btn-md'}
    Mes Dossiers
 - elsif administrateur_signed_in?
-  %a{href: '/', class: 'btn btn-md'}
+  %a{href: admin_procedures_path, class: 'btn btn-md'}
    Mes Procédures

 #sign_out
-  -if gestionnaire_signed_in?
+  -if user_signed_in?
+    = render partial: 'users/login_banner'
+  -elsif gestionnaire_signed_in?
    = render partial: 'gestionnaires/login_banner'
  -elsif administrateur_signed_in?
    = render partial: 'administrateurs/login_banner'
-  - elsif user_signed_in?
-    = render partial: 'users/login_banner'
-  - else
+  -else
    = link_to "Utilisateur", '/users/sign_in', method: :get, :class => 'btn btn-md'
-    = link_to "Accompagnateur", '/gestionnaires/sign_in', method: :get, :class => 'btn btn-md'
+    -unless Features.unified_login
+      = link_to "Accompagnateur", '/gestionnaires/sign_in', method: :get, :class => 'btn btn-md'
    = link_to "Administrateur", '/administrateurs/sign_in', method: :get, :class => 'btn btn-md'

 - if Rails.env != 'production'
--- a/app/views/notification_mailer/dossier_validated.text.erb
+++ b/app/views/notification_mailer/dossier_validated.text.erb
@ -1,6 +1,6 @@
 Bonjour <%= @user.email %>

-Votre dossier N°<%=@dossier.id%> a été validé par votre accompagnateur.
+Votre dossier N°<%=@dossier.id%> est prêt à être déposé pour instruction.

 Afin de finaliser son dépôt, merci de vous rendre sur <%=users_dossier_recapitulatif_url(dossier_id: @dossier.id)%>

--- a/app/views/users/description/_champs.html.haml
+++ b/app/views/users/description/_champs.html.haml
@ -1,26 +1,25 @@
+-actual_header_section = nil
 -@champs.each do |champ|
-  .row
+  .row{class: (actual_header_section.nil? || champ.type_champ == 'header_section' ? '' : "header_section_"+actual_header_section.to_s)}
    %div{class: "type_champ-#{champ.type_champ}"}
-      -if champ.type_champ == 'checkbox'
-        %h4{style:'margin-left:15px;'}
-          = champ.libelle
-          - if champ.mandatory?
-            = '*'
-          %input{type: 'hidden', name:"champs['#{champ.id}']", id: "champs_#{champ.id}", value: ''}
-          %input{type: 'checkbox', style:'margin-left: 15px;', name:"champs['#{champ.id}']", id: "champs_#{champ.id}", checked: ('checked' if champ.value == 'on')}

-      - elsif champ.type_champ == 'header_section'
+      - if champ.type_champ == 'header_section'
        =render partial: 'users/description/champs/header_section', locals: {champ: champ}
+        -actual_header_section = champ.id

      -else
-        %h4
-          = champ.libelle
-          - if champ.mandatory?
-            = '*'
+        - unless champ.type_champ == 'checkbox' || champ.type_champ == 'engagement'
+          %h4
+            = champ.libelle
+            - if champ.mandatory?
+              = '*'

        -if champ.type_champ == 'textarea'
          =render partial: 'users/description/champs/textarea', locals: {champ: champ}

+        -elsif champ.type_champ == 'checkbox'
+          = render partial: 'users/description/champs/checkbox', locals: {champ: champ}
+
        -elsif champ.type_champ == 'civilite'
          =render partial: 'users/description/champs/civilite', locals: {champ: champ}

@ -33,6 +32,18 @@
        - elsif champ.type_champ == 'drop_down_list'
          =render partial: 'users/description/champs/drop_down_list', locals: {champ: champ}

+        - elsif champ.type_champ == 'pays'
+          =render partial: 'users/description/champs/pays', locals: {champ: champ}
+
+        - elsif champ.type_champ == 'regions'
+          =render partial: 'users/description/champs/regions', locals: {champ: champ}
+
+        - elsif champ.type_champ == 'engagement'
+          =render partial: 'users/description/champs/engagement', locals: {champ: champ}
+
+        - elsif champ.type_champ == 'departements'
+          =render partial: 'users/description/champs/departements', locals: {champ: champ}
+
        -else
          %input.form-control{name:"champs['#{champ.id}']",
                  placeholder: champ.libelle,
--- a/app/views/users/description/champs/_checkbox.html.haml
+++ b/app/views/users/description/champs/_checkbox.html.haml
@ -0,0 +1,6 @@
+%h4{style:'margin-left:15px;'}
+  = champ.libelle
+  - if champ.mandatory?
+    = '*'
+  %input{type: 'hidden', name:"champs['#{champ.id}']", id: "champs_#{champ.id}", value: ''}
+  %input{type: 'checkbox', style:'margin-left: 15px;', name:"champs['#{champ.id}']", id: "champs_#{champ.id}", checked: ('checked' if champ.value == 'on')}
--- a/app/views/users/description/champs/_departements.html.haml
+++ b/app/views/users/description/champs/_departements.html.haml
@ -0,0 +1 @@
+= render partial: 'users/description/champs/drop_down_template', locals: {values: Champ.departements, champ: champ}
--- a/app/views/users/description/champs/_drop_down_list.html.haml
+++ b/app/views/users/description/champs/_drop_down_list.html.haml
@ -1,14 +1 @@
-%select{  name:"champs['#{champ.id}']",
-          id: "champs_#{champ.id}" }
-  - unless champ.drop_down_list.blank?
-    - champ.drop_down_list.options.each do |option|
-      - if (option=~ /^--.*--$/).nil?
-        - if champ.value == option
-          %option{selected:''}
-            = option
-        - else
-          %option
-            = option
-      -else
-        %option{disabled:''}
-          = option
+= render partial: 'users/description/champs/drop_down_template', locals: {values: champ.drop_down_list.options, champ: champ}
--- a/app/views/users/description/champs/_drop_down_template.html.haml
+++ b/app/views/users/description/champs/_drop_down_template.html.haml
@ -0,0 +1,18 @@
+%select{  name:"champs['#{champ.id}']",
+          id: "champs_#{champ.id}" }
+
+  - unless values.blank?
+    %option
+      = ''
+
+    - values.each do |option|
+      - if (option=~ /^--.*--$/).nil?
+        - if champ.value == option
+          %option{selected:''}
+            = option
+        - else
+          %option
+            = option
+      -else
+        %option{disabled:''}
+          = option
--- a/app/views/users/description/champs/_engagement.html.haml
+++ b/app/views/users/description/champs/_engagement.html.haml
@ -0,0 +1,8 @@
+%h4{style:'margin-left:15px;'}
+  = champ.libelle
+  - if champ.mandatory?
+    = '*'
+  %input{type: 'hidden', name:"champs['#{champ.id}']", id: "champs_#{champ.id}", value: ''}
+  %input{type: 'checkbox', style:'margin-left: 15px;', name:"champs['#{champ.id}']", id: "champs_#{champ.id}", checked: ('checked' if champ.value == 'on')}
+%div{style:'margin-left: 5%; margin-right: 5%; text-align: justify; text-justify: inter-word;'}
+  = champ.description.gsub(/\r\n/, '<br>').html_safe
--- a/app/views/users/description/champs/_header_section.html.haml
+++ b/app/views/users/description/champs/_header_section.html.haml
@ -1,2 +1,6 @@
 %h3.text-primary.page-header
  =champ.libelle
+  %span.mask_section{style:'float: right'}
+    %a.mask_section_button.btn.btn-xs.btn-info{id: "mask_button_"+champ.id.to_s}
+      Masquer la section
+      %i.fa.fa-chevron-up
--- a/app/views/users/description/champs/_pays.html.haml
+++ b/app/views/users/description/champs/_pays.html.haml
@ -0,0 +1 @@
+= render partial: 'users/description/champs/drop_down_template', locals: {values: Champ.pays, champ: champ}
--- a/app/views/users/description/champs/_regions.html.haml
+++ b/app/views/users/description/champs/_regions.html.haml
@ -0,0 +1,3 @@
+= render partial: 'users/description/champs/drop_down_template', locals: {values: Champ.regions, champ: champ}
+
+
--- a/app/views/users/dossiers/_list.html.haml
+++ b/app/views/users/dossiers/_list.html.haml
@ -5,6 +5,8 @@
      %th.col-md-5.col-lg-5= smart_listing.sortable 'Procédure', 'procedure.libelle'
      %th.col-md-2.col-lg-2= smart_listing.sortable 'État', 'state'
      %th.col-md-2.col-lg-2= smart_listing.sortable 'Date de mise à jour', 'updated_at'
+      - if @liste == "brouillon"
+        %th.col-md-2.col-lg-2= 'Action'
    - @dossiers.each do |dossier|
      - if dossier.kind_of? Invite
        -invite = dossier
@ -20,9 +22,9 @@
            = link_to(dossier.procedure.libelle, users_dossier_recapitulatif_path(dossier)) unless dossier.brouillon?
            = link_to(dossier.procedure.libelle, users_dossier_description_path(dossier)) if dossier.brouillon?

-
        %td{id: "dossier_#{dossier.id}_state"}= dossier.display_state
        %td= dossier.last_update
+        %td= link_to('X', url_for(controller: 'dossiers', action: :destroy, id: dossier.id), 'data-method' => :delete, class: 'btn-sm btn-danger') if @liste == "brouillon"

  = smart_listing.paginate
  = smart_listing.pagination_per_page_links
--- a/app/views/users/dossiers/_onglets.html.haml
+++ b/app/views/users/dossiers/_onglets.html.haml
@ -1,5 +1,3 @@
-%h1 Mes dossiers
-
 %br
 #onglets
  %ul.nav.nav-tabs
@ -10,26 +8,12 @@
          .badge.progress-bar-default
            = @dossiers_list_facade.brouillon_total

-    %li{ class: @dossiers_list_facade.nouveaux_class }
-      %a{:href => "#{url_for users_dossiers_path(liste: 'nouveaux')}", 'data-toggle' => :tooltip, title: 'Les nouveaux dossiers qui n\'ont pas encore été vus par votre accompagnateur.'}
-        %h5.text-info
-          = "Nouveaux"
-          .badge.progress-bar-info
-            = @dossiers_list_facade.nouveaux_total
-
-    %li{ class: @dossiers_list_facade.a_traiter_class }
+    %li{ class: @dossiers_list_facade.en_construction_class }
      %a{:href => "#{url_for users_dossiers_path(liste: 'a_traiter')}", 'data-toggle' => :tooltip, title: 'Les dossiers qui requièrent une action de votre part.'}
        %h5.text-danger
-          = "Action requise"
+          = "En construction"
          .badge.progress-bar-danger
-            = @dossiers_list_facade.a_traiter_total
-
-    %li{ class: @dossiers_list_facade.en_attente_class }
-      %a{:href => "#{url_for users_dossiers_path(liste: 'en_attente')}", 'data-toggle' => :tooltip, title: 'Les dossiers en cours de relecture par votre accompagnateur.'}
-        %h5.text-default
-          ="Etude en cours"
-          .badge.progress-bar-default
-            = @dossiers_list_facade.en_attente_total
+            = @dossiers_list_facade.en_construction_total

    %li{ class: @dossiers_list_facade.valides_class }
      %a{:href => "#{url_for users_dossiers_path(liste: 'valides')}", 'data-toggle' => :tooltip, title: 'Les dossiers relus par votre accompagnateur pouvant être déposés pour examen.'}
--- a/app/views/users/dossiers/index.html.haml
+++ b/app/views/users/dossiers/index.html.haml
@ -1,8 +1,12 @@
 #users_index
-  = render partial: 'onglets'
+  %h1 Mes dossiers
+
+  -unless Features.opensimplif
+    = render partial: 'onglets'

  = smart_listing_render :dossiers

  %br
  %br
-  = render partial: 'state_description', locals: {dossiers_list_facade: @dossiers_list_facade}
+  - unless Features.opensimplif
+    = render partial: 'state_description', locals: {dossiers_list_facade: @dossiers_list_facade}
--- a/app/views/users/recapitulatif/show.html.haml
+++ b/app/views/users/recapitulatif/show.html.haml
@ -21,6 +21,8 @@
          = @facade.dossier.display_state

 %br
+- unless @facade.entreprise.nil?
+  = render partial: '/dossiers/infos_entreprise'

 = render partial: '/dossiers/infos_dossier'

--- a/config/deploy.rb
+++ b/config/deploy.rb
@ -11,7 +11,7 @@ require 'mina/rbenv' # for rbenv support. (http://rbenv.org)
 #   branch       - Branch name to deploy. (needed by mina/git)

 ENV['to'] ||= "staging"
-ENV['to'] = "staging" unless ["staging", "production", "opensimplif"].include?(ENV['to'])
+ENV['to'] = "staging" unless ["staging", "production", "opensimplif", "tps_v2"].include?(ENV['to'])

 raise "missing domain, run with 'rake deploy domain=37.187.154.237'" if ENV['domain'].nil?

@ -51,13 +51,23 @@ elsif ENV["to"] == "opensimplif"
  set :deploy_to, '/var/www/opensimplif'
  set :user, 'opensimplif' # Username in the server to SSH to.
  appname = 'opensimplif'
+elsif ENV["to"] == "tps_v2"
+  if ENV['branch'].nil?
+    set :branch, 'tps_v2'
+  else
+    set :branch, ENV['branch']
+  end
+  set :deploy_to, '/var/www/tps_v2'
+  set :user, 'tps_v2' # Username in the server to SSH to.
+  appname = 'tps_v2'
 end

-
 set :rails_env, ENV["to"]

 if ENV["to"] == "opensimplif"
  set :rails_env, "production"
+elsif ENV["to"] == "tps_v2"
+  set :rails_env, "production"
 end

 # For system-wide RVM install.
--- a/config/fog_credentials.test.yml
+++ b/config/fog_credentials.test.yml
@ -0,0 +1,6 @@
+default:
+  openstack_tenant: "ovh_fake_tenant_name"
+  openstack_api_key: "ovh_fake_password"
+  openstack_username: "ovh_fake_username"
+  openstack_auth_url: "https://auth.cloud.ovh.net/v2.0/tokens"
+  openstack_region: "SBG1"
--- a/config/initializers/features.yml
+++ b/config/initializers/features.yml
@ -1 +1,3 @@
 remote_storage: true
+unified_login: false
+opensimplif: false
--- a/config/locales/models/type_de_champ/fr.yml
+++ b/config/locales/models/type_de_champ/fr.yml
@ -10,11 +10,15 @@ fr:
          date: 'Date'
          datetime: 'Date et Heure'
          number: 'Nombre'
-          checkbox: 'checkbox'
+          checkbox: 'Checkbox'
          civilite: 'Civilité'
          email: 'Email'
          phone: 'Téléphone'
          address: 'Adresse'
          yes_no: 'Oui/Non'
          drop_down_list: 'Menu déroulant'
+          pays: 'Pays'
+          regions: 'Régions'
+          departements: 'Départements'
+          engagement: 'Engagement'
          header_section: 'Titre de section'
--- a/lib/carto/geo_api/driver.rb
+++ b/lib/carto/geo_api/driver.rb
@ -0,0 +1,34 @@
+module Carto
+  module GeoAPI
+    class Driver
+
+      def self.regions
+        call regions_url
+      end
+
+      def self.departements
+        call departements_url
+      end
+
+      def self.pays
+        File.open('lib/carto/geo_api/pays.json').read
+      end
+
+      private
+
+      def self.call api_url
+        RestClient.get api_url, params: { fields: :nom }
+      rescue RestClient::ServiceUnavailable
+        nil
+      end
+
+      def self.departements_url
+        'https://geo.api.gouv.fr/departements'
+      end
+
+      def self.regions_url
+        'https://geo.api.gouv.fr/regions'
+      end
+    end
+  end
+end
--- a/lib/carto/geo_api/pays.json
+++ b/lib/carto/geo_api/pays.json
@ -0,0 +1,851 @@
+[
+  {
+    "nom": "FRANCE"
+  },
+  {
+    "nom": "----"
+  },
+  {
+    "nom": "ACORES, MADERE"
+  },
+  {
+    "nom": "AFGHANISTAN"
+  },
+  {
+    "nom": "AFRIQUE DU SUD"
+  },
+  {
+    "nom": "ALASKA"
+  },
+  {
+    "nom": "ALBANIE"
+  },
+  {
+    "nom": "ALGERIE"
+  },
+  {
+    "nom": "ALLEMAGNE"
+  },
+  {
+    "nom": "ANDORRE"
+  },
+  {
+    "nom": "ANGOLA"
+  },
+  {
+    "nom": "ANGUILLA"
+  },
+  {
+    "nom": "ANTIGUA-ET-BARBUDA"
+  },
+  {
+    "nom": "ANTILLES NEERLANDAISES"
+  },
+  {
+    "nom": "ARABIE SAOUDITE"
+  },
+  {
+    "nom": "ARGENTINE"
+  },
+  {
+    "nom": "ARMENIE"
+  },
+  {
+    "nom": "ARUBA"
+  },
+  {
+    "nom": "AUSTRALIE"
+  },
+  {
+    "nom": "AUTRICHE"
+  },
+  {
+    "nom": "AZERBAIDJAN"
+  },
+  {
+    "nom": "BAHAMAS"
+  },
+  {
+    "nom": "BAHREIN"
+  },
+  {
+    "nom": "BANGLADESH"
+  },
+  {
+    "nom": "BARBADE"
+  },
+  {
+    "nom": "BELGIQUE"
+  },
+  {
+    "nom": "BELIZE"
+  },
+  {
+    "nom": "BENIN"
+  },
+  {
+    "nom": "BERMUDES"
+  },
+  {
+    "nom": "BHOUTAN"
+  },
+  {
+    "nom": "BIELORUSSIE"
+  },
+  {
+    "nom": "BIRMANIE"
+  },
+  {
+    "nom": "BOLIVIE"
+  },
+  {
+    "nom": "BONAIRE, SAINT EUSTACHE ET SABA"
+  },
+  {
+    "nom": "BOSNIE-HERZEGOVINE"
+  },
+  {
+    "nom": "BOTSWANA"
+  },
+  {
+    "nom": "BOUVET (ILE)"
+  },
+  {
+    "nom": "BRESIL"
+  },
+  {
+    "nom": "BRUNEI"
+  },
+  {
+    "nom": "BULGARIE"
+  },
+  {
+    "nom": "BURKINA"
+  },
+  {
+    "nom": "BURUNDI"
+  },
+  {
+    "nom": "CAIMANES (ILES)"
+  },
+  {
+    "nom": "CAMBODGE"
+  },
+  {
+    "nom": "CAMEROUN"
+  },
+  {
+    "nom": "CAMEROUN ET TOGO"
+  },
+  {
+    "nom": "CANADA"
+  },
+  {
+    "nom": "CANARIES (ILES)"
+  },
+  {
+    "nom": "CAP-VERT"
+  },
+  {
+    "nom": "CENTRAFRICAINE (REPUBLIQUE)"
+  },
+  {
+    "nom": "CHILI"
+  },
+  {
+    "nom": "CHINE"
+  },
+  {
+    "nom": "CHRISTMAS (ILE)"
+  },
+  {
+    "nom": "CHYPRE"
+  },
+  {
+    "nom": "CLIPPERTON (ILE)"
+  },
+  {
+    "nom": "COCOS ou KEELING (ILES)"
+  },
+  {
+    "nom": "COLOMBIE"
+  },
+  {
+    "nom": "COMORES"
+  },
+  {
+    "nom": "CONGO"
+  },
+  {
+    "nom": "CONGO (REPUBLIQUE DEMOCRATIQUE)"
+  },
+  {
+    "nom": "COOK (ILES)"
+  },
+  {
+    "nom": "COREE"
+  },
+  {
+    "nom": "COREE (REPUBLIQUE DE)"
+  },
+  {
+    "nom": "COREE (REPUBLIQUE POPULAIRE DEMOCRATIQUE DE)"
+  },
+  {
+    "nom": "COSTA RICA"
+  },
+  {
+    "nom": "COTE D'IVOIRE"
+  },
+  {
+    "nom": "CROATIE"
+  },
+  {
+    "nom": "CUBA"
+  },
+  {
+    "nom": "CURAÇAO"
+  },
+  {
+    "nom": "DANEMARK"
+  },
+  {
+    "nom": "DJIBOUTI"
+  },
+  {
+    "nom": "DOMINICAINE (REPUBLIQUE)"
+  },
+  {
+    "nom": "DOMINIQUE"
+  },
+  {
+    "nom": "EGYPTE"
+  },
+  {
+    "nom": "EL SALVADOR"
+  },
+  {
+    "nom": "EMIRATS ARABES UNIS"
+  },
+  {
+    "nom": "EQUATEUR"
+  },
+  {
+    "nom": "ERYTHREE"
+  },
+  {
+    "nom": "ESPAGNE"
+  },
+  {
+    "nom": "ESTONIE"
+  },
+  {
+    "nom": "ETATS MALAIS NON FEDERES"
+  },
+  {
+    "nom": "ETATS-UNIS"
+  },
+  {
+    "nom": "ETHIOPIE"
+  },
+  {
+    "nom": "EX-REPUBLIQUE YOUGOSLAVE DE MACEDOINE"
+  },
+  {
+    "nom": "FEROE (ILES)"
+  },
+  {
+    "nom": "FIDJI"
+  },
+  {
+    "nom": "FINLANDE"
+  },
+  {
+    "nom": "GABON"
+  },
+  {
+    "nom": "GAMBIE"
+  },
+  {
+    "nom": "GEORGIE"
+  },
+  {
+    "nom": "GEORGIE DU SUD ET LES ILES SANDWICH DU SUD"
+  },
+  {
+    "nom": "GHANA"
+  },
+  {
+    "nom": "GIBRALTAR"
+  },
+  {
+    "nom": "GOA"
+  },
+  {
+    "nom": "GRECE"
+  },
+  {
+    "nom": "GRENADE"
+  },
+  {
+    "nom": "GROENLAND"
+  },
+  {
+    "nom": "GUADELOUPE"
+  },
+  {
+    "nom": "GUAM"
+  },
+  {
+    "nom": "GUATEMALA"
+  },
+  {
+    "nom": "GUERNESEY"
+  },
+  {
+    "nom": "GUINEE"
+  },
+  {
+    "nom": "GUINEE EQUATORIALE"
+  },
+  {
+    "nom": "GUINEE-BISSAU"
+  },
+  {
+    "nom": "GUYANA"
+  },
+  {
+    "nom": "GUYANE"
+  },
+  {
+    "nom": "HAITI"
+  },
+  {
+    "nom": "HAWAII (ILES)"
+  },
+  {
+    "nom": "HEARD ET MACDONALD (ILES)"
+  },
+  {
+    "nom": "HONDURAS"
+  },
+  {
+    "nom": "HONG-KONG"
+  },
+  {
+    "nom": "HONGRIE"
+  },
+  {
+    "nom": "ILES PORTUGAISES DE L'OCEAN INDIEN"
+  },
+  {
+    "nom": "INDE"
+  },
+  {
+    "nom": "INDONESIE"
+  },
+  {
+    "nom": "IRAN"
+  },
+  {
+    "nom": "IRAQ"
+  },
+  {
+    "nom": "IRLANDE, ou EIRE"
+  },
+  {
+    "nom": "ISLANDE"
+  },
+  {
+    "nom": "ISRAEL"
+  },
+  {
+    "nom": "ITALIE"
+  },
+  {
+    "nom": "JAMAIQUE"
+  },
+  {
+    "nom": "JAPON"
+  },
+  {
+    "nom": "JERSEY"
+  },
+  {
+    "nom": "JORDANIE"
+  },
+  {
+    "nom": "KAMTCHATKA"
+  },
+  {
+    "nom": "KAZAKHSTAN"
+  },
+  {
+    "nom": "KENYA"
+  },
+  {
+    "nom": "KIRGHIZISTAN"
+  },
+  {
+    "nom": "KIRIBATI"
+  },
+  {
+    "nom": "KOSOVO"
+  },
+  {
+    "nom": "KOWEIT"
+  },
+  {
+    "nom": "LA REUNION"
+  },
+  {
+    "nom": "LABRADOR"
+  },
+  {
+    "nom": "LAOS"
+  },
+  {
+    "nom": "LESOTHO"
+  },
+  {
+    "nom": "LETTONIE"
+  },
+  {
+    "nom": "LIBAN"
+  },
+  {
+    "nom": "LIBERIA"
+  },
+  {
+    "nom": "LIBYE"
+  },
+  {
+    "nom": "LIECHTENSTEIN"
+  },
+  {
+    "nom": "LITUANIE"
+  },
+  {
+    "nom": "LUXEMBOURG"
+  },
+  {
+    "nom": "MACAO"
+  },
+  {
+    "nom": "MADAGASCAR"
+  },
+  {
+    "nom": "MALAISIE"
+  },
+  {
+    "nom": "MALAWI"
+  },
+  {
+    "nom": "MALDIVES"
+  },
+  {
+    "nom": "MALI"
+  },
+  {
+    "nom": "MALOUINES, OU FALKLAND (ILES)"
+  },
+  {
+    "nom": "MALTE"
+  },
+  {
+    "nom": "MAN (ILE)"
+  },
+  {
+    "nom": "MANDCHOURIE"
+  },
+  {
+    "nom": "MARIANNES DU NORD (ILES)"
+  },
+  {
+    "nom": "MAROC"
+  },
+  {
+    "nom": "MARSHALL (ILES)"
+  },
+  {
+    "nom": "MARTINIQUE"
+  },
+  {
+    "nom": "MAURICE"
+  },
+  {
+    "nom": "MAURITANIE"
+  },
+  {
+    "nom": "MAYOTTE"
+  },
+  {
+    "nom": "MEXIQUE"
+  },
+  {
+    "nom": "MICRONESIE (ETATS FEDERES DE)"
+  },
+  {
+    "nom": "MOLDAVIE"
+  },
+  {
+    "nom": "MONACO"
+  },
+  {
+    "nom": "MONGOLIE"
+  },
+  {
+    "nom": "MONTENEGRO"
+  },
+  {
+    "nom": "MONTSERRAT"
+  },
+  {
+    "nom": "MOZAMBIQUE"
+  },
+  {
+    "nom": "NAMIBIE"
+  },
+  {
+    "nom": "NAURU"
+  },
+  {
+    "nom": "NEPAL"
+  },
+  {
+    "nom": "NICARAGUA"
+  },
+  {
+    "nom": "NIGER"
+  },
+  {
+    "nom": "NIGERIA"
+  },
+  {
+    "nom": "NIUE"
+  },
+  {
+    "nom": "NORFOLK (ILE)"
+  },
+  {
+    "nom": "NORVEGE"
+  },
+  {
+    "nom": "NOUVELLE-CALEDONIE"
+  },
+  {
+    "nom": "NOUVELLE-ZELANDE"
+  },
+  {
+    "nom": "OCEAN INDIEN (TERRITOIRE BRITANNIQUE DE L')"
+  },
+  {
+    "nom": "OMAN"
+  },
+  {
+    "nom": "OUGANDA"
+  },
+  {
+    "nom": "OUZBEKISTAN"
+  },
+  {
+    "nom": "PAKISTAN"
+  },
+  {
+    "nom": "PALAOS (ILES)"
+  },
+  {
+    "nom": "PALESTINE (Etat de)"
+  },
+  {
+    "nom": "PANAMA"
+  },
+  {
+    "nom": "PAPOUASIE-NOUVELLE-GUINEE"
+  },
+  {
+    "nom": "PARAGUAY"
+  },
+  {
+    "nom": "PAYS-BAS"
+  },
+  {
+    "nom": "PEROU"
+  },
+  {
+    "nom": "PHILIPPINES"
+  },
+  {
+    "nom": "PITCAIRN (ILE)"
+  },
+  {
+    "nom": "POLOGNE"
+  },
+  {
+    "nom": "POLYNESIE FRANCAISE"
+  },
+  {
+    "nom": "PORTO RICO"
+  },
+  {
+    "nom": "PORTUGAL"
+  },
+  {
+    "nom": "POSSESSIONS BRITANNIQUES AU PROCHE-ORIENT"
+  },
+  {
+    "nom": "PRESIDES"
+  },
+  {
+    "nom": "PROVINCES ESPAGNOLES D'AFRIQUE"
+  },
+  {
+    "nom": "QATAR"
+  },
+  {
+    "nom": "REPUBLIQUE DEMOCRATIQUE ALLEMANDE"
+  },
+  {
+    "nom": "REPUBLIQUE FEDERALE D'ALLEMAGNE"
+  },
+  {
+    "nom": "ROUMANIE"
+  },
+  {
+    "nom": "ROYAUME-UNI"
+  },
+  {
+    "nom": "RUSSIE"
+  },
+  {
+    "nom": "RWANDA"
+  },
+  {
+    "nom": "SAHARA OCCIDENTAL"
+  },
+  {
+    "nom": "SAINT-BARTHELEMY"
+  },
+  {
+    "nom": "SAINT-CHRISTOPHE-ET-NIEVES"
+  },
+  {
+    "nom": "SAINT-MARIN"
+  },
+  {
+    "nom": "SAINT-MARTIN"
+  },
+  {
+    "nom": "SAINT-MARTIN (PARTIE NEERLANDAISE)"
+  },
+  {
+    "nom": "SAINT-PIERRE-ET-MIQUELON"
+  },
+  {
+    "nom": "SAINT-VINCENT-ET-LES GRENADINES"
+  },
+  {
+    "nom": "SAINTE HELENE, ASCENSION ET TRISTAN DA CUNHA"
+  },
+  {
+    "nom": "SAINTE-LUCIE"
+  },
+  {
+    "nom": "SALOMON (ILES)"
+  },
+  {
+    "nom": "SAMOA AMERICAINES"
+  },
+  {
+    "nom": "SAMOA OCCIDENTALES"
+  },
+  {
+    "nom": "SAO TOME-ET-PRINCIPE"
+  },
+  {
+    "nom": "SENEGAL"
+  },
+  {
+    "nom": "SERBIE"
+  },
+  {
+    "nom": "SEYCHELLES"
+  },
+  {
+    "nom": "SIBERIE"
+  },
+  {
+    "nom": "SIERRA LEONE"
+  },
+  {
+    "nom": "SINGAPOUR"
+  },
+  {
+    "nom": "SLOVAQUIE"
+  },
+  {
+    "nom": "SLOVENIE"
+  },
+  {
+    "nom": "SOMALIE"
+  },
+  {
+    "nom": "SOUDAN"
+  },
+  {
+    "nom": "SOUDAN ANGLO-EGYPTIEN, KENYA, OUGANDA"
+  },
+  {
+    "nom": "SOUDAN DU SUD"
+  },
+  {
+    "nom": "SRI LANKA"
+  },
+  {
+    "nom": "SUEDE"
+  },
+  {
+    "nom": "SUISSE"
+  },
+  {
+    "nom": "SURINAME"
+  },
+  {
+    "nom": "SVALBARD et ILE JAN MAYEN"
+  },
+  {
+    "nom": "SWAZILAND"
+  },
+  {
+    "nom": "SYRIE"
+  },
+  {
+    "nom": "TADJIKISTAN"
+  },
+  {
+    "nom": "TAIWAN"
+  },
+  {
+    "nom": "TANGER"
+  },
+  {
+    "nom": "TANZANIE"
+  },
+  {
+    "nom": "TCHAD"
+  },
+  {
+    "nom": "TCHECOSLOVAQUIE"
+  },
+  {
+    "nom": "TCHEQUE (REPUBLIQUE)"
+  },
+  {
+    "nom": "TERR. DES ETATS-UNIS D'AMERIQUE EN AMERIQUE"
+  },
+  {
+    "nom": "TERR. DES ETATS-UNIS D'AMERIQUE EN OCEANIE"
+  },
+  {
+    "nom": "TERR. DU ROYAUME-UNI DANS L'ATLANTIQUE SUD"
+  },
+  {
+    "nom": "TERRE-NEUVE"
+  },
+  {
+    "nom": "TERRES AUSTRALES FRANCAISES"
+  },
+  {
+    "nom": "TERRITOIRES DU ROYAUME-UNI AUX ANTILLES"
+  },
+  {
+    "nom": "THAILANDE"
+  },
+  {
+    "nom": "TIMOR ORIENTAL"
+  },
+  {
+    "nom": "TOGO"
+  },
+  {
+    "nom": "TOKELAU"
+  },
+  {
+    "nom": "TONGA"
+  },
+  {
+    "nom": "TRINITE-ET-TOBAGO"
+  },
+  {
+    "nom": "TUNISIE"
+  },
+  {
+    "nom": "TURKESTAN RUSSE"
+  },
+  {
+    "nom": "TURKMENISTAN"
+  },
+  {
+    "nom": "TURKS ET CAIQUES (ILES)"
+  },
+  {
+    "nom": "TURQUIE"
+  },
+  {
+    "nom": "TURQUIE D'EUROPE"
+  },
+  {
+    "nom": "TUVALU"
+  },
+  {
+    "nom": "UKRAINE"
+  },
+  {
+    "nom": "URUGUAY"
+  },
+  {
+    "nom": "VANUATU"
+  },
+  {
+    "nom": "VATICAN, ou SAINT-SIEGE"
+  },
+  {
+    "nom": "VENEZUELA"
+  },
+  {
+    "nom": "VIERGES BRITANNIQUES (ILES)"
+  },
+  {
+    "nom": "VIERGES DES ETATS-UNIS (ILES)"
+  },
+  {
+    "nom": "VIET NAM"
+  },
+  {
+    "nom": "VIET NAM DU NORD"
+  },
+  {
+    "nom": "VIET NAM DU SUD"
+  },
+  {
+    "nom": "WALLIS-ET-FUTUNA"
+  },
+  {
+    "nom": "YEMEN"
+  },
+  {
+    "nom": "YEMEN (REPUBLIQUE ARABE DU)"
+  },
+  {
+    "nom": "YEMEN DEMOCRATIQUE"
+  },
+  {
+    "nom": "ZAMBIE"
+  },
+  {
+    "nom": "ZANZIBAR"
+  },
+  {
+    "nom": "ZIMBABWE"
+  }
+]
--- a/spec/controllers/admin/gestionnaires_controller_spec.rb
+++ b/spec/controllers/admin/gestionnaires_controller_spec.rb
@ -147,6 +147,27 @@ describe Admin::GestionnairesController, type: :controller do
        }
      end
    end
+
+    context 'unified login' do
+      before do
+        allow(Features).to receive(:unified_login).and_return(true)
+        subject
+      end
+
+      it "creates associated user with same credentials" do
+        gestionnaire = controller.instance_variable_get(:@gestionnaire)
+        user = User.find_by(email: gestionnaire.email)
+        expect(user.valid_password?(gestionnaire.password)).to be(true)
+      end
+
+      context 'invalid email' do
+        let(:email) { 'fail' }
+
+        it "won't create associated user" do
+          expect(User.where(email: email).exists?).to be(false)
+        end
+      end
+    end
  end

  describe 'DELETE #destroy' do
--- a/spec/controllers/gestionnaires/passwords_controller_spec.rb
+++ b/spec/controllers/gestionnaires/passwords_controller_spec.rb
@ -0,0 +1,30 @@
+require "spec_helper"
+
+describe Gestionnaires::PasswordsController, type: :controller do
+  before do
+    @request.env["devise.mapping"] = Devise.mappings[:gestionnaire]
+  end
+
+  describe "update" do
+    context "unified login" do
+      let(:gestionnaire) { create(:gestionnaire, email: 'unique@plop.com', password: 'password') }
+      let(:user) { create(:user, email: 'unique@plop.com', password: 'password') }
+
+      before do
+        allow(Features).to receive(:unified_login).and_return(true)
+        @token = gestionnaire.send(:set_reset_password_token)
+        user # make sure it's created
+      end
+
+      it "also signs user in" do
+        put :update, gestionnaire: {
+          reset_password_token: @token,
+          password: "supersecret",
+          password_confirmation: "supersecret",
+        }
+        expect(subject.current_gestionnaire).to eq(gestionnaire)
+        expect(subject.current_user).to eq(user)
+      end
+    end
+  end
+end
--- a/spec/controllers/root_controller_spec.rb
+++ b/spec/controllers/root_controller_spec.rb
@ -40,4 +40,18 @@ describe RootController, type: :controller do

    it { expect(response.body).to have_css('#landing') }
  end
+
+  context "unified login" do
+    render_views
+
+    before do
+      allow(Features).to receive(:unified_login).and_return(true)
+      subject
+    end
+
+    it "won't have gestionnaire login link" do
+      expect(response.body).to have_css("a[href='#{new_user_session_path}']")
+      expect(response.body).to_not have_css("a[href='#{new_gestionnaire_session_path}']")
+    end
+  end
 end
--- a/spec/controllers/users/dossiers_controller_spec.rb
+++ b/spec/controllers/users/dossiers_controller_spec.rb
@ -388,6 +388,46 @@ describe Users::DossiersController, type: :controller do
    end
  end

+  describe 'DELETE #destroy' do
+    let(:user)              { create(:user) }
+    let!(:dossier_draft)     { create :dossier, state: "draft", user: user }
+    let!(:dossier_not_draft) { create :dossier, state: "initiated", user: user }
+
+    subject { delete :destroy, id: dossier.id }
+
+    before do
+      sign_in user
+    end
+
+    context 'when dossier is draft' do
+      let(:dossier) { dossier_draft }
+
+      it { expect(subject.status).to eq 302 }
+
+      describe 'flash notice' do
+        before do
+          subject
+        end
+
+        it { expect(flash[:notice]).to be_present }
+      end
+
+      it 'destroy dossier is call' do
+        expect_any_instance_of(Dossier).to receive(:destroy)
+        subject
+      end
+
+      it { expect { subject }.to change { Dossier.count }.by(-1) }
+    end
+
+    context 'when dossier is not a draft' do
+      let(:dossier) { dossier_not_draft }
+
+      it { expect { subject }.to change { Dossier.count }.by(0) }
+    end
+
+  end
+
  describe 'PUT #change_siret' do
    let(:dossier) { create(:dossier, :with_entreprise, user: user, procedure: procedure) }

@ -418,14 +458,40 @@ describe Users::DossiersController, type: :controller do
    end
  end

-  describe 'GET #en_attente' do
+  describe 'GET #valides' do
    context 'when user is connected' do
      before do
        sign_in user
      end

      it 'returns http success' do
-        get :index, liste: :en_attente
+        get :index, liste: :valides
+        expect(response).to have_http_status(200)
+      end
+    end
+  end
+
+  describe 'GET #en_instruction' do
+    context 'when user is connected' do
+      before do
+        sign_in user
+      end
+
+      it 'returns http success' do
+        get :index, liste: :en_instruction
+        expect(response).to have_http_status(200)
+      end
+    end
+  end
+
+  describe 'GET #brouillon' do
+    context 'when user is connected' do
+      before do
+        sign_in user
+      end
+
+      it 'returns http success' do
+        get :index, liste: :brouillon
        expect(response).to have_http_status(200)
      end
    end
--- a/spec/controllers/users/passwords_controller_spec.rb
+++ b/spec/controllers/users/passwords_controller_spec.rb
@ -0,0 +1,30 @@
+require "spec_helper"
+
+describe Users::PasswordsController, type: :controller do
+  before do
+    @request.env["devise.mapping"] = Devise.mappings[:user]
+  end
+
+  describe "update" do
+    context "unified login" do
+      let(:user) { create(:user, email: 'unique@plop.com', password: 'password') }
+      let(:gestionnaire) { create(:gestionnaire, email: 'unique@plop.com', password: 'password') }
+
+      before do
+        allow(Features).to receive(:unified_login).and_return(true)
+        @token = user.send(:set_reset_password_token)
+        gestionnaire # make sure it's created
+      end
+
+      it "also signs gestionnaire in" do
+        put :update, user: {
+          reset_password_token: @token,
+          password: "supersecret",
+          password_confirmation: "supersecret",
+        }
+        expect(subject.current_user).to eq(user)
+        expect(subject.current_gestionnaire).to eq(gestionnaire)
+      end
+    end
+  end
+end
--- a/spec/controllers/users/sessions_controller_spec.rb
+++ b/spec/controllers/users/sessions_controller_spec.rb
@ -33,6 +33,42 @@ describe Users::SessionsController, type: :controller do

      it { is_expected.to be_falsey }
    end
+
+    context "unified login" do
+      let(:user) { create(:user, email: 'unique@plop.com', password: 'password') }
+      let(:gestionnaire) { create(:gestionnaire, email: 'unique@plop.com', password: 'password') }
+      before { allow(Features).to receive(:unified_login).and_return(true) }
+
+      it 'signs user in' do
+        post :create, user: { email: user.email, password: user.password }
+        expect(@response.redirect?).to be(true)
+        expect(subject.current_user).to eq(user)
+        expect(subject.current_gestionnaire).to be(nil)
+        expect(user.reload.loged_in_with_france_connect).to be(nil)
+      end
+
+      it 'signs gestionnaire in' do
+        post :create, user: { email: gestionnaire.email, password: gestionnaire.password }
+        expect(@response.redirect?).to be(true)
+        expect(subject.current_user).to be(nil)
+        expect(subject.current_gestionnaire).to eq(gestionnaire)
+      end
+
+      it 'signs user + gestionnaire in' do
+        post :create, user: { email: user.email, password: gestionnaire.password }
+        expect(@response.redirect?).to be(true)
+        expect(subject.current_user).to eq(user)
+        expect(subject.current_gestionnaire).to eq(gestionnaire)
+        expect(user.reload.loged_in_with_france_connect).to be(nil)
+      end
+
+      it 'fails to sign in with bad credentials' do
+        post :create, user: { email: user.email, password: 'wrong_password' }
+        expect(@response.unauthorized?).to be(true)
+        expect(subject.current_user).to be(nil)
+        expect(subject.current_gestionnaire).to be(nil)
+      end
+    end
  end

  describe '.destroy' do
@ -66,6 +102,41 @@ describe Users::SessionsController, type: :controller do
        expect(response).to redirect_to(root_path)
      end
    end
+
+    context "when associated gestionnaire" do
+      let(:user) { create(:user, email: 'unique@plop.com', password: 'password') }
+      let(:gestionnaire) { create(:gestionnaire, email: 'unique@plop.com', password: 'password') }
+
+      it 'signs user out' do
+        sign_in user
+        delete :destroy
+        expect(@response.redirect?).to be(true)
+        expect(subject.current_user).to be(nil)
+      end
+
+      it 'signs gestionnaire out' do
+        sign_in gestionnaire
+        delete :destroy
+        expect(@response.redirect?).to be(true)
+        expect(subject.current_gestionnaire).to be(nil)
+      end
+
+      it 'signs user + gestionnaire out' do
+        sign_in user
+        sign_in gestionnaire
+        delete :destroy
+        expect(@response.redirect?).to be(true)
+        expect(subject.current_user).to be(nil)
+        expect(subject.current_gestionnaire).to be(nil)
+      end
+
+      it 'signs user out from france connect' do
+        user.update_attributes(loged_in_with_france_connect: 'particulier')
+        sign_in user
+        delete :destroy
+        expect(@response.headers["Location"]).to eq(FRANCE_CONNECT.particulier_logout_endpoint)
+      end
+    end
  end

  describe '.new' do
--- a/spec/facades/dossiers_list_facades_spec.rb
+++ b/spec/facades/dossiers_list_facades_spec.rb
@ -6,22 +6,22 @@ describe DossiersListFacades do
  let(:procedure) { create :procedure }
  let(:procedure_2) { create :procedure, libelle: 'plop' }

+  let!(:preference) { create :preference_list_dossier,
+                             gestionnaire: gestionnaire,
+                             table: nil,
+                             attr: 'state',
+                             attr_decorate: 'display_state' }
+
+  let!(:preference_2) { create :preference_list_dossier,
+                               gestionnaire: gestionnaire,
+                               table: 'champs',
+                               attr: 'state',
+                               attr_decorate: 'display_state',
+                               procedure_id: procedure.id }
+
  before do
    create :assign_to, procedure: procedure, gestionnaire: gestionnaire
    create :assign_to, procedure: procedure_2, gestionnaire: gestionnaire
-
-    create :preference_list_dossier,
-           gestionnaire: gestionnaire,
-           table: nil,
-           attr: 'state',
-           attr_decorate: 'display_state'
-
-    create :preference_list_dossier,
-           gestionnaire: gestionnaire,
-           table: nil,
-           attr: 'state',
-           attr_decorate: 'display_state',
-           procedure_id: procedure.id
  end

  describe '#preference_list_dossiers_filter' do
@ -55,4 +55,80 @@ describe DossiersListFacades do
    it { expect(subject.last[:libelle]).to eq procedure_2.libelle }

  end
+
+  describe '#active_filter?' do
+    let(:table) { nil }
+    let(:filter) { nil }
+    let(:facade) { described_class.new gestionnaire, 'nouveaux', procedure_2 }
+
+    let!(:preference) { create :preference_list_dossier,
+                               gestionnaire: gestionnaire,
+                               table: table,
+                               attr: 'state',
+                               attr_decorate: 'display_state',
+                               filter: filter,
+                               procedure_id: procedure_id }
+
+    subject { facade.active_filter? preference }
+
+    context 'when gestionnaire does not have select a procedure' do
+      let(:procedure_2) { nil }
+      let(:procedure_id) { nil }
+
+      it { expect(preference.procedure).to be_nil }
+      it { is_expected.to be_truthy }
+    end
+
+    context 'when gestionnaire have select a procedure' do
+      let(:procedure_id) { procedure_2.id }
+
+      it { expect(preference.procedure).not_to be_nil }
+
+      context 'when preference is not a champs filter' do
+        let(:table) { 'entreprises' }
+
+        it { is_expected.to be_truthy }
+      end
+
+      context 'when gestionnaire have an existant filter with a champ' do
+        let(:table) { 'champs' }
+        let(:filter) { 'plop' }
+
+        context 'when the preference is the existant champ filter' do
+          it { is_expected.to be_truthy }
+        end
+
+        context 'when the preference is not the existant champ filter' do
+          let(:preference) { preference_2 }
+
+          before do
+            create :preference_list_dossier,
+                   gestionnaire: gestionnaire,
+                   table: 'champs',
+                   attr: 'state',
+                   attr_decorate: 'display_state',
+                   filter: 'plop',
+                   procedure_id: procedure_id
+          end
+
+          it { is_expected.to be_falsey }
+        end
+      end
+
+      context 'when gestionnaire does not have an existant filter with a champ' do
+        let(:table) { nil }
+        let(:filter) { 'plop' }
+
+        context 'when the preference is the existant preference filter' do
+          it { is_expected.to be_truthy }
+        end
+
+        context 'when the preference is not the existant preference filter' do
+          let(:preference) { preference_2 }
+
+          it { is_expected.to be_truthy }
+        end
+      end
+    end
+  end
 end
--- a/spec/features/backoffice/onglets_link_spec.rb
+++ b/spec/features/backoffice/onglets_link_spec.rb
@ -89,4 +89,15 @@ feature 'on click on tabs button' do
      end
    end
  end
+
+  context "OpenSimplif" do
+    before do
+      allow(Features).to receive(:opensimplif).and_return(true)
+      visit backoffice_dossiers_url
+    end
+
+    scenario "it hides the tabs" do
+      expect(page).to_not have_content('Nouveaux')
+    end
+  end
 end
--- a/spec/features/users/onglets_link_spec.rb
+++ b/spec/features/users/onglets_link_spec.rb
@ -22,21 +22,10 @@ feature 'on click on tabs button' do
  end

  context 'when user is logged in' do
-    context 'when he click on tabs nouveaux' do
-      before do
-        visit users_dossiers_url(liste: :nouveaux)
-        page.click_on 'Nouveaux 1'
-      end
-
-      scenario 'it redirect to users dossier termine' do
-        expect(page).to have_css('#users_index')
-      end
-    end
-
-    context 'when he click on tabs a traite' do
+    context 'when he click on tabs en construction' do
      before do
        visit users_dossiers_url(liste: :a_traiter)
-        page.click_on 'Action requise 1'
+        page.click_on 'En construction 3'
      end

      scenario 'it redirect to users dossier termine' do
@ -44,17 +33,6 @@ feature 'on click on tabs button' do
      end
    end

-    context 'when he click on tabs en attente' do
-      before do
-        visit users_dossiers_url(liste: :en_attente)
-        page.click_on 'Etude en cours 1'
-      end
-
-      scenario 'it redirect to users dossier en attente' do
-        expect(page).to have_css('#users_index')
-      end
-    end
-
    context 'when he click on tabs a deposes' do
      before do
        visit users_dossiers_url(liste: :valides)
@ -99,4 +77,15 @@ feature 'on click on tabs button' do
      end
    end
  end
+
+  context "OpenSimplif" do
+    before do
+      allow(Features).to receive(:opensimplif).and_return(true)
+      visit users_dossiers_url
+    end
+
+    scenario "it hides the tabs" do
+      expect(page).to_not have_css('#onglets')
+    end
+  end
 end
--- a/spec/fixtures/cassettes/call_geo_api_departements.yml
+++ b/spec/fixtures/cassettes/call_geo_api_departements.yml
@ -0,0 +1,70 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://geo.api.gouv.fr/departements?fields=nom
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - "*/*; q=0.5, application/xml"
+      Accept-Encoding:
+      - gzip, deflate
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Wed, 19 Oct 2016 09:31:34 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Vary:
+      - Accept-Encoding
+      - Accept-Encoding
+      X-Powered-By:
+      - Express
+      Access-Control-Allow-Origin:
+      - "*"
+      Etag:
+      - W/"cc1-lXUcIlpPmDfvrGONl0WWsQ"
+      Strict-Transport-Security:
+      - max-age=15552000
+      Content-Encoding:
+      - gzip
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        H4sIAAAAAAAAA22Wy27bMBBFfyXwJpsKqF96dOfYrZsibow4MFAUXTARGxOQ
+        xZYSjbpF/yfZ5w/0YyVlpDq0sxTmajg8vJzh1z+9Um9773oTVfbe9O51Lt3H
+        237v75suUpUSsQFjRaGkQXAYBH/IKspl9FHYWkZLo3eyvGeqEdStqIomhfsJ
+        CccnCRfCqFptA1VMlcmbx/sN10nCsCzL4O80CKvm8YE/Z4zaO4T6b4OQQ/ef
+        YD8guJN7o8G3T4YX2rpqHSgb3WyaZ7LuE+dUFDuRa8Dpk99UlLUoUAHJTTfC
+        yLJmgUT2Eo5e2CIN2U03POw+uU21Mc3jb65AcC5cSb/Flc275IPJsQGiVgjF
+        BRTT5tn5KD+/huMGBN0KHMnzidlqish7aqQNliDkmTa5fuAZDAh5pu0dDmBA
+        xjPTPG9ZOgm/t4YhQvWhSNbRlVYsmXA/qFJVdfMY5CDeuTDAOqQvD5fPCbRz
+        fQd2SG5zabCrIWnNlfuRzh4S18fmyQhb1MhLXJdF0W5trQqhgtUJ7rLMubEh
+        ubWxFzosnwQvqxDNkOw+WSNQHqldCbczbHxEbv44/MKh50fE5iWoaURuB+zH
+        CrJrY9GkLtzFVT8tE5FhKwPgEdFdaUYIzkV89SfnPiK4K/07JDciuYU/s1fY
+        j8hwIcqg147J0LUTnvqY8A6AjhVEuBB736m7wxsT30JaU2/a+ha6ks5pEBKg
+        E/K6j8lvoc2d2gi05jEhniYmvc9uUuxogDHpfXadBBWR2bViQTGJXQfAYgJb
+        inaYujEgFEwbE9nS7r1mFnaimNyWe9M8lc2Tn7X/vcd8rwzl7p9uRzE5Ium1
+        UW7SiIIXKybUC7ePmw2fGzGpel8cx8n1eEbGJHsw1UqEYzQh4UPwFVsnhL0S
+        3lzdbhNSXomdVgwGLbF97JxISHXpXjAgnpDkSvpLdzqHEyI8iLzzwwuWEOSX
+        nSxcLi5EjjNpf0Wr1sGUkOZKbznQUmK8dSt3eFKy86FXe09KiGuBaZeS4FrY
+        +yK4synprWWZO/ticfJbO/exZ6TkdrDHiYTU1rp6IJCUzL6EMzQlrFtp3LvU
+        N+uzXJ5dyOK7NmjOGeG9r6owU3bcGdur3h5zt88s8GDrk5Vr0XU0k+55AF0I
+        s/CpjoySBUCFk5yHTSkj07kVuSy0/cFiguvi0tfujRJMsSy4M3O7F8FmkmAW
+        irOb5smWiq/kLAnauNjrmi/YzF+Jb/8A5ygzwMEMAAA=
+    http_version: 
+  recorded_at: Wed, 19 Oct 2016 09:31:33 GMT
+recorded_with: VCR 3.0.1
--- a/spec/mailers/notification_mailer_spec.rb
+++ b/spec/mailers/notification_mailer_spec.rb
@ -18,7 +18,7 @@ RSpec.describe NotificationMailer, type: :mailer do

    subject(:subject) { described_class.dossier_validated(dossier) }

-    it { expect(subject.body).to match("Votre dossier N°#{dossier.id} a été validé par votre accompagnateur.") }
+    it { expect(subject.body).to match("Votre dossier N°#{dossier.id} est prêt à être déposé pour instruction.") }
    it { expect(subject.body).to include("Afin de finaliser son dépôt, merci de vous rendre sur #{users_dossier_recapitulatif_url(dossier_id: dossier.id)}") }
    it { expect(subject.subject).to eq("Votre dossier TPS N°#{dossier.id} a été validé") }
  end
--- a/spec/models/champ_shared_example.rb
+++ b/spec/models/champ_shared_example.rb
@ -35,4 +35,10 @@ shared_examples 'champ_spec' do
      it { is_expected.to eq 'typeahead' }
    end
  end
+
+  describe '.departement', vcr: {cassette_name: 'call_geo_api_departements'} do
+    subject { Champ.departements }
+
+    it { expect(subject).to include '99 - Étranger' }
+  end
 end
--- a/spec/models/gestionnaire_spec.rb
+++ b/spec/models/gestionnaire_spec.rb
@ -184,4 +184,19 @@ describe Gestionnaire, type: :model do
      end
    end
  end
+
+  context 'unified login' do
+    before { allow(Features).to receive(:unified_login).and_return(true) }
+
+    it 'syncs credentials to associated user' do
+      gestionnaire = create(:gestionnaire)
+      user = create(:user, email: gestionnaire.email)
+
+      gestionnaire.update_attributes(email: 'whoami@plop.com', password: 'super secret')
+
+      user.reload
+      expect(user.email).to eq('whoami@plop.com')
+      expect(user.valid_password?('super secret')).to be(true)
+    end
+  end
 end
--- a/spec/models/preference_list_dossier_spec.rb
+++ b/spec/models/preference_list_dossier_spec.rb
@ -296,7 +296,7 @@ describe PreferenceListDossier do
    end

    context 'when a procedure ID is pasted' do
-      let(:procedure) { (create :procedure, :with_type_de_champ) }
+      let(:procedure) { (create :procedure, :with_type_de_champ, :with_type_de_champ_private) }
      let(:procedure_id) { procedure.id }

      describe 'champs' do
@ -316,6 +316,24 @@ describe PreferenceListDossier do
          it { expect(subject[:filter]).to be_nil }
        end
      end
+
+      describe 'champs private' do
+        subject { super()[:champs_private] }
+
+        it { expect(subject.size).to eq 1 }
+
+        describe 'first champs' do
+          subject { super()["type_de_champ_private_#{procedure.types_de_champ_private.first.id}"] }
+
+          it { expect(subject[:libelle]).to eq 'Description' }
+          it { expect(subject[:table]).to eq 'champs_private' }
+          it { expect(subject[:attr]).to eq procedure.types_de_champ_private.first.id }
+          it { expect(subject[:attr_decorate]).to eq 'value' }
+          it { expect(subject[:bootstrap_lg]).to eq 2 }
+          it { expect(subject[:order]).to be_nil }
+          it { expect(subject[:filter]).to be_nil }
+        end
+      end
    end
  end
 end
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@ -72,4 +72,19 @@ describe User, type: :model do
      it { is_expected.to be_falsey }
    end
  end
+
+  context 'unified login' do
+    before { allow(Features).to receive(:unified_login).and_return(true) }
+
+    it 'syncs credentials to associated gestionnaire' do
+      user = create(:user)
+      gestionnaire = create(:gestionnaire, email: user.email)
+
+      user.update_attributes(email: 'whoami@plop.com', password: 'super secret')
+
+      gestionnaire.reload
+      expect(gestionnaire.email).to eq('whoami@plop.com')
+      expect(gestionnaire.valid_password?('super secret')).to be(true)
+    end
+  end
 end
--- a/spec/services/dossiers_list_gestionnaire_service_spec.rb
+++ b/spec/services/dossiers_list_gestionnaire_service_spec.rb
@ -125,6 +125,43 @@ describe DossiersListGestionnaireService do
    end
  end

+  describe '#join_filter' do
+
+    subject { DossiersListGestionnaireService.new(gestionnaire, liste, nil).joins_filter }
+
+    it { is_expected.to eq []}
+
+    context 'when a filter is fielded' do
+      before do
+        gestionnaire.preference_list_dossiers
+            .find_by(table: 'entreprise', attr: 'raison_sociale', procedure: nil)
+            .update_column :filter, 'plop'
+      end
+
+      it { is_expected.to eq [:entreprise] }
+    end
+
+    context 'when a filter is empty' do
+      before do
+        gestionnaire.preference_list_dossiers
+            .find_by(table: 'entreprise', attr: 'raison_sociale', procedure: nil)
+            .update_column :filter, ''
+      end
+
+      it { is_expected.to eq [] }
+    end
+
+    context 'when a filter is nil' do
+      before do
+        gestionnaire.preference_list_dossiers
+            .find_by(table: 'entreprise', attr: 'raison_sociale', procedure: nil)
+            .update_column :filter, nil
+      end
+
+      it { is_expected.to eq [] }
+    end
+  end
+
  describe '#where_filter' do
    before do
      gestionnaire.preference_list_dossiers
@ -170,6 +207,41 @@ describe DossiersListGestionnaireService do

      it { is_expected.to eq "CAST(dossiers.id as TEXT) LIKE '%23%' AND CAST(entreprises.raison_sociale as TEXT) LIKE 'plop%plip'" }
    end
+
+    context "when filter containe the character <'> " do
+      before do
+        gestionnaire.preference_list_dossiers
+            .find_by(table: 'entreprise', attr: 'raison_sociale', procedure: nil)
+            .update_column :filter, "MCDONALD'S FRANCE"
+      end
+
+      it { is_expected.to eq "CAST(dossiers.id as TEXT) LIKE '%23%' AND CAST(entreprises.raison_sociale as TEXT) LIKE '%MCDONALD''S FRANCE%'" }
+    end
+
+    context "when filter is empty " do
+      before do
+        gestionnaire.preference_list_dossiers
+            .find_by(table: 'entreprise', attr: 'raison_sociale', procedure: nil)
+            .update_column :filter, ""
+      end
+
+      it { is_expected.to eq "CAST(dossiers.id as TEXT) LIKE '%23%'" }
+    end
+
+    context 'when preference list contain a champ' do
+      before do
+        create :preference_list_dossier,
+               gestionnaire: gestionnaire,
+               table: 'champs',
+               attr: '34',
+               attr_decorate: '',
+               filter: 'plop',
+               procedure_id: create(:procedure)
+      end
+
+      it { is_expected.to eq "CAST(dossiers.id as TEXT) LIKE '%23%' AND CAST(entreprises.raison_sociale as TEXT) LIKE '%plop%' AND champs.type_de_champ_id = 34 AND CAST(champs.value as TEXT) LIKE '%plop%'" }
+
+    end
  end

  describe '#default_page' do
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@ -75,6 +75,20 @@ module SmartListing
  end
 end

+class Features
+  #def self.remote_storage
+  #  true
+  #end
+
+  def self.unified_login
+    false
+  end
+
+  def self.opensimplif
+    false
+  end
+end
+
 WebMock.disable_net_connect!(allow_localhost: true)

 RSpec.configure do |config|
--- a/spec/views/admin/procedures/show.html.haml_spec.rb
+++ b/spec/views/admin/procedures/show.html.haml_spec.rb
@ -10,18 +10,34 @@ describe 'admin/procedures/show.html.haml', type: :view do
  end

  describe 'procedure is draft' do
-    before do
-      render
+    context 'when procedure does not have a gestionnare affected' do
+      before do
+        render
+      end
+
+      describe 'publish button is not visible' do
+        it { expect(rendered).not_to have_css('a#publish') }
+        it { expect(rendered).not_to have_css('button#archive') }
+        it { expect(rendered).not_to have_css('a#reenable') }
+      end
    end

-    describe 'publish button is visible' do
-      it { expect(rendered).to have_css('a#publish') }
-      it { expect(rendered).not_to have_css('button#archive') }
-      it { expect(rendered).not_to have_css('a#reenable') }
-    end
+    context 'when procedure have a gestionnare affected' do

-    describe 'procedure link is not present' do
-      it { expect(rendered).to have_content('Cette procédure n\'a pas encore été publiée et n\'est donc pas accessible par le public.') }
+      before do
+        create :assign_to, gestionnaire: create(:gestionnaire), procedure: procedure
+        render
+      end
+
+      describe 'publish button is visible' do
+        it { expect(rendered).to have_css('a#publish') }
+        it { expect(rendered).not_to have_css('button#archive') }
+        it { expect(rendered).not_to have_css('a#reenable') }
+      end
+
+      describe 'procedure link is not present' do
+        it { expect(rendered).to have_content('Cette procédure n\'a pas encore été publiée et n\'est donc pas accessible par le public.') }
+      end
    end
  end

--- a/spec/views/backoffice/dossiers/show.html.html_spec.rb
+++ b/spec/views/backoffice/dossiers/show.html.html_spec.rb
@ -9,6 +9,8 @@ describe 'backoffice/dossiers/show.html.haml', type: :view do
  before do
    sign_in gestionnaire
    assign(:facade, (DossierFacades.new dossier.id, gestionnaire.email))
+
+    @request.env['PATH_INFO'] = 'backoffice/user'
  end

  context 'on the dossier gestionnaire page' do
@ -59,9 +61,9 @@ describe 'backoffice/dossiers/show.html.haml', type: :view do

      it { expect(rendered).to have_content('Nouveau') }

-      it 'button Valider le dossier is present' do
-        expect(rendered).to have_css('#action_button')
-        expect(rendered).to have_content('Valider le dossier')
+      it 'button Déclarer complet is present' do
+        expect(rendered).to have_css('.action_button')
+        expect(rendered).to have_content('Déclarer complet')
      end
    end

@ -74,9 +76,9 @@ describe 'backoffice/dossiers/show.html.haml', type: :view do

      it { expect(rendered).to have_content('Répondu') }

-      it 'button Valider le dossier is present' do
-        expect(rendered).to have_css('#action_button')
-        expect(rendered).to have_content('Valider le dossier')
+      it 'button Déclarer complet is present' do
+        expect(rendered).to have_css('.action_button')
+        expect(rendered).to have_content('Déclarer complet')
      end
    end

@ -89,9 +91,9 @@ describe 'backoffice/dossiers/show.html.haml', type: :view do

      it { expect(rendered).to have_content('Mis à jour') }

-      it 'button Valider le dossier is present' do
-        expect(rendered).to have_css('#action_button')
-        expect(rendered).to have_content('Valider le dossier')
+      it 'button Déclarer complet is present' do
+        expect(rendered).to have_css('.action_button')
+        expect(rendered).to have_content('Déclarer complet')
      end
    end

@ -104,9 +106,9 @@ describe 'backoffice/dossiers/show.html.haml', type: :view do

      it { expect(rendered).to have_content('Figé') }

-      it 'button Valider le dossier  is not present' do
-        expect(rendered).not_to have_css('#action_button')
-        expect(rendered).not_to have_content('Valider le dossier')
+      it 'button Déclarer complet  is not present' do
+        expect(rendered).not_to have_css('.action_button')
+        expect(rendered).not_to have_content('Déclarer complet')
      end
    end

@ -120,11 +122,11 @@ describe 'backoffice/dossiers/show.html.haml', type: :view do
      it { expect(rendered).to have_content('Déposé') }

      it 'button notifier de la bonne réception is present' do
-        expect(rendered).to have_css('#action_button')
+        expect(rendered).to have_css('.action_button')
        expect(rendered).to have_content('Notifier de la bonne réception')
      end

-      it 'button Valider le dossier is not present' do
+      it 'button Déclarer complet is not present' do
        expect(rendered).not_to have_content('Accepter le dossier')
      end
    end
@ -170,7 +172,7 @@ describe 'backoffice/dossiers/show.html.haml', type: :view do

      it { expect(rendered).to have_content('Sans suite') }

-      it 'button Valider le dossier is not present' do
+      it 'button Déclarer complet is not present' do
        expect(rendered).not_to have_css('.action_button[data-toggle="tooltip"][title="Accepter"]')
        expect(rendered).not_to have_css('.action_button[data-toggle="tooltip"][title="Classer sans suite"]')
        expect(rendered).not_to have_css('.action_button[data-toggle="tooltip"][title="Refuser"]')
@ -186,7 +188,7 @@ describe 'backoffice/dossiers/show.html.haml', type: :view do

      it { expect(rendered).to have_content('Refusé') }

-      it 'button Valider le dossier is not present' do
+      it 'button Déclarer complet is not present' do
        expect(rendered).not_to have_css('.action_button[data-toggle="tooltip"][title="Accepter"]')
        expect(rendered).not_to have_css('.action_button[data-toggle="tooltip"][title="Classer sans suite"]')
        expect(rendered).not_to have_css('.action_button[data-toggle="tooltip"][title="Refuser"]')
--- a/spec/views/users/dossiers/index_html.haml_spec.rb
+++ b/spec/views/users/dossiers/index_html.haml_spec.rb
@ -46,33 +46,19 @@ describe 'users/dossiers/index.html.haml', type: :view do
    end
  end

-  describe 'on tab nouveaux' do
-    let(:total_dossiers) { 1 }
-    let(:active_class) { '.active .text-info' }
-    let(:dossiers_to_display) { user.dossiers.nouveaux }
-    let(:liste) { 'nouveaux' }
+  describe 'on tab en construction' do
+    let(:total_dossiers) { 3 }
+    let(:active_class) { '.active .text-danger' }
+    let(:dossiers_to_display) { user.dossiers.en_construction }
+    let(:liste) { 'a_traiter' }

    it_behaves_like 'check_tab_content' do
      let(:decorate_dossier_at_check) { decorate_dossier_initiated }
    end
-  end
-
-  describe 'on tab action requise' do
-    let(:total_dossiers) { 1 }
-    let(:active_class) { '.active .text-danger' }
-    let(:dossiers_to_display) { user.dossiers.waiting_for_user_without_validated }
-    let(:liste) { 'a_traiter' }

    it_behaves_like 'check_tab_content' do
      let(:decorate_dossier_at_check) { decorate_dossier_replied }
    end
-  end
-
-  describe 'on tab etude en cours' do
-    let(:total_dossiers) { 1 }
-    let(:active_class) { '.active .text-default' }
-    let(:dossiers_to_display) { user.dossiers.waiting_for_gestionnaire }
-    let(:liste) { 'en_attente' }

    it_behaves_like 'check_tab_content' do
      let(:decorate_dossier_at_check) { decorate_dossier_updated }
				`@ -0,0 +1 @@`
				`= render partial: 'users/description/champs/drop_down_template', locals: {values: Champ.departements, champ: champ}`
				`@ -0,0 +1,3 @@`
				`= render partial: 'users/description/champs/drop_down_template', locals: {values: Champ.regions, champ: champ}`