From cae5b37e38a4c0d46cb4da26772e765df4c0c2d0 Mon Sep 17 00:00:00 2001
From: Mathieu Magnin <mathieu.magnin@gmail.com>
Date: Tue, 21 Feb 2017 18:05:48 +0100
Subject: [PATCH 1/5] First step to remove :validated and :submitted states

---
 .../backoffice/dossiers_controller.rb         | 13 +---
 app/models/dossier.rb                         | 22 +-----
 app/views/admin/mail_templates/edit.html.haml |  3 +-
 ...ckoffice_dossierscontroller_show.html.haml | 11 +--
 ...l_users_dossierscontroller_index.html.haml | 10 +--
 ...221143909_remove_useless_dossier_states.rb |  5 ++
 db/schema.rb                                  |  2 +-
 spec/models/mail_template_spec.rb             |  2 +-
 ...backoffice_dossierscontroller_show_spec.rb | 54 +++------------
 ...nel_users_dossierscontroller_index_spec.rb | 67 -------------------
 10 files changed, 28 insertions(+), 161 deletions(-)
 create mode 100644 db/migrate/20170221143909_remove_useless_dossier_states.rb
 delete mode 100644 spec/views/layouts/left_panels/_left_panel_users_dossierscontroller_index_spec.rb

diff --git a/app/controllers/backoffice/dossiers_controller.rb b/app/controllers/backoffice/dossiers_controller.rb
index 9237e091a..88b4fd83e 100644
--- a/app/controllers/backoffice/dossiers_controller.rb
+++ b/app/controllers/backoffice/dossiers_controller.rb
@@ -85,21 +85,10 @@ class Backoffice::DossiersController < Backoffice::DossiersListController
                          default_sort: dossiers_list_facade.service.default_sort
   end
 
-  def valid
-    create_dossier_facade params[:dossier_id]
-
-    @facade.dossier.next_step! 'gestionnaire', 'valid'
-    flash.notice = 'Dossier confirmé avec succès.'
-
-    NotificationMailer.dossier_validated(@facade.dossier).deliver_now!
-
-    redirect_to backoffice_dossier_path(id: @facade.dossier.id)
-  end
-
   def receive
     create_dossier_facade params[:dossier_id]
 
-    @facade.dossier.next_step! 'gestionnaire', 'receive'
+    @facade.dossier.received!
     flash.notice = 'Dossier considéré comme reçu.'
 
     NotificationMailer.dossier_received(@facade.dossier).deliver_now!
diff --git a/app/models/dossier.rb b/app/models/dossier.rb
index 90eed3839..9041a2775 100644
--- a/app/models/dossier.rb
+++ b/app/models/dossier.rb
@@ -5,8 +5,8 @@ class Dossier < ActiveRecord::Base
                initiated: 'initiated',
                replied: 'replied', #action utilisateur demandé
                updated: 'updated', #etude par l'administration en cours
-               validated: 'validated',
-               submitted: 'submitted',
+              #  validated: 'validated',
+              #  submitted: 'submitted',
                received: 'received',
                closed: 'closed',
                refused: 'refused',
@@ -122,10 +122,6 @@ class Dossier < ActiveRecord::Base
           if draft?
             initiated!
           end
-        when 'submit'
-          if validated?
-            submitted!
-          end
         when 'update'
           if replied?
             updated!
@@ -147,18 +143,6 @@ class Dossier < ActiveRecord::Base
           if initiated?
             updated!
           end
-        when 'valid'
-          if updated?
-            validated!
-          elsif replied?
-            validated!
-          elsif initiated?
-            validated!
-          end
-        when 'receive'
-          if submitted?
-            received!
-          end
         when 'close'
           if received?
             closed!
@@ -332,7 +316,7 @@ class Dossier < ActiveRecord::Base
   end
 
   def read_only?
-    validated? || received? || submitted? || closed? || refused? || without_continuation?
+    received? || closed? || refused? || without_continuation?
   end
 
   def owner? email
diff --git a/app/views/admin/mail_templates/edit.html.haml b/app/views/admin/mail_templates/edit.html.haml
index 8b02f1b78..f166c6879 100644
--- a/app/views/admin/mail_templates/edit.html.haml
+++ b/app/views/admin/mail_templates/edit.html.haml
@@ -22,7 +22,6 @@
         - MailTemplate::TAGS.each do |balise|
           %tr
             %td.center
-              %b.text-success
-                = "--#{balise.first}--"
+              = "--#{balise.first}--"
             %td
               =balise.second[:description]
diff --git a/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_show.html.haml b/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_show.html.haml
index 512ceb8f0..13a482ccc 100644
--- a/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_show.html.haml
+++ b/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_show.html.haml
@@ -4,14 +4,9 @@
 
 %div#action-block
   - 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{'data-toggle' => :tooltip, title: 'En cliquant ici, vous figez le dossier et autorisez le dépôt du dossier pour instruction.'}
-          = 'Déclarer complet'.upcase
-    - 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
-          = 'Accuser réception'.upcase
+    - if !@facade.dossier.read_only? || @facade.dossier.initiated?
+      = link_to 'Accuser réception', backoffice_dossier_receive_path(@facade.dossier), method: :post, class: 'btn btn-danger btn-block'
+
     - 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.close-dossier
diff --git a/app/views/layouts/left_panels/_left_panel_users_dossierscontroller_index.html.haml b/app/views/layouts/left_panels/_left_panel_users_dossierscontroller_index.html.haml
index 84fd54139..64867e81a 100644
--- a/app/views/layouts/left_panels/_left_panel_users_dossierscontroller_index.html.haml
+++ b/app/views/layouts/left_panels/_left_panel_users_dossierscontroller_index.html.haml
@@ -23,11 +23,11 @@
           .badge.progress-bar-danger
             = @dossiers_list_facade.en_construction_total
 
-      %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.'}
-        %div.procedure_list_element{ class: @dossiers_list_facade.valides_class, id: 'valides' }
-          ="À déposer"
-          .badge.progress-bar-purple
-            = @dossiers_list_facade.valides_total
+      -# %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.'}
+      -#   %div.procedure_list_element{ class: @dossiers_list_facade.valides_class, id: 'valides' }
+      -#     ="À déposer"
+      -#     .badge.progress-bar-purple
+      -#       = @dossiers_list_facade.valides_total
 
       %a{:href => "#{url_for users_dossiers_path(liste: 'en_instruction')}", 'data-toggle' => :tooltip, title: 'Les dossiers en cours d\'examen par l\'administration compétante.'}
         %div.procedure_list_element{ class: @dossiers_list_facade.en_instruction_class, id: 'en_instruction' }
diff --git a/db/migrate/20170221143909_remove_useless_dossier_states.rb b/db/migrate/20170221143909_remove_useless_dossier_states.rb
new file mode 100644
index 000000000..f907271d5
--- /dev/null
+++ b/db/migrate/20170221143909_remove_useless_dossier_states.rb
@@ -0,0 +1,5 @@
+class RemoveUselessDossierStates < ActiveRecord::Migration[5.0]
+  def change
+    Dossier.where(state: [:validated, :submitted]).update_all(state: :initiated)
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 3af9d7709..ca83855cc 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170215142944) do
+ActiveRecord::Schema.define(version: 20170221143909) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
diff --git a/spec/models/mail_template_spec.rb b/spec/models/mail_template_spec.rb
index 856c104fb..fb27e5d94 100644
--- a/spec/models/mail_template_spec.rb
+++ b/spec/models/mail_template_spec.rb
@@ -39,7 +39,7 @@ describe MailTemplate do
     end
   end
 
-  xdescribe '.replace_tags' do
+  describe '.replace_tags' do
     let(:dossier) { create :dossier }
     let(:procedure) { dossier.procedure }
     let(:mail_received) { procedure.mail_received }
diff --git a/spec/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_show_spec.rb b/spec/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_show_spec.rb
index 032adf4a4..4d3b8cac5 100644
--- a/spec/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_show_spec.rb
+++ b/spec/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_show_spec.rb
@@ -23,6 +23,11 @@ describe 'layouts/left_panels/_left_panel_backoffice_dossierscontroller_show.htm
   end
 
   context 'button dossier state changements' do
+
+    shared_examples 'button Accuser réception is present' do
+      it { expect(rendered).to have_link('Accuser réception') }
+    end
+
     context 'when dossier have state initiated' do
       let(:state) { 'initiated' }
 
