diff --git a/app/facades/dossiers_list_facades.rb b/app/facades/dossiers_list_facades.rb index 9ab6b6055..0a05a4148 100644 --- a/app/facades/dossiers_list_facades.rb +++ b/app/facades/dossiers_list_facades.rb @@ -18,7 +18,7 @@ class DossiersListFacades end def total_dossier_follow - @current_devise_profil.dossiers_follow.count + @current_devise_profil.followed_dossiers.count end def total_new_dossier diff --git a/app/models/gestionnaire.rb b/app/models/gestionnaire.rb index 5fc2ee2be..b5e84bcdd 100644 --- a/app/models/gestionnaire.rb +++ b/app/models/gestionnaire.rb @@ -9,7 +9,7 @@ class Gestionnaire < ActiveRecord::Base has_many :assign_to, dependent: :destroy has_many :procedures, through: :assign_to has_many :dossiers, -> { where.not(state: :draft) }, through: :procedures - has_many :dossiers_follow, through: :follows, source: :dossier + has_many :followed_dossiers, through: :follows, source: :dossier has_many :follows has_many :preference_list_dossiers @@ -72,10 +72,10 @@ class Gestionnaire < ActiveRecord::Base end def notifications_for procedure - procedure_ids = dossiers_follow.pluck(:procedure_id) + procedure_ids = followed_dossiers.pluck(:procedure_id) if procedure_ids.include?(procedure.id) - return dossiers_follow.where(procedure_id: procedure.id) + return followed_dossiers.where(procedure_id: procedure.id) .inject(0) do |acc, dossier| acc += dossier.notifications.where(already_read: false).count end @@ -84,7 +84,7 @@ class Gestionnaire < ActiveRecord::Base end def dossiers_with_notifications_count_for_procedure(procedure) - followed_dossiers_id = dossiers_follow.where(procedure: procedure).pluck(:id) + followed_dossiers_id = followed_dossiers.where(procedure: procedure).pluck(:id) Notification.unread.where(dossier_id: followed_dossiers_id).select(:dossier_id).distinct(:dossier_id).count end diff --git a/app/services/dossiers_list_gestionnaire_service.rb b/app/services/dossiers_list_gestionnaire_service.rb index a53c35b4c..63a91783c 100644 --- a/app/services/dossiers_list_gestionnaire_service.rb +++ b/app/services/dossiers_list_gestionnaire_service.rb @@ -25,7 +25,7 @@ class DossiersListGestionnaireService end def suivi - @suivi ||= @current_devise_profil.dossiers_follow.merge(dossiers_to_display) + @suivi ||= @current_devise_profil.followed_dossiers.merge(dossiers_to_display) end def nouveaux diff --git a/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_index.html.haml b/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_index.html.haml index 60f5ed36b..c1dfe2bd7 100644 --- a/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_index.html.haml +++ b/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_index.html.haml @@ -1,6 +1,6 @@ #first-block .dossiers-en-cours - .count= current_gestionnaire.dossiers_follow.count + .count= current_gestionnaire.followed_dossiers.count .text SUIVIS .nouveaux-dossiers .count= current_gestionnaire.dossiers.nouveaux.count