delete filter procedure for gestionnaire

app/controllers/backoffice/procedure_filter_controller.rb

@@ -1,16 +0,0 @@
-class Backoffice::ProcedureFilterController < ApplicationController
-  before_action :authenticate_gestionnaire!
-
-  def index
-    @gestionnaire = current_gestionnaire
-    @procedures = current_gestionnaire.procedures
-  end
-
-  def update
-
-    current_gestionnaire.update_attribute(:procedure_filter, (params[:procedure_filter].nil? ? []  : params[:procedure_filter]))
-
-    flash.notice = 'Filtre mis à jour'
-    redirect_to backoffice_filtres_path
-  end
-end

app/models/dossier.rb

@@ -235,12 +235,12 @@ class Dossier < ActiveRecord::Base
 
     #TODO refactor
     composed_scope = composed_scope.where(
-        dossiers[:id].eq_any(current_gestionnaire.dossiers_filter.ids).and\
+        dossiers[:id].eq_any(current_gestionnaire.dossiers.ids).and\
         dossiers[:state].does_not_match('draft').and\
         dossiers[:archived].eq(false))
 
     begin
-      if Float(terms) && terms.to_i <= 2147483647 && current_gestionnaire.dossiers_filter.ids.include?(terms.to_i)
+      if Float(terms) && terms.to_i <= 2147483647 && current_gestionnaire.dossiers.ids.include?(terms.to_i)
         dossier = Dossier.where("state != 'draft'").find(terms.to_i)
       end
     rescue ArgumentError, ActiveRecord::RecordNotFound

app/models/gestionnaire.rb

@@ -12,18 +12,10 @@ class Gestionnaire < ActiveRecord::Base
 
   after_create :build_default_preferences_list_dossier
 
-  def dossiers_filter
-    dossiers.where(procedure_id: procedure_filter_list)
-  end
-
   def dossiers_follow
     dossiers.joins(:follows).where("follows.gestionnaire_id = #{id}")
   end
 
-  def procedure_filter_list
-    procedure_filter.empty? ? procedures.pluck(:id) : procedure_filter
-  end
-
   def toggle_follow_dossier dossier_id
     dossier = dossier_id
     dossier = Dossier.find(dossier_id) unless dossier_id.class == Dossier

app/services/dossiers_list_gestionnaire_service.rb

@@ -15,27 +15,27 @@ class DossiersListGestionnaireService
   end
 
   def nouveaux
-    @nouveaux ||= @current_devise_profil.dossiers_filter.nouveaux
+    @nouveaux ||= @current_devise_profil.dossiers.nouveaux
   end
 
   def waiting_for_gestionnaire
-    @waiting_for_gestionnaire ||= @current_devise_profil.dossiers_filter.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_filter.waiting_for_user
+    @waiting_for_user ||= @current_devise_profil.dossiers.waiting_for_user
   end
 
   def deposes
-    @deposes ||= @current_devise_profil.dossiers_filter.deposes
+    @deposes ||= @current_devise_profil.dossiers.deposes
   end
 
   def a_instruire
-    @a_instruire ||= @current_devise_profil.dossiers_filter.a_instruire
+    @a_instruire ||= @current_devise_profil.dossiers.a_instruire
   end
 
   def termine
-    @termine ||= @current_devise_profil.dossiers_filter.termine
+    @termine ||= @current_devise_profil.dossiers.termine
   end
 
   def suivi

app/views/backoffice/procedure_filter/index.html.haml

@@ -1,16 +0,0 @@
-%h2.text-primary Filtre des procédures
-%h4 Sélectionnez les procédures que vous souhaitez suivre.
-
-= form_for @gestionnaire, url:{controller: 'backoffice/procedure_filter', action: :update } do |f|
-  .input-group
-    - @procedures.each do |procedure|
-      .checkbox
-        %label
-          = check_box_tag 'procedure_filter[]', procedure.id, (true if @gestionnaire.procedure_filter.include?(procedure.id))
-          = procedure.libelle
-    %br
-    = submit_tag 'Valider', class: 'btn btn-primary'
-
-%br
-%b
-  Aucune sélection = voir tout

app/views/gestionnaires/_login_banner.html.haml

@@ -1,17 +1,6 @@
-%div{ style: "decorate:none; display: flex;box-shadow:none; float:right; display: flex" }
-  %div{ style: "vertical-align: middle; margin-right: 10px; margin-top: auto; margin-bottom: auto;" }
-    = current_gestionnaire.email
-  .dropdown#admin_menu
-    %button.btn.btn-default.dropdown-toggle#dropdownMenuAdmin{ type: :button, 'data-toggle' => 'dropdown', 'aria-haspopup' => true, 'aria-expanded' => false}
-      %i.fa.fa-cog
-      %span.caret
-    %ul.dropdown-menu.dropdown-menu-right
-      %li
-        = link_to(backoffice_filtres_path, id: :filter) do
-          %i.fa.fa-list
-           Filtre procédure
-      %li.divider{ role: :separator}
-      %li
-        = link_to('/gestionnaires/sign_out',id: :admin_sign_out, method: :delete) do
-          %i.fa.fa-power-off
-           Se déconnecter
+%div.user
+
+  %i.fa.fa-user
+  = current_gestionnaire.email
+
+  = link_to "Déconnexion", '/gestionnaires/sign_out', method: :delete, :class => 'btn btn-md'

app/views/layouts/_navbar.html.haml

@@ -18,19 +18,7 @@
   -elsif administrateur_signed_in?
     = render partial: 'administrateurs/login_banner'
   - elsif user_signed_in?
-    %div.user
-      -if current_user.loged_in_with_france_connect?
-        %div{ id: "fconnect-profile", "data-fc-logout-url" => '/users/sign_out" data-method="delete' }
-          %a.text-info{ href: "#" }
-            = "#{current_user.given_name} #{current_user.family_name}"
-
-        = link_to "", '/users/sign_out', method: :delete, :class => 'btn fa fa-power-off off-fc-link'
-
-      -else
-        %i.fa.fa-user
-        = current_user.email
-
-        = link_to "Déconnexion", '/users/sign_out', method: :delete, :class => 'btn btn-md'
+    = render partial: 'users/login_banner'
   - 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'

app/views/users/_login_banner.html.haml

@@ -0,0 +1,13 @@
+%div.user
+  -if current_user.loged_in_with_france_connect?
+    %div{ id: "fconnect-profile", "data-fc-logout-url" => '/users/sign_out" data-method="delete' }
+      %a.text-info{ href: "#" }
+        = "#{current_user.given_name} #{current_user.family_name}"
+
+    = link_to "", '/users/sign_out', method: :delete, :class => 'btn fa fa-power-off off-fc-link'
+
+  -else
+    %i.fa.fa-user
+    = current_user.email
+
+    = link_to "Déconnexion", '/users/sign_out', method: :delete, :class => 'btn btn-md'