@@ -32,10 +37,7 @@ describe 'layouts/left_panels/_left_panel_backoffice_dossierscontroller_show.htm
 
       it { expect(rendered).to have_content('Nouveau') }
 
-      it 'button Déclarer complet is present' do
-        expect(rendered).to have_css('.action')
-        expect(rendered).to have_content('DÉCLARER COMPLET')
-      end
+      include_examples 'button Accuser réception is present'
     end
 
     context 'when dossier have state replied' do
@@ -47,10 +49,7 @@ describe 'layouts/left_panels/_left_panel_backoffice_dossierscontroller_show.htm
 
       it { expect(rendered).to have_content('En construction') }
 
-      it 'button Déclarer complet is present' do
-        expect(rendered).to have_css('.action')
-        expect(rendered).to have_content('DÉCLARER COMPLET')
-      end
+      include_examples 'button Accuser réception is present'
     end
 
     context 'when dossier have state update' do
@@ -62,44 +61,7 @@ describe 'layouts/left_panels/_left_panel_backoffice_dossierscontroller_show.htm
 
       it { expect(rendered).to have_content('En construction') }
 
-      it 'button Déclarer complet is present' do
-        expect(rendered).to have_css('.action')
-        expect(rendered).to have_content('DÉCLARER COMPLET')
-      end
-    end
-
-    context 'when dossier have state validated' do
-      let(:state) { 'validated' }
-
-      before do
-        render
-      end
-
-      it { expect(rendered).to have_content('Figé') }
-
-      it 'button Déclarer complet  is not present' do
-        expect(rendered).not_to have_css('.action')
-        expect(rendered).not_to have_content('Déclarer complet')
-      end
-    end
-
-    context 'when dossier have state submitted' do
-      let(:state) { 'submitted' }
-
-      before do
-        render
-      end
-
-      it { expect(rendered).to have_content('Déposé / À réceptionner') }
-
-      it 'button Accuser réception is present' do
-        expect(rendered).to have_css('.action')
-        expect(rendered).to have_content('ACCUSER RÉCEPTION')
-      end
-
-      it 'button Déclarer complet is not present' do
-        expect(rendered).not_to have_content('Accepter le dossier')
-      end
+      include_examples 'button Accuser réception is present'
     end
 
     context 'when dossier have state received' do
diff --git a/spec/views/layouts/left_panels/_left_panel_users_dossierscontroller_index_spec.rb b/spec/views/layouts/left_panels/_left_panel_users_dossierscontroller_index_spec.rb
deleted file mode 100644
index 1270bed0b..000000000
--- a/spec/views/layouts/left_panels/_left_panel_users_dossierscontroller_index_spec.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-require 'spec_helper'
-
-describe 'layouts/left_panels/_left_panel_users_dossierscontroller_index.html.haml', type: :view do
-
-  shared_examples 'active_tab' do
-    let(:user) { create :user }
-
-    before do
-      sign_in user
-
-      create :dossier, user: user
-
-      assign :dossiers_list_facade, (DossiersListFacades.new user, param_list)
-
-      render
-    end
-
-    subject { rendered }
-
-    let(:active_class) { 'div.procedure_list_element.active '+active_klass }
-    let(:param_list) { liste }
-
-    it { is_expected.to have_selector(active_class) }
-  end
-
-  describe 'list brouillon' do
-    let(:active_klass) { '.progress-bar-default' }
-    let(:liste) { 'brouillon' }
-
-    it_behaves_like 'active_tab'
-  end
-
-  describe 'list en construction' do
-    let(:active_klass) { '.progress-bar-danger' }
-    let(:liste) { 'a_traiter' }
-
-    it_behaves_like 'active_tab'
-  end
-
-  describe 'list a depose' do
-    let(:active_klass) { '.progress-bar-purple' }
-    let(:liste) { 'valides' }
-
-    it_behaves_like 'active_tab'
-  end
-
-  describe 'list en examen' do
-    let(:active_klass) { '.progress-bar-default' }
-    let(:liste) { 'en_instruction' }
-
-    it_behaves_like 'active_tab'
-  end
-
-  describe 'list cloture' do
-    let(:active_klass) { '.progress-bar-success' }
-    let(:liste) { 'termine' }
-
-    it_behaves_like 'active_tab'
-  end
-
-  describe 'list invite' do
-    let(:active_klass) { '.progress-bar-warning' }
-    let(:liste) { 'invite' }
-
-    it_behaves_like 'active_tab'
-  end
-end
\ No newline at end of file

From 3fcf9bf350c5f8b6f6ffb3a634f95001b271beca Mon Sep 17 00:00:00 2001
From: Mathieu Magnin <mathieu.magnin@gmail.com>
Date: Wed, 22 Feb 2017 16:06:58 +0100
Subject: [PATCH 2/5] Landing is no longer a symlink on prod/staging env, new
 call to action on landing is a mailto

---
 app/assets/stylesheets/navbar.scss            |  6 +-----
 app/views/layouts/_navbar.html.haml           | 14 ++++++-------
 .../navbars/_navbar_log_options.html.haml     |  2 +-
 app/views/root/landing.html.haml              | 20 ++++++++++---------
 config/deploy.rb                              |  1 -
 5 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/app/assets/stylesheets/navbar.scss b/app/assets/stylesheets/navbar.scss
index dd22714b9..ff11f412f 100644
--- a/app/assets/stylesheets/navbar.scss
+++ b/app/assets/stylesheets/navbar.scss
@@ -84,12 +84,8 @@
     #sign_in{
       margin-top: 7px;
       .btn {
-        color: #003C92;
         float: right;
-        margin-right: 1.3em;
-      }
-      .btn:hover {
-        color: #668ABD;
+        margin-right: 15px;
       }
     }
 
diff --git a/app/views/layouts/_navbar.html.haml b/app/views/layouts/_navbar.html.haml
index 447f070ce..e06e7ac45 100644
--- a/app/views/layouts/_navbar.html.haml
+++ b/app/views/layouts/_navbar.html.haml
@@ -1,14 +1,14 @@
-%div.col-lg-2.col-md-2.col-sm-2.col-xs-2
+.col-xs-2
   %a#title_navbar{href: '/'}
-    %div.row#home
-      %div.col-lg-6.no-padding
+    .row#home
+      .col-lg-6.no-padding
         = image_tag('marianne_small.png', class: 'logo')
-      %div.col-lg-6.no-padding#tps-title
+      .col-lg-6.no-padding#tps-title
         TPS
 
-%div.col-lg-10.col-md-10.col-sm-10.col-xs-10.no-padding
-  %div#navbar-body
-    %div.row
+.col-xs-10.no-padding
+  #navbar-body
+    .row
       -begin
         = render partial: @navbar_url
       -rescue
diff --git a/app/views/layouts/navbars/_navbar_log_options.html.haml b/app/views/layouts/navbars/_navbar_log_options.html.haml
index 2bf95e4fa..99709e842 100644
--- a/app/views/layouts/navbars/_navbar_log_options.html.haml
+++ b/app/views/layouts/navbars/_navbar_log_options.html.haml
@@ -14,4 +14,4 @@
     = render partial: 'layouts/credentials'
 -else
   .col-lg-1.col-md-1.col-sm-1.col-xs-1#sign_in
-    = link_to "Connexion", '/users/sign_in', :class => 'btn btn-lg'
\ No newline at end of file
+    = link_to "Connexion", new_user_session_path, :class => 'btn btn-lg btn-primary'
\ No newline at end of file
diff --git a/app/views/root/landing.html.haml b/app/views/root/landing.html.haml
index c4ad61372..554e87cd5 100644
--- a/app/views/root/landing.html.haml
+++ b/app/views/root/landing.html.haml
@@ -1,18 +1,20 @@
 #landing.max-size
   #title
+    .center
+      = image_tag 'logos/logo-tps.png', id: 'logo-tps'
     %h1.center
-      %img#logo-tps{src: image_url('logos/logo-tps.png')}
-    %h2.center
       TéléProcédure Simplifiée
 
-    %h3.center
-      Plateforme publique pour réaliser des démarches administratives 100% en ligne.
+    .row
+      .col-md-8.col-md-push-2.center
+        %h3
+          Dématérialisez n'importe quelle démarche administrative en quelques minutes,
+          avec un outil
+          %strong
+            gratuit, simple, collaboratif et sûr
 
-    %br
-    %br
-    .center
-      %button.background-tps.js-scrollTo.btn.btn-lg{cible: '.demo_account'}
-        Envie d'essayer ?
+        %p.mt-1 Vous êtes intéressés ?
+        %p= link_to 'Programmer une démo', "mailto:#{t('dynamics.contact_email')}?subject=Demande de démo TPS", target: '_blank', class: 'btn btn-danger btn-lg'
 
 #landing_body.max-size
   .row#etapes.center
diff --git a/config/deploy.rb b/config/deploy.rb
index 8403f2974..8c9306ae9 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -87,7 +87,6 @@ set :shared_paths, [
                      'config/france_connect.yml',
                      'config/initializers/mailjet.rb',
                      'config/initializers/storage_url.rb',
-                     'app/views/root/landing.html.haml',
                      'app/views/layouts/_google_analytics.html',
                      'app/views/cgu/index.html.haml'
                  ]

From 10add61bd16e61e59a464554f898d05d61fd29c6 Mon Sep 17 00:00:00 2001
From: Mathieu Magnin <mathieu.magnin@gmail.com>
Date: Thu, 23 Feb 2017 17:54:11 +0100
Subject: [PATCH 3/5] Clean some tests after removing :validated & :submitted
 states

---
 .../users/recapitulatif_controller.rb         | 11 +--
 app/models/dossier.rb                         | 40 +--------
 .../dossiers_list_gestionnaire_service.rb     | 13 +--
 app/services/dossiers_list_user_service.rb    |  7 +-
 ...l_users_dossierscontroller_index.html.haml |  6 --
 ...ers_recapitulatifcontroller_show.html.haml |  5 --
 config/locales/models/dossier/fr.yml          |  2 -
 config/routes.rb                              |  3 -
 .../backoffice/dossiers_controller_spec.rb    | 27 +-----
 .../users/carte_controller_shared_example.rb  |  2 +-
 .../description_controller_shared_example.rb  |  2 +-
 .../users/dossiers_controller_spec.rb         | 15 +---
 .../users/recapitulatif_controller_spec.rb    | 36 --------
 spec/decorators/dossier_decorator_spec.rb     | 10 ---
 .../admin_procedures_show_facades_spec.rb     | 20 ++---
 spec/models/dossier_spec.rb                   | 88 -------------------
 .../user_routes_authorization_service_spec.rb | 50 -----------
 .../dossiers/index_html.haml_spec.rb          |  8 +-
 ...users_recapitulatifcontroller_show_spec.rb | 37 --------
 .../users/dossiers/index_html.haml_spec.rb    | 18 +---
 .../recapitulatif/show.html.haml_spec.rb      | 24 -----
 21 files changed, 20 insertions(+), 404 deletions(-)

diff --git a/app/controllers/users/recapitulatif_controller.rb b/app/controllers/users/recapitulatif_controller.rb
index 4a63ed4c9..8315380c8 100644
--- a/app/controllers/users/recapitulatif_controller.rb
+++ b/app/controllers/users/recapitulatif_controller.rb
@@ -17,18 +17,9 @@ class Users::RecapitulatifController < UsersController
     redirect_to users_dossier_recapitulatif_path
   end
 
-  def submit
-    create_dossier_facade
-
-    @facade.dossier.submit!
-    flash.notice = 'Dossier déposé avec succès.'
-
-    redirect_to users_dossier_recapitulatif_path
-  end
-
   def self.route_authorization
     {
-        states: [:initiated, :replied, :updated, :validated, :received, :submitted, :without_continuation, :closed, :refused]
+        states: [:initiated, :replied, :updated, :received, :without_continuation, :closed, :refused]
     }
   end
 
diff --git a/app/models/dossier.rb b/app/models/dossier.rb
index 9041a2775..88acb1cee 100644
--- a/app/models/dossier.rb
+++ b/app/models/dossier.rb
@@ -5,8 +5,6 @@ class Dossier < ActiveRecord::Base
                initiated: 'initiated',
                replied: 'replied', #action utilisateur demandé
                updated: 'updated', #etude par l'administration en cours
-              #  validated: 'validated',
-              #  submitted: 'submitted',
                received: 'received',
                closed: 'closed',
                refused: 'refused',
@@ -42,7 +40,6 @@ class Dossier < ActiveRecord::Base
 
   after_save :build_default_champs, if: Proc.new { procedure_id_changed? }
   after_save :build_default_individual, if: Proc.new { procedure.for_individual? }
-  after_save :internal_notification
 
   validates :user, presence: true
 
@@ -50,14 +47,12 @@ class Dossier < ActiveRecord::Base
   NOUVEAUX = %w(initiated)
   OUVERT = %w(updated replied)
   WAITING_FOR_GESTIONNAIRE = %w(updated)
-  WAITING_FOR_USER = %w(replied validated)
+  WAITING_FOR_USER = %w(replied)
   EN_CONSTRUCTION = %w(initiated updated replied)
-  VALIDES = %w(validated)
-  DEPOSES = %w(submitted)
-  EN_INSTRUCTION = %w(submitted received)
+  EN_INSTRUCTION = %w(received)
   A_INSTRUIRE = %w(received)
   TERMINE = %w(closed refused without_continuation)
-  ALL_STATE = %w(initiated updated replied validated submitted received closed refused without_continuation)
+  ALL_STATE = %w(initiated updated replied received closed refused without_continuation)
 
   def unreaded_notifications
     @unreaded_notif ||= notifications.where(already_read: false)
@@ -108,7 +103,7 @@ class Dossier < ActiveRecord::Base
   end
 
   def next_step! role, action
-    unless %w(initiate follow update comment valid submit receive refuse without_continuation close).include?(action)
+    unless %w(initiate follow update comment receive refuse without_continuation close).include?(action)
       fail 'action is not valid'
     end
 
@@ -192,18 +187,6 @@ class Dossier < ActiveRecord::Base
     where(state: OUVERT, archived: false).order("updated_at #{order}")
   end
 
-  def self.valides order = 'ASC'
-    where(state: VALIDES, archived: false).order("updated_at #{order}")
-  end
-
-  def self.fige order = 'ASC'
-    where(state: VALIDES, archived: false).order("updated_at #{order}")
-  end
-
-  def self.deposes order = 'ASC'
-    where(state: DEPOSES, archived: false).order("updated_at #{order}")
-  end
-
   def self.a_instruire order = 'ASC'
     where(state: A_INSTRUIRE, archived: false).order("updated_at #{order}")
   end
@@ -308,13 +291,6 @@ class Dossier < ActiveRecord::Base
     follows.size
   end
 
-  def submit!
-    self.deposit_datetime= DateTime.now
-
-    next_step! 'user', 'submit'
-    NotificationMailer.dossier_submitted(self).deliver_now!
-  end
-
   def read_only?
     received? || closed? || refused? || without_continuation?
   end
@@ -326,12 +302,4 @@ class Dossier < ActiveRecord::Base
   def invite_by_user? email
     (invites_user.pluck :email).include? email
   end
-
-  private
-
-  def internal_notification
-    if state_changed? && state == 'submitted'
-      NotificationService.new('submitted', self.id).notify
-    end
-  end
 end
diff --git a/app/services/dossiers_list_gestionnaire_service.rb b/app/services/dossiers_list_gestionnaire_service.rb
index 23c5accb3..335dd7e12 100644
--- a/app/services/dossiers_list_gestionnaire_service.rb
+++ b/app/services/dossiers_list_gestionnaire_service.rb
@@ -8,10 +8,7 @@ class DossiersListGestionnaireService
   def dossiers_to_display
     @dossiers_to_display ||=
         {'nouveaux' => nouveaux,
-         # 'suivi' => suivi,
          'a_traiter' => ouvert,
-         'fige' => fige,
-         'deposes' => deposes,
          'a_instruire' => a_instruire,
          'termine' => termine,
          'all_state' => all_state}[@liste]
@@ -19,7 +16,7 @@ class DossiersListGestionnaireService
   end
 
   def self.dossiers_liste_libelle
-    ['nouveaux', 'suivi', 'a_traiter', 'fige', 'deposes', 'a_instruire', 'termine', 'all_state']
+    ['nouveaux', 'suivi', 'a_traiter', 'a_instruire', 'termine', 'all_state']
   end
 
   def all_state
@@ -38,14 +35,6 @@ class DossiersListGestionnaireService
     @ouvert ||= filter_dossiers.ouvert
   end
 
-  def fige
-    @fige ||= filter_dossiers.fige
-  end
-
-  def deposes
-    @deposes ||= filter_dossiers.deposes
-  end
-
   def a_instruire
     @a_instruire ||= filter_dossiers.a_instruire
   end
