Rename dossier_with_notification_for
This commit is contained in:
parent
339b8791f1
commit
8f5fdfa81f
4 changed files with 5 additions and 5 deletions
|
@ -30,7 +30,7 @@ class DossiersListFacades
|
||||||
end
|
end
|
||||||
|
|
||||||
def gestionnaire_procedures_name_and_id_list
|
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, unread_notifications: @current_devise_profil.dossier_with_notification_for(procedure)}) }
|
@current_devise_profil.procedures.order('libelle ASC').inject([]) { |acc, procedure| acc.push({id: procedure.id, libelle: procedure.libelle, unread_notifications: @current_devise_profil.dossiers_with_notifications_count_for_procedure(procedure)}) }
|
||||||
end
|
end
|
||||||
|
|
||||||
def unread_notifications
|
def unread_notifications
|
||||||
|
|
|
@ -86,7 +86,7 @@ class Gestionnaire < ActiveRecord::Base
|
||||||
0
|
0
|
||||||
end
|
end
|
||||||
|
|
||||||
def dossier_with_notification_for procedure
|
def dossiers_with_notifications_count_for_procedure(procedure)
|
||||||
procedure_ids = dossiers_follow.pluck(:procedure_id)
|
procedure_ids = dossiers_follow.pluck(:procedure_id)
|
||||||
|
|
||||||
if procedure_ids.include?(procedure.id)
|
if procedure_ids.include?(procedure.id)
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
- if total_new > 0
|
- if total_new > 0
|
||||||
.badge.progress-bar-success{ title: 'Nouveaux dossiers' }
|
.badge.progress-bar-success{ title: 'Nouveaux dossiers' }
|
||||||
= total_new
|
= total_new
|
||||||
- unread_notif_count = current_gestionnaire.dossier_with_notification_for(procedure)
|
- unread_notif_count = current_gestionnaire.dossiers_with_notifications_count_for_procedure(procedure)
|
||||||
- if unread_notif_count > 0
|
- if unread_notif_count > 0
|
||||||
.badge.progress-bar-warning{ title: 'Notifications' }
|
.badge.progress-bar-warning{ title: 'Notifications' }
|
||||||
= unread_notif_count
|
= unread_notif_count
|
||||||
|
|
|
@ -313,8 +313,8 @@ describe Gestionnaire, type: :model do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe '#dossier_with_notification_for' do
|
describe '#dossiers_with_notifications_count_for_procedure' do
|
||||||
subject { gestionnaire.dossier_with_notification_for(procedure) }
|
subject { gestionnaire.dossiers_with_notifications_count_for_procedure(procedure) }
|
||||||
|
|
||||||
context 'without notifications' do
|
context 'without notifications' do
|
||||||
it { is_expected.to eq(0) }
|
it { is_expected.to eq(0) }
|
||||||
|
|
Loading…
Reference in a new issue