DGNum/demarches-normaliennes
14
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Rename dossier_with_notification_for

Browse source
This commit is contained in:
Mathieu Magnin 2017-05-12 11:35:01 +02:00
parent 339b8791f1
commit 8f5fdfa81f
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/facades/dossiers_list_facades.rb
View file

@ -30,7 +30,7 @@ class DossiersListFacades
end
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
def unread_notifications

2
app/models/gestionnaire.rb
View file

@ -86,7 +86,7 @@ class Gestionnaire < ActiveRecord::Base
0
end
def dossier_with_notification_for procedure
def dossiers_with_notifications_count_for_procedure(procedure)
procedure_ids = dossiers_follow.pluck(:procedure_id)
if procedure_ids.include?(procedure.id)

2
app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_index.html.haml
View file

@ -28,7 +28,7 @@
- if total_new > 0
.badge.progress-bar-success{ title: 'Nouveaux dossiers' }
= 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
.badge.progress-bar-warning{ title: 'Notifications' }
= unread_notif_count

4
spec/models/gestionnaire_spec.rb
View file

@ -313,8 +313,8 @@ describe Gestionnaire, type: :model do
end
end
describe '#dossier_with_notification_for' do
subject { gestionnaire.dossier_with_notification_for(procedure) }
describe '#dossiers_with_notifications_count_for_procedure' do
subject { gestionnaire.dossiers_with_notifications_count_for_procedure(procedure) }
context 'without notifications' do
it { is_expected.to eq(0) }