diff --git a/app/admin/dashboard.rb b/app/admin/dashboard.rb index 624921b09..8d6bb84bc 100644 --- a/app/admin/dashboard.rb +++ b/app/admin/dashboard.rb @@ -43,15 +43,12 @@ def recupere_support end def recupere_evaluations - @evaluations = Evaluation.accessible_by(current_ability).order(created_at: :desc).limit(10) + @evaluations = Evaluation.tableau_de_bord(current_ability) end def recupere_evaluations_sans_mise_en_action - @evaluations_sans_mise_en_action = Evaluation.accessible_by(current_ability) - .where(mise_en_action_effectuee: nil) - .illettrisme_potentiel - .non_anonymes - .order(created_at: :desc) + @evaluations_sans_mise_en_action = + Evaluation.illettrismes_sans_mise_en_action(current_ability) end def recupere_actualites diff --git a/app/models/evaluation.rb b/app/models/evaluation.rb index 27c271a62..ee819e992 100644 --- a/app/models/evaluation.rb +++ b/app/models/evaluation.rb @@ -75,6 +75,22 @@ def enregistre_date update(mise_en_action_le: Time.zone.now) end + def self.tableau_de_bord(ability) + accessible_by(ability) + .non_anonymes + .order(created_at: :desc) + .limit(10) + end + + def self.illettrismes_sans_mise_en_action(ability) + accessible_by(ability) + .where(mise_en_action_effectuee: nil) + .illettrisme_potentiel + .non_anonymes + .order(created_at: :desc) + .limit(6) + end + private def trouve_campagne_depuis_code diff --git a/app/views/admin/dashboard/mise_en_action/_avec_evaluations.arb b/app/views/admin/dashboard/mise_en_action/_avec_evaluations.arb index 420c67142..82a3c65b3 100644 --- a/app/views/admin/dashboard/mise_en_action/_avec_evaluations.arb +++ b/app/views/admin/dashboard/mise_en_action/_avec_evaluations.arb @@ -10,7 +10,7 @@ div class: 'contenu-avec-evaluations' do text_node image_tag 'point_interrogation.svg', class: 'mr-3' div md(t('.question')), class: 'fw-semi-bold' end - render 'liste_evaluations', evaluations: evaluations.limit(6), + render 'liste_evaluations', evaluations: evaluations, partial_evaluation: 'evaluation_sans_mise_en_action' render 'components/banniere_solutions_illettrisme', asterisque: false end