diff --git a/app/services/dossiers_list_user_service.rb b/app/services/dossiers_list_user_service.rb
index 5869b39b9..6013e16af 100644
--- a/app/services/dossiers_list_user_service.rb
+++ b/app/services/dossiers_list_user_service.rb
@@ -7,7 +7,6 @@ class DossiersListUserService
   def dossiers_to_display
     {'brouillon' => brouillon,
      'a_traiter' => en_construction,
-     'valides' => valides,
      'en_instruction' => en_instruction,
      'termine' => termine,
      'invite' => invite,
@@ -15,7 +14,7 @@ class DossiersListUserService
   end
 
   def self.dossiers_liste_libelle
-    ['brouillon', 'a_traiter', 'valides', 'en_instruction', 'termine', 'invite', 'all_state']
+    ['brouillon', 'a_traiter', 'en_instruction', 'termine', 'invite', 'all_state']
   end
 
   def all_state
@@ -34,10 +33,6 @@ class DossiersListUserService
     @invite ||= @current_devise_profil.invites
   end
 
-  def valides
-    @valides ||= @current_devise_profil.dossiers.valides
-  end
-
   def en_instruction
     @en_instruction ||= @current_devise_profil.dossiers.en_instruction
   end
diff --git a/app/views/layouts/left_panels/_left_panel_users_dossierscontroller_index.html.haml b/app/views/layouts/left_panels/_left_panel_users_dossierscontroller_index.html.haml
index 64867e81a..643af12dc 100644
--- a/app/views/layouts/left_panels/_left_panel_users_dossierscontroller_index.html.haml
+++ b/app/views/layouts/left_panels/_left_panel_users_dossierscontroller_index.html.haml
@@ -23,12 +23,6 @@
           .badge.progress-bar-danger
             = @dossiers_list_facade.en_construction_total
 
-      -# %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.'}
-      -#   %div.procedure_list_element{ class: @dossiers_list_facade.valides_class, id: 'valides' }
-      -#     ="À déposer"
-      -#     .badge.progress-bar-purple
-      -#       = @dossiers_list_facade.valides_total
-
       %a{:href => "#{url_for users_dossiers_path(liste: 'en_instruction')}", 'data-toggle' => :tooltip, title: 'Les dossiers en cours d\'examen par l\'administration compétante.'}
         %div.procedure_list_element{ class: @dossiers_list_facade.en_instruction_class, id: 'en_instruction' }
           ="En examen"
diff --git a/app/views/layouts/left_panels/_left_panel_users_recapitulatifcontroller_show.html.haml b/app/views/layouts/left_panels/_left_panel_users_recapitulatifcontroller_show.html.haml
index 9d9fd6eec..ee301158d 100644
--- a/app/views/layouts/left_panels/_left_panel_users_recapitulatifcontroller_show.html.haml
+++ b/app/views/layouts/left_panels/_left_panel_users_recapitulatifcontroller_show.html.haml
@@ -4,11 +4,6 @@
   %div.infos
     %div= t('dynamics.dossiers.numéro') + @facade.dossier.id.to_s
 
-%div#action-block
-  - if @facade.dossier.validated? && @facade.dossier.user == current_user
-    = form_tag(url_for({controller: 'users/recapitulatif', action: :submit, dossier_id: @facade.dossier.id}), method: 'POST') do
-      %button#validate_button.action= 'Procéder au dépôt définitif'
-
 %div#menu-block
 
 %div#infos-block
diff --git a/config/locales/models/dossier/fr.yml b/config/locales/models/dossier/fr.yml
index 4f39c6886..f7a8eb123 100644
--- a/config/locales/models/dossier/fr.yml
+++ b/config/locales/models/dossier/fr.yml
@@ -12,8 +12,6 @@ fr:
           initiated: "Nouveau"
           replied: "En construction"
           updated: "En construction"
-          validated: "Figé"
-          submitted: "Déposé / À réceptionner"
           received: "En instruction"
           closed: "Accepté"
           refused: "Refusé"
diff --git a/config/routes.rb b/config/routes.rb
index 4925ef475..dfffb56eb 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -71,7 +71,6 @@ Rails.application.routes.draw do
 
       get '/recapitulatif' => 'recapitulatif#show'
       post '/recapitulatif/initiate' => 'recapitulatif#initiate'
-      post '/recapitulatif/submit' => 'recapitulatif#submit'
 
       post '/commentaire' => 'commentaires#create'
       resources :commentaires, only: [:index]
@@ -159,7 +158,6 @@ Rails.application.routes.draw do
     resource :private_formulaire
 
     resources :dossiers do
-      post 'valid' => 'dossiers#valid'
       post 'receive' => 'dossiers#receive'
       post 'refuse' => 'dossiers#refuse'
       post 'without_continuation' => 'dossiers#without_continuation'
@@ -170,7 +168,6 @@ Rails.application.routes.draw do
       resources :commentaires, only: [:index]
     end
 
-
     namespace :dossiers do
       post 'filter'
 
diff --git a/spec/controllers/backoffice/dossiers_controller_spec.rb b/spec/controllers/backoffice/dossiers_controller_spec.rb
index 89153cfaf..a73cfddff 100644
--- a/spec/controllers/backoffice/dossiers_controller_spec.rb
+++ b/spec/controllers/backoffice/dossiers_controller_spec.rb
@@ -213,34 +213,9 @@ describe Backoffice::DossiersController, type: :controller do
     end
   end
 
-  describe 'POST #valid' do
-    before do
-      dossier.initiated!
-      sign_in gestionnaire
-    end
-
-    subject { post :valid, params: {dossier_id: dossier_id} }
-
-    it 'change state to validated' do
-      subject
-
-      dossier.reload
-      expect(dossier.state).to eq('validated')
-    end
-
-    it 'Notification email is send' do
-      expect(NotificationMailer).to receive(:dossier_validated).and_return(NotificationMailer)
-      expect(NotificationMailer).to receive(:deliver_now!)
-
-      subject
-    end
-
-    it { is_expected.to redirect_to backoffice_dossier_path(id: dossier.id) }
-  end
-
   describe 'POST #receive' do
     before do
-      dossier.submitted!
+      dossier.initiated!
       sign_in gestionnaire
     end
 
diff --git a/spec/controllers/users/carte_controller_shared_example.rb b/spec/controllers/users/carte_controller_shared_example.rb
index 438964660..d511a4bfc 100644
--- a/spec/controllers/users/carte_controller_shared_example.rb
+++ b/spec/controllers/users/carte_controller_shared_example.rb
@@ -4,7 +4,7 @@ shared_examples 'carte_controller_spec' do
       context 'when dossier’s procedure have api carto actived' do
         context 'when dossier does not have a valid state' do
           before do
-            dossier.state = 'validated'
+            dossier.state = 'received'
             dossier.save
 
             get :show, params: {dossier_id: dossier.id}
diff --git a/spec/controllers/users/description_controller_shared_example.rb b/spec/controllers/users/description_controller_shared_example.rb
index c08c8bbd2..fa90d0824 100644
--- a/spec/controllers/users/description_controller_shared_example.rb
+++ b/spec/controllers/users/description_controller_shared_example.rb
@@ -37,7 +37,7 @@ shared_examples 'description_controller_spec' do
     describe 'before_action authorized_routes?' do
       context 'when dossier does not have a valid state' do
         before do
-          dossier.state = 'validated'
+          dossier.state = 'received'
           dossier.save
 
           get :show, params: {dossier_id: dossier.id}
diff --git a/spec/controllers/users/dossiers_controller_spec.rb b/spec/controllers/users/dossiers_controller_spec.rb
index 83cc615f3..1d7fcdb8d 100644
--- a/spec/controllers/users/dossiers_controller_spec.rb
+++ b/spec/controllers/users/dossiers_controller_spec.rb
@@ -39,7 +39,7 @@ describe Users::DossiersController, type: :controller do
     describe 'before_action authorized_routes?' do
       context 'when dossier does not have a valid state' do
         before do
-          dossier.state = 'validated'
+          dossier.state = 'received'
           dossier.save
 
           get :show, params: {id: dossier.id}
@@ -485,19 +485,6 @@ describe Users::DossiersController, type: :controller do
     end
   end
 
-  describe 'GET #valides' do
-    context 'when user is connected' do
-      before do
-        sign_in user
-      end
-
-      it 'returns http success' do
-        get :index, params: {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
diff --git a/spec/controllers/users/recapitulatif_controller_spec.rb b/spec/controllers/users/recapitulatif_controller_spec.rb
index 3cbbe1696..06b63f1ea 100644
--- a/spec/controllers/users/recapitulatif_controller_spec.rb
+++ b/spec/controllers/users/recapitulatif_controller_spec.rb
@@ -52,40 +52,4 @@ describe Users::RecapitulatifController, type: :controller do
       end
     end
   end
-
-  describe 'POST #submit' do
-    context 'when an user depose his dossier' do
-      let(:deposit_datetime) { Time.local(2016, 8, 1, 10, 5, 0) }
-
-      before do
-        dossier.validated!
-        Timecop.freeze(deposit_datetime) { post :submit, params: {dossier_id: dossier.id} }
-        dossier.reload
-      end
-
-      it 'dossier change his state for submitted' do
-        expect(dossier.state).to eq('submitted')
-      end
-
-      it 'dossier deposit datetime is filled' do
-        expect(dossier.deposit_datetime).to eq deposit_datetime
-      end
-
-      it 'a message informe user what his dossier is initiated' do
-        expect(flash[:notice]).to include('Dossier déposé avec succès.')
-      end
-
-      it 'Notification email is send' do
-        expect(NotificationMailer).to receive(:dossier_submitted).and_return(NotificationMailer)
-        expect(NotificationMailer).to receive(:deliver_now!)
-
-        dossier.validated!
-        post :submit, params: {dossier_id: dossier.id}
-      end
-
-      it 'Internal notification is created' do
-        expect(Notification.where(dossier_id: dossier.id, type_notif: 'submitted').first).not_to be_nil
-      end
-    end
-  end
 end
diff --git a/spec/decorators/dossier_decorator_spec.rb b/spec/decorators/dossier_decorator_spec.rb
index f13db1004..7746c397a 100644
--- a/spec/decorators/dossier_decorator_spec.rb
+++ b/spec/decorators/dossier_decorator_spec.rb
@@ -37,16 +37,6 @@ describe DossierDecorator do
       expect(subject).to eq('En construction')
     end
 
-    it 'validated is valide' do
-      dossier.validated!
-      expect(subject).to eq('Figé')
-    end
-
-    it 'submitted is dépose' do
-      dossier.submitted!
-      expect(subject).to eq('Déposé / À réceptionner')
-    end
-
     it 'closed is traité' do
       dossier.closed!
       expect(subject).to eq('Accepté')
diff --git a/spec/facades/admin_procedures_show_facades_spec.rb b/spec/facades/admin_procedures_show_facades_spec.rb
index 9e7230db0..8988d3474 100644
--- a/spec/facades/admin_procedures_show_facades_spec.rb
+++ b/spec/facades/admin_procedures_show_facades_spec.rb
@@ -5,10 +5,7 @@ describe AdminProceduresShowFacades do
 
   let!(:dossier_0) { create(:dossier,  procedure: procedure, state: 'draft') }
   let!(:dossier_1) { create(:dossier,  procedure: procedure, state: 'initiated') }
-  let!(:dossier_2) { create(:dossier,  procedure: procedure, state: 'validated') }
-  let!(:dossier_3) { create(:dossier,  procedure: procedure, state: 'validated') }
-  let!(:dossier_4) { create(:dossier,  procedure: procedure, archived: true, state: 'validated') }
-  let!(:dossier_5) { create(:dossier,  procedure: procedure, archived: true, state: 'validated') }
+  let!(:dossier_2) { create(:dossier,  procedure: procedure, state: 'replied') }
   let!(:dossier_6) { create(:dossier,  procedure: procedure, archived: true, state: 'initiated') }
   let!(:dossier_7) { create(:dossier,  procedure: procedure, state: 'updated') }
 
@@ -23,37 +20,34 @@ describe AdminProceduresShowFacades do
   describe '.dossiers' do
     subject { super().dossiers }
 
-    it { expect(subject.size).to eq(7)  }
+    it { expect(subject.size).to eq(4)  }
   end
 
   describe '.dossiers_for_pie_highchart' do
     subject { super().dossiers_for_pie_highchart }
 
-    it { expect(subject).to eq({'Nouveau' => 1, 'Figé' => 2, "En construction"=>1}) }
+    it { expect(subject).to eq({'Nouveau' => 1, "En construction"=>1}) }
   end
 
   describe '.dossiers_archived_by_state_total' do
     subject { super().dossiers_archived_by_state_total }
 
-    it { expect(subject.size).to eq(2)  }
+    it { expect(subject.size).to eq(1)  }
 
     it { expect(subject.first.state).to eq('initiated')  }
     it { expect(subject.first.total).to eq(1) }
-
-    it { expect(subject.last.state).to eq('validated')  }
-    it { expect(subject.last.total).to eq(2) }
   end
 
   describe 'dossiers_archived_total' do
     subject { super().dossiers_archived_total }
 
-    it { is_expected.to eq(3) }
+    it { is_expected.to eq(1) }
   end
 
   describe 'dossiers_total' do
     subject { super().dossiers_total }
 
-    it { is_expected.to eq(7) }
+    it { is_expected.to eq(4) }
   end
 
   describe 'dossiers_waiting_gestionnaire_total' do
@@ -65,7 +59,7 @@ describe AdminProceduresShowFacades do
   describe 'dossiers_waiting_user_total' do
     subject { super().dossiers_waiting_user_total }
 
-    it { is_expected.to eq(2) }
+    it { is_expected.to eq(1) }
   end
 
   describe 'dossiers_termine_total' do
diff --git a/spec/models/dossier_spec.rb b/spec/models/dossier_spec.rb
index c37efc03f..ad9b4c19e 100644
--- a/spec/models/dossier_spec.rb
+++ b/spec/models/dossier_spec.rb
@@ -224,12 +224,6 @@ describe Dossier do
 
             it { is_expected.to eq 'updated' }
           end
-
-          context 'when is validated the dossier' do
-            let(:action) { 'valid' }
-
-            it { is_expected.to eq('validated') }
-          end
         end
       end
 
@@ -269,11 +263,6 @@ describe Dossier do
             it { is_expected.to eq 'replied' }
           end
 
-          context 'when is validated the dossier' do
-            let(:action) { 'valid' }
-
-            it { is_expected.to eq('validated') }
-          end
         end
       end
 
@@ -307,74 +296,6 @@ describe Dossier do
             it { is_expected.to eq('replied') }
           end
 
-          context 'when is validated the dossier' do
-            let(:action) { 'valid' }
-
-            it { is_expected.to eq('validated') }
-          end
-        end
-      end
-
-      context 'when dossier is at state validated' do
-        before do
-          dossier.validated!
-        end
-
-        context 'when user is connect' do
-          let(:role) { 'user' }
-
-          context 'when is post a comment' do
-            let(:action) { 'comment' }
-            it { is_expected.to eq('validated') }
-          end
-
-          context 'when is submitted the dossier' do
-            let(:action) { 'submit' }
-
-            it { is_expected.to eq('submitted') }
-          end
-        end
-
-        context 'when gestionnaire is connect' do
-          let(:role) { 'gestionnaire' }
-
-          context 'when is post a comment' do
-            let(:action) { 'comment' }
-
-            it { is_expected.to eq('validated') }
-          end
-        end
-      end
-
-      context 'when dossier is at state submitted' do
-        before do
-          dossier.submitted!
-        end
-
-        context 'when user is connected' do
-          let(:role) { 'user' }
-
-          context 'when he posts a comment' do
-            let(:action) { 'comment' }
-
-            it { is_expected.to eq('submitted') }
-          end
-        end
-
-        context 'when gestionnaire is connect' do
-          let(:role) { 'gestionnaire' }
-
-          context 'when he posts a comment' do
-            let(:action) { 'comment' }
-
-            it { is_expected.to eq('submitted') }
-          end
-
-          context 'when he receive the dossier' do
-            let(:action) { 'receive' }
-
-            it { is_expected.to eq('received') }
-          end
         end
       end
 
@@ -505,14 +426,11 @@ describe Dossier do
         create(:dossier, procedure: procedure_admin, state: 'initiated') #nouveaux
         create(:dossier, procedure: procedure_admin, state: 'replied') #en_attente
         create(:dossier, procedure: procedure_admin, state: 'updated') #a_traiter
-        create(:dossier, procedure: procedure_admin, state: 'submitted') #deposes
         create(:dossier, procedure: procedure_admin, state: 'received') #a_instruire
         create(:dossier, procedure: procedure_admin, state: 'received') #a_instruire
         create(:dossier, procedure: procedure_admin, state: 'closed') #termine
         create(:dossier, procedure: procedure_admin, state: 'refused') #termine
         create(:dossier, procedure: procedure_admin, state: 'without_continuation') #termine
-        create(:dossier, procedure: procedure_admin_2, state: 'validated') #en_attente
-        create(:dossier, procedure: procedure_admin_2, state: 'submitted') #deposes
         create(:dossier, procedure: procedure_admin_2, state: 'closed') #termine
         create(:dossier, procedure: procedure_admin, state: 'initiated', archived: true) #a_traiter #archived
         create(:dossier, procedure: procedure_admin, state: 'replied', archived: true) #en_attente #archived
@@ -543,12 +461,6 @@ describe Dossier do
         it { expect(subject.size).to eq(2) }
       end
 
-      describe '#deposes' do
-        subject { gestionnaire.dossiers.deposes }
-
-        it { expect(subject.size).to eq(1) }
-      end
-
       describe '#termine' do
         subject { gestionnaire.dossiers.termine }
 
diff --git a/spec/services/user_routes_authorization_service_spec.rb b/spec/services/user_routes_authorization_service_spec.rb
index 3e51d9720..b67b463be 100644
--- a/spec/services/user_routes_authorization_service_spec.rb
+++ b/spec/services/user_routes_authorization_service_spec.rb
@@ -33,16 +33,6 @@ describe UserRoutesAuthorizationService do
         it { is_expected.to be_falsey }
       end
 
-      describe 'validated' do
-        let(:state) { 'validated' }
-        it { is_expected.to be_falsey }
-      end
-
-      describe 'submitted' do
-        let(:state) { 'submitted' }
-        it { is_expected.to be_falsey }
-      end
-
       describe 'closed' do
         let(:state) { 'closed' }
         it { is_expected.to be_falsey }
@@ -74,16 +64,6 @@ describe UserRoutesAuthorizationService do
           it { is_expected.to be_falsey }
         end
 
-        describe 'validated' do
-          let(:state) { 'validated' }
-          it { is_expected.to be_falsey }
-        end
-
-        describe 'submitted' do
-          let(:state) { 'submitted' }
-          it { is_expected.to be_falsey }
-        end
-
         describe 'closed' do
           let(:state) { 'closed' }
           it { is_expected.to be_falsey }
@@ -113,16 +93,6 @@ describe UserRoutesAuthorizationService do
           it { is_expected.to be_truthy }
         end
 
-        describe 'validated' do
-          let(:state) { 'validated' }
-          it { is_expected.to be_falsey }
-        end
-
-        describe 'submitted' do
-          let(:state) { 'submitted' }
-          it { is_expected.to be_falsey }
-        end
-
         describe 'closed' do
           let(:state) { 'closed' }
           it { is_expected.to be_falsey }
@@ -153,16 +123,6 @@ describe UserRoutesAuthorizationService do
         it { is_expected.to be_truthy }
       end
 
-      describe 'validated' do
-        let(:state) { 'validated' }
-        it { is_expected.to be_falsey }
-      end
-
-      describe 'submitted' do
-        let(:state) { 'submitted' }
-        it { is_expected.to be_falsey }
-      end
-
       describe 'closed' do
         let(:state) { 'closed' }
         it { is_expected.to be_falsey }
@@ -192,16 +152,6 @@ describe UserRoutesAuthorizationService do
         it { is_expected.to be_truthy }
       end
 
-      describe 'validated' do
-        let(:state) { 'validated' }
-        it { is_expected.to be_truthy }
-      end
-
-      describe 'submitted' do
-        let(:state) { 'submitted' }
-        it { is_expected.to be_truthy }
-      end
-
       describe 'closed' do
         let(:state) { 'closed' }
         it { is_expected.to be_truthy }
diff --git a/spec/views/backoffice/dossiers/index_html.haml_spec.rb b/spec/views/backoffice/dossiers/index_html.haml_spec.rb
index 84a3eef1f..d6822f816 100644
--- a/spec/views/backoffice/dossiers/index_html.haml_spec.rb
+++ b/spec/views/backoffice/dossiers/index_html.haml_spec.rb
@@ -9,8 +9,6 @@ describe 'backoffice/dossiers/index.html.haml', type: :view do
   let!(:decorate_dossier_initiated) { create(:dossier, :with_entreprise, procedure: procedure, state: 'initiated').decorate }
   let!(:decorate_dossier_replied) { create(:dossier, :with_entreprise, procedure: procedure, state: 'replied').decorate }
   let!(:decorate_dossier_updated) { create(:dossier, :with_entreprise, procedure: procedure, state: 'updated').decorate }
-  let!(:decorate_dossier_validated) { create(:dossier, :with_entreprise, procedure: procedure, state: 'validated').decorate }
-  let!(:decorate_dossier_submitted) { create(:dossier, :with_entreprise, procedure: procedure, state: 'submitted').decorate }
   let!(:decorate_dossier_received) { create(:dossier, :with_entreprise, procedure: procedure, state: 'received').decorate }
   let!(:decorate_dossier_closed) { create(:dossier, :with_entreprise, procedure: procedure, state: 'closed').decorate }
   let!(:decorate_dossier_refused) { create(:dossier, :with_entreprise, procedure: procedure, state: 'refused').decorate }
@@ -25,8 +23,6 @@ describe 'backoffice/dossiers/index.html.haml', type: :view do
   before do
     decorate_dossier_replied.entreprise.update_column(:raison_sociale, 'plap')
     decorate_dossier_updated.entreprise.update_column(:raison_sociale, 'plep')
-    decorate_dossier_validated.entreprise.update_column(:raison_sociale, 'plip')
-    decorate_dossier_submitted.entreprise.update_column(:raison_sociale, 'plop')
     decorate_dossier_received.entreprise.update_column(:raison_sociale, 'plup')
     decorate_dossier_closed.entreprise.update_column(:raison_sociale, 'plyp')
     decorate_dossier_refused.entreprise.update_column(:raison_sociale, 'plzp')
@@ -83,7 +79,7 @@ describe 'backoffice/dossiers/index.html.haml', type: :view do
 
   it { is_expected.to have_content('Nouveaux dossiers 1 dossiers') }
   it { is_expected.to have_content('Dossiers suivis 0 dossiers') }
-  it { is_expected.to have_content('Tous les dossiers 9 dossiers') }
+  it { is_expected.to have_content('Tous les dossiers 7 dossiers') }
 
   it { is_expected.to have_content('État') }
   it { is_expected.to have_content('Libellé procédure') }
@@ -92,8 +88,6 @@ describe 'backoffice/dossiers/index.html.haml', type: :view do
 
   it { is_expected.to have_content('plap') }
   it { is_expected.to have_content('plep') }
-  it { is_expected.to have_content('plip') }
-  it { is_expected.to have_content('plop') }
   it { is_expected.to have_content('plup') }
   it { is_expected.to have_content('plyp') }
 end
\ No newline at end of file
diff --git a/spec/views/layouts/left_panels/_left_panel_users_recapitulatifcontroller_show_spec.rb b/spec/views/layouts/left_panels/_left_panel_users_recapitulatifcontroller_show_spec.rb
index 6117d724f..5f6dcb87b 100644
--- a/spec/views/layouts/left_panels/_left_panel_users_recapitulatifcontroller_show_spec.rb
+++ b/spec/views/layouts/left_panels/_left_panel_users_recapitulatifcontroller_show_spec.rb
@@ -40,43 +40,6 @@ describe 'layouts/left_panels/_left_panel_users_recapitulatifcontroller_show.htm
       it { expect(rendered).to have_content('En construction') }
     end
 
-    context 'when dossier state is validated' do
-      let(:state) { 'validated' }
-
-      before do
-        render
-      end
-
-      it 'button Procéder au dépôt définitif est present' do
-        expect(rendered).to have_css('#validate_button')
-        expect(rendered).to have_content('Procéder au dépôt définitif')
-      end
-
-      it 'button Editer mon dossier n\'est plus present' do
-        expect(rendered).not_to have_css('#maj_infos')
-        expect(rendered).not_to have_content('Modifier mon dossier')
-      end
-
-      it 'button Modifier les document n\'est plus present' do
-        expect(rendered).not_to have_content('Modifier les documents')
-      end
-    end
-
-    context 'when dossier state is submitted' do
-      let(:state) { 'submitted' }
-
-      before do
-        render
-      end
-
-      it { expect(rendered).to have_content('Déposé / À réceptionner') }
-
-      it 'button Editer mon dossier n\'est plus present' do
-        expect(rendered).not_to have_css('#maj_infos')
-        expect(rendered).not_to have_content('Modifier mon dossier')
-      end
-    end
-
     context 'when dossier state is closed' do
       let(:state) { 'closed' }
 
diff --git a/spec/views/users/dossiers/index_html.haml_spec.rb b/spec/views/users/dossiers/index_html.haml_spec.rb
index 72d7381a0..fcd4f141f 100644
--- a/spec/views/users/dossiers/index_html.haml_spec.rb
+++ b/spec/views/users/dossiers/index_html.haml_spec.rb
@@ -6,8 +6,6 @@ describe 'users/dossiers/index.html.haml', type: :view do
   let!(:decorate_dossier_initiated) { create(:dossier, :with_entreprise, user: user, state: 'initiated').decorate }
   let!(:decorate_dossier_replied) { create(:dossier, :with_entreprise, user: user, state: 'replied').decorate }
   let!(:decorate_dossier_updated) { create(:dossier, :with_entreprise, user: user, state: 'updated').decorate }
-  let!(:decorate_dossier_validated) { create(:dossier, :with_entreprise, user: user, state: 'validated').decorate }
-  let!(:decorate_dossier_submitted) { create(:dossier, :with_entreprise, user: user, state: 'submitted').decorate }
   let!(:decorate_dossier_received) { create(:dossier, :with_entreprise, user: user, state: 'received').decorate }
   let!(:decorate_dossier_closed) { create(:dossier, :with_entreprise, user: user, state: 'closed').decorate }
   let!(:decorate_dossier_refused) { create(:dossier, :with_entreprise, user: user, state: 'refused').decorate }
@@ -61,27 +59,13 @@ describe 'users/dossiers/index.html.haml', type: :view do
     end
   end
 
-  describe 'on tab etude a deposer' do
-    let(:total_dossiers) { 1 }
-    let(:active_class) { '.active .text-purple' }
-    let(:dossiers_to_display) { user.dossiers.valides }
-    let(:liste) { 'valides' }
-
-    it_behaves_like 'check_tab_content' do
-      let(:decorate_dossier_at_check) { decorate_dossier_validated }
-    end
-  end
 
   describe 'on tab etude en examen' do
-    let(:total_dossiers) { 2 }
+    let(:total_dossiers) { 1 }
     let(:active_class) { '.active .text-default' }
     let(:dossiers_to_display) { user.dossiers.en_instruction }
     let(:liste) { 'en_instruction' }
 
-    it_behaves_like 'check_tab_content' do
-      let(:decorate_dossier_at_check) { decorate_dossier_submitted }
-    end
-
     it_behaves_like 'check_tab_content' do
       let(:decorate_dossier_at_check) { decorate_dossier_received }
     end
diff --git a/spec/views/users/recapitulatif/show.html.haml_spec.rb b/spec/views/users/recapitulatif/show.html.haml_spec.rb
index 63ba3bee8..3503fad53 100644
--- a/spec/views/users/recapitulatif/show.html.haml_spec.rb
+++ b/spec/views/users/recapitulatif/show.html.haml_spec.rb
@@ -107,18 +107,6 @@ describe 'users/recapitulatif/show.html.haml', type: :view do
             expect(rendered).not_to have_content('Archiver')
           end
         end
-
-        context 'when dossier is validated' do
-          let(:state) { 'validated' }
-
-          before do
-            render
-          end
-
-          it 'submitted link is not present' do
-            expect(rendered).not_to have_content('Procéder au dépôt définitif')
-          end
-        end
       end
 
       context 'invite is by User' do
@@ -148,18 +136,6 @@ describe 'users/recapitulatif/show.html.haml', type: :view do
             expect(rendered).not_to have_content('Archiver')
           end
         end
-
-        context 'when dossier is validated' do
-          let(:state) { 'validated' }
-
-          before do
-            render
-          end
-
-          it 'submitted link is not present' do
-            expect(rendered).not_to have_content('Procéder au dépôt définitif')
-          end
-        end
       end
     end
   end

From 4cc6aedfb9ef308da60f881b9789641f1b938bd3 Mon Sep 17 00:00:00 2001
From: Mathieu Magnin <mathieu.magnin@gmail.com>
Date: Mon, 27 Feb 2017 11:56:26 +0100
Subject: [PATCH 4/5] Fix tests after workflow simplication

---
 app/decorators/mail_template_decorator.rb      |  3 ---
 app/mailers/notification_mailer.rb             |  4 ----
 app/models/mail_validated.rb                   | 18 ------------------
 app/models/procedure.rb                        |  1 -
 .../dossier_validated.html.erb                 |  1 -
 ...56_init_mail_validated_for_all_procedure.rb |  9 ---------
 ...23170808_delete_all_mail_validated_in_db.rb |  5 +++++
 db/schema.rb                                   |  2 +-
 .../decorators/mail_template_decorator_spec.rb |  4 ----
 .../backoffice/index_show_procedure_spec.rb    |  4 ++--
 spec/features/users/dossier_edition_spec.rb    |  1 -
 spec/features/users/onglets_link_spec.rb       | 15 +--------------
 spec/mailers/notification_mailer_spec.rb       | 13 -------------
 .../previews/notification_mailer_preview.rb    |  4 ----
 spec/models/procedure_spec.rb                  |  1 -
 15 files changed, 9 insertions(+), 76 deletions(-)
 delete mode 100644 app/models/mail_validated.rb
 delete mode 100644 app/views/notification_mailer/dossier_validated.html.erb
 delete mode 100644 db/migrate/20170125152856_init_mail_validated_for_all_procedure.rb
 create mode 100644 db/migrate/20170223170808_delete_all_mail_validated_in_db.rb

diff --git a/app/decorators/mail_template_decorator.rb b/app/decorators/mail_template_decorator.rb
index 4c61981d6..d75b576c7 100644
--- a/app/decorators/mail_template_decorator.rb
+++ b/app/decorators/mail_template_decorator.rb
@@ -5,9 +5,6 @@ class MailTemplateDecorator < Draper::Decorator
     case object.type
     when "MailReceived"
       "E-mail d'accusé de réception"
-    when "MailValidated"
-      "E-mail de validation"
-    else
       object.type
     end
   end
diff --git a/app/mailers/notification_mailer.rb b/app/mailers/notification_mailer.rb
index f23e501f4..d88191812 100644
--- a/app/mailers/notification_mailer.rb
+++ b/app/mailers/notification_mailer.rb
@@ -7,10 +7,6 @@ class NotificationMailer < ApplicationMailer
     send_mail dossier, dossier.procedure.mail_received.object_for_dossier(dossier)
   end
 
-  def dossier_validated dossier
-    send_mail dossier, dossier.procedure.mail_validated.object_for_dossier(dossier)
-  end
-
   def dossier_submitted dossier
     send_mail dossier, "Votre dossier TPS N°#{dossier.id} a été déposé"
   end
diff --git a/app/models/mail_validated.rb b/app/models/mail_validated.rb
deleted file mode 100644
index 2691c4181..000000000
--- a/app/models/mail_validated.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-class MailValidated < MailTemplate
-  before_save :default_values
-
-  def default_values
-    self.object ||= "[TPS] Votre dossier TPS N°--numero_dossier-- a été validé"
-    self.body ||= "Bonjour,<br>
-                    <br>
-                    Votre dossier N°--numero_dossier-- est prêt à être déposé pour instruction.<br>
-                    <br>
-                    Afin de finaliser son dépôt, merci de vous rendre sur --lien_dossier--.,<br>
-                    <br>
-                    Bonne journée,<br>
-                    ---<br>
-                    Merci de ne pas répondre à ce mail. Postez directement vos questions dans votre dossier sur la plateforme.<br>
-                    ---<br>
-                    L'équipe TPS"
-  end
-end
diff --git a/app/models/procedure.rb b/app/models/procedure.rb
index a70b7bcdd..35de6ecfa 100644
--- a/app/models/procedure.rb
+++ b/app/models/procedure.rb
@@ -34,7 +34,6 @@ class Procedure < ActiveRecord::Base
 
   def build_default_mails
     MailReceived.create(procedure: self) unless mail_received
-    MailValidated.create(procedure: self) unless mail_validated
   end
 
   def path
diff --git a/app/views/notification_mailer/dossier_validated.html.erb b/app/views/notification_mailer/dossier_validated.html.erb
deleted file mode 100644
index 6f3ad09b3..000000000
--- a/app/views/notification_mailer/dossier_validated.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= @dossier.procedure.mail_validated.body_for_dossier(@dossier).html_safe %>
diff --git a/db/migrate/20170125152856_init_mail_validated_for_all_procedure.rb b/db/migrate/20170125152856_init_mail_validated_for_all_procedure.rb
deleted file mode 100644
index 74c261fa2..000000000
--- a/db/migrate/20170125152856_init_mail_validated_for_all_procedure.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class InitMailValidatedForAllProcedure < ActiveRecord::Migration[5.0]
-  def change
-    Procedure.all.each do |p|
-      unless p.mail_validated
-        p.mail_templates << MailValidated.create
-      end
-    end
-  end
-end
diff --git a/db/migrate/20170223170808_delete_all_mail_validated_in_db.rb b/db/migrate/20170223170808_delete_all_mail_validated_in_db.rb
new file mode 100644
index 000000000..74d89af2a
--- /dev/null
+++ b/db/migrate/20170223170808_delete_all_mail_validated_in_db.rb
@@ -0,0 +1,5 @@
+class DeleteAllMailValidatedInDb < ActiveRecord::Migration[5.0]
+  def change
+    MailTemplate.where(type: "MailValidated").delete_all
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index ca83855cc..7c4a70927 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170221143909) do
+ActiveRecord::Schema.define(version: 20170223170808) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
diff --git a/spec/decorators/mail_template_decorator_spec.rb b/spec/decorators/mail_template_decorator_spec.rb
index 4cfce8226..de8a3f167 100644
--- a/spec/decorators/mail_template_decorator_spec.rb
+++ b/spec/decorators/mail_template_decorator_spec.rb
@@ -7,10 +7,6 @@ describe MailTemplateDecorator do
   context '#name' do
     subject { decorator.name }
 
-    context 'when mail_template is a MailValidated' do
-      it { is_expected.to eq "E-mail de validation" }
-    end
-
     context 'when mail_template is a MailReceived' do
       let(:mail_template) {create :mail_template, :dossier_received}
       it { is_expected.to eq "E-mail d'accusé de réception" }
diff --git a/spec/features/backoffice/index_show_procedure_spec.rb b/spec/features/backoffice/index_show_procedure_spec.rb
index 4056bfb01..1839d6259 100644
--- a/spec/features/backoffice/index_show_procedure_spec.rb
+++ b/spec/features/backoffice/index_show_procedure_spec.rb
@@ -10,10 +10,10 @@ feature 'As an Accompagnateur I can navigate and use each functionnality around
     create :assign_to, gestionnaire: gestionnaire, procedure: procedure_1
     create :assign_to, gestionnaire: gestionnaire, procedure: procedure_2
     30.times do
-      Dossier.create(procedure_id: procedure_1.id.to_s, user: user, state: 'validated')
+      Dossier.create(procedure_id: procedure_1.id.to_s, user: user, state: 'initiated')
     end
     22.times do
-      Dossier.create(procedure_id: procedure_2.id.to_s, user: user, state: 'validated')
+      Dossier.create(procedure_id: procedure_2.id.to_s, user: user, state: 'received')
     end
     login_as gestionnaire, scope: :gestionnaire
     visit backoffice_path
diff --git a/spec/features/users/dossier_edition_spec.rb b/spec/features/users/dossier_edition_spec.rb
index 0029c7c83..4dc3ccee7 100644
--- a/spec/features/users/dossier_edition_spec.rb
+++ b/spec/features/users/dossier_edition_spec.rb
@@ -17,7 +17,6 @@ feature 'As a User I want to edit a dossier I own' do
       expect(page.find('#a_traiter')['class'] ).to eq('active procedure_list_element')
       page.find_by_id('brouillon').click
       page.find_by_id('a_traiter').click
-      page.find_by_id('valides').click
       page.find_by_id('en_instruction').click
       page.find_by_id('termine').click
       page.find_by_id('invite').click
diff --git a/spec/features/users/onglets_link_spec.rb b/spec/features/users/onglets_link_spec.rb
index 013699c6d..14a9d8fd3 100644
--- a/spec/features/users/onglets_link_spec.rb
+++ b/spec/features/users/onglets_link_spec.rb
@@ -9,8 +9,6 @@ feature 'on click on tabs button' do
     create(:dossier, :with_entreprise, user: user, state: 'initiated')
     create(:dossier, :with_entreprise, user: user, state: 'replied')
     create(:dossier, :with_entreprise, user: user, state: 'updated')
-    create(:dossier, :with_entreprise, user: user, state: 'validated')
-    create(:dossier, :with_entreprise, user: user, state: 'submitted')
     create(:dossier, :with_entreprise, user: user, state: 'received')
     create(:dossier, :with_entreprise, user: user, state: 'closed')
     create(:dossier, :with_entreprise, user: user, state: 'refused')
@@ -33,21 +31,10 @@ feature 'on click on tabs button' do
       end
     end
 
-    context 'when he click on tabs a deposes' do
-      before do
-        visit users_dossiers_url(liste: :valides)
-        page.click_on 'À déposer 1'
-      end
-
-      scenario 'it redirect to users dossier deposes' do
-        expect(page).to have_css('#users_index')
-      end
-    end
-
     context 'when he click on tabs en examen' do
       before do
         visit users_dossiers_url(liste: :en_instruction)
-        page.click_on 'En examen 2'
+        page.click_on 'En examen 1'
       end
 
       scenario 'it redirect to users dossier termine' do
diff --git a/spec/mailers/notification_mailer_spec.rb b/spec/mailers/notification_mailer_spec.rb
index 4acc90c57..10d6b5e24 100644
--- a/spec/mailers/notification_mailer_spec.rb
+++ b/spec/mailers/notification_mailer_spec.rb
@@ -12,19 +12,6 @@ RSpec.describe NotificationMailer, type: :mailer do
     it { expect(subject.subject).to eq("Nouveau message pour votre dossier TPS N°#{dossier.id}") }
   end
 
-  describe ".dossier_validated" do
-    let(:user) { create(:user) }
-    let(:dossier) { create(:dossier, user: user) }
-
-    subject(:subject) { described_class.dossier_validated(dossier) }
-
-    before { dossier.reload }
-
-    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("[TPS] Votre dossier TPS N°#{dossier.id} a été validé") }
-  end
-
   describe ".dossier_submitted" do
     let(:user) { create(:user) }
     let(:dossier) { create(:dossier, user: user) }
