Merge branch 'develop' into refactor_type_de_xxx

app/controllers/admin/procedures_controller.rb

@@ -1,7 +1,7 @@
 class Admin::ProceduresController < AdminController
 
   def index
-    @procedures = Procedure.all
+    @procedures = current_administrateur.procedures
   end
 
   def show

app/controllers/backoffice_controller.rb

@@ -1,9 +1,12 @@
 class BackofficeController < ApplicationController
 
   def index
-    redirect_to(controller: '/gestionnaires/sessions', action: :new) unless gestionnaire_signed_in?
-    @dossiers_a_traiter = Dossier.a_traiter.decorate
-    @dossiers_en_attente = Dossier.en_attente.decorate
-    @dossiers_termine = Dossier.termine.decorate
+    if !gestionnaire_signed_in?
+      redirect_to(controller: '/gestionnaires/sessions', action: :new)
+    else
+      @dossiers_a_traiter = Dossier.a_traiter(current_gestionnaire).decorate
+      @dossiers_en_attente = Dossier.en_attente(current_gestionnaire).decorate
+      @dossiers_termine = Dossier.termine(current_gestionnaire).decorate
+    end
   end
 end

app/models/administrateur.rb

@@ -3,4 +3,7 @@ class Administrateur < ActiveRecord::Base
   # :confirmable, :lockable, :timeoutable and :omniauthable
   devise :database_authenticatable, :registerable,
          :recoverable, :rememberable, :trackable, :validatable
+
+  has_many :gestionnaires
+  has_many :procedures
 end

app/models/dossier.rb

@@ -116,16 +116,16 @@ class Dossier < ActiveRecord::Base
     state
   end
 
-  def self.a_traiter
-    Dossier.where("state='initiated' OR state='updated' OR state='submitted'").order('updated_at ASC')
+  def self.a_traiter current_gestionnaire
+    Dossier.joins(:procedure).where("(state='initiated' OR state='updated' OR state='submitted') AND dossiers.procedure_id = procedures.id AND procedures.administrateur_id = #{current_gestionnaire.administrateur_id}").order('updated_at ASC')
   end
 
-  def self.en_attente
-    Dossier.where("state='replied' OR state='validated'").order('updated_at ASC')
+  def self.en_attente current_gestionnaire
+    Dossier.joins(:procedure).where("(state='replied' OR state='validated') AND dossiers.procedure_id = procedures.id AND procedures.administrateur_id = #{current_gestionnaire.administrateur_id}").order('updated_at ASC')
   end
 
-  def self.termine
-    Dossier.where("state='closed'").order('updated_at ASC')
+  def self.termine current_gestionnaire
+    Dossier.joins(:procedure).where("state='closed' AND dossiers.procedure_id = procedures.id AND procedures.administrateur_id = #{current_gestionnaire.administrateur_id}").order('updated_at ASC')
   end
 
   private

app/models/gestionnaire.rb

@@ -3,4 +3,6 @@ class Gestionnaire < ActiveRecord::Base
   # :confirmable, :lockable, :timeoutable and :omniauthable
   devise :database_authenticatable, :registerable,
          :recoverable, :rememberable, :trackable, :validatable
+
+  belongs_to :administrateur
 end

app/models/procedure.rb

@@ -4,6 +4,8 @@ class Procedure < ActiveRecord::Base
   has_many :dossiers
   accepts_nested_attributes_for :types_de_champ,:reject_if => proc { |attributes| attributes['libelle'].blank? }, :allow_destroy => true
 
+  belongs_to :administrateur
+
   validates :libelle, presence: true, allow_blank: false, allow_nil: false
   validates :description, presence: true, allow_blank: false, allow_nil: false
 end