diff --git a/spec/mailers/previews/notification_mailer_preview.rb b/spec/mailers/previews/notification_mailer_preview.rb
index f1af33905..5eb4a0bb3 100644
--- a/spec/mailers/previews/notification_mailer_preview.rb
+++ b/spec/mailers/previews/notification_mailer_preview.rb
@@ -4,8 +4,4 @@ class NotificationMailerPreview < ActionMailer::Preview
     NotificationMailer.dossier_received(Dossier.last)
   end
 
-  def dossier_validated
-    NotificationMailer.dossier_validated(Dossier.last)
-  end
-
 end
diff --git a/spec/models/procedure_spec.rb b/spec/models/procedure_spec.rb
index 5219587ba..5c2684ab4 100644
--- a/spec/models/procedure_spec.rb
+++ b/spec/models/procedure_spec.rb
@@ -52,7 +52,6 @@ describe Procedure do
       it { expect(subject.mail_templates.size).to eq 2 }
 
       it { expect(subject.mail_received).not_to be_nil }
-      it { expect(subject.mail_validated).not_to be_nil }
     end
   end
 

From ab3c1b4be4099614483a69d1527be819b37a2fb2 Mon Sep 17 00:00:00 2001
From: Mathieu Magnin <mathieu.magnin@gmail.com>
Date: Mon, 27 Feb 2017 13:29:26 +0100
Subject: [PATCH 5/5] Remove mail validated in procedure

---
 app/models/procedure.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/models/procedure.rb b/app/models/procedure.rb
index 35de6ecfa..8c6f55b1e 100644
--- a/app/models/procedure.rb
+++ b/app/models/procedure.rb
@@ -5,7 +5,6 @@ class Procedure < ActiveRecord::Base
   has_many :dossiers
   has_many :mail_templates
   has_one :mail_received
-  has_one :mail_validated
 
   has_one :procedure_path, dependent: :destroy