From 78c65231f5bcc3bcbbd8e2a91e6199ee0ef02c94 Mon Sep 17 00:00:00 2001 From: Marie Leuliette Date: Tue, 30 Jul 2024 22:36:56 +0900 Subject: [PATCH 1/2] =?UTF-8?q?retirer=20les=20icones=20de=20la=20num?= =?UTF-8?q?=C3=A9ratie?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../images/icone_profil/numeratie/icone_indetermine.svg | 3 --- app/assets/images/icone_profil/numeratie/icone_profil1.svg | 5 ----- app/assets/images/icone_profil/numeratie/icone_profil2.svg | 5 ----- app/assets/images/icone_profil/numeratie/icone_profil3.svg | 5 ----- app/assets/images/icone_profil/numeratie/icone_profil4.svg | 5 ----- app/views/admin/evaluations/_numeratie.erb | 2 +- 6 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 app/assets/images/icone_profil/numeratie/icone_indetermine.svg delete mode 100644 app/assets/images/icone_profil/numeratie/icone_profil1.svg delete mode 100644 app/assets/images/icone_profil/numeratie/icone_profil2.svg delete mode 100644 app/assets/images/icone_profil/numeratie/icone_profil3.svg delete mode 100644 app/assets/images/icone_profil/numeratie/icone_profil4.svg diff --git a/app/assets/images/icone_profil/numeratie/icone_indetermine.svg b/app/assets/images/icone_profil/numeratie/icone_indetermine.svg deleted file mode 100644 index 2828504ab..000000000 --- a/app/assets/images/icone_profil/numeratie/icone_indetermine.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/app/assets/images/icone_profil/numeratie/icone_profil1.svg b/app/assets/images/icone_profil/numeratie/icone_profil1.svg deleted file mode 100644 index d8e4f3968..000000000 --- a/app/assets/images/icone_profil/numeratie/icone_profil1.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/app/assets/images/icone_profil/numeratie/icone_profil2.svg b/app/assets/images/icone_profil/numeratie/icone_profil2.svg deleted file mode 100644 index f385ddd0a..000000000 --- a/app/assets/images/icone_profil/numeratie/icone_profil2.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/app/assets/images/icone_profil/numeratie/icone_profil3.svg b/app/assets/images/icone_profil/numeratie/icone_profil3.svg deleted file mode 100644 index 14fdbe5eb..000000000 --- a/app/assets/images/icone_profil/numeratie/icone_profil3.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/app/assets/images/icone_profil/numeratie/icone_profil4.svg b/app/assets/images/icone_profil/numeratie/icone_profil4.svg deleted file mode 100644 index 3cfeffabd..000000000 --- a/app/assets/images/icone_profil/numeratie/icone_profil4.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/app/views/admin/evaluations/_numeratie.erb b/app/views/admin/evaluations/_numeratie.erb index 6520474e7..2a640db15 100644 --- a/app/views/admin/evaluations/_numeratie.erb +++ b/app/views/admin/evaluations/_numeratie.erb @@ -9,7 +9,7 @@ synthese: synthese, scope: "admin.evaluations.numeratie", description: "#{profil}.description", - icone: "icone_profil/numeratie/icone_#{profil}.svg", + icone: "icone_profil/icone_#{profil}.svg", pdf: pdf %> <% if !pdf && place_du_marche %> From e55e3e607f9860c34c6c0c9ffada570d5cdae1e5 Mon Sep 17 00:00:00 2001 From: Marie Leuliette Date: Tue, 30 Jul 2024 22:41:24 +0900 Subject: [PATCH 2/2] =?UTF-8?q?retourne=20les=20m=C3=AAmes=20synth=C3=A8se?= =?UTF-8?q?s=20pour=20positionnement=20litt=C3=A9ratie=20et=20positionneme?= =?UTF-8?q?nt=20num=C3=A9ratie?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/restitution/illettrisme/synthetiseur.rb | 6 ++++-- .../restitution/illettrisme/synthetiseur_spec.rb | 12 +++++++++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/app/models/restitution/illettrisme/synthetiseur.rb b/app/models/restitution/illettrisme/synthetiseur.rb index 144386bc9..2627ac710 100644 --- a/app/models/restitution/illettrisme/synthetiseur.rb +++ b/app/models/restitution/illettrisme/synthetiseur.rb @@ -89,11 +89,13 @@ def initialize(interpreteur_positionnement, inter_numeratie) end def socle_clea? - @niveau_positionnement.in?(%i[profil4 profil_4h profil_4h_plus profil_4h_plus_plus]) + @niveau_positionnement.in?(%i[profil4 profil_4h profil_4h_plus + profil_4h_plus_plus]) || @niveau_numeratie.in?(%i[profil4]) end def illettrisme_potentiel? - @niveau_positionnement.in?(%i[profil1 profil2]) || @niveau_numeratie.in?(%i[profil1]) + @niveau_positionnement.in?(%i[profil1 + profil2]) || @niveau_numeratie.in?(%i[profil1 profil2]) end def aberrant? diff --git a/spec/models/restitution/illettrisme/synthetiseur_spec.rb b/spec/models/restitution/illettrisme/synthetiseur_spec.rb index 8261a21ff..02721aee9 100644 --- a/spec/models/restitution/illettrisme/synthetiseur_spec.rb +++ b/spec/models/restitution/illettrisme/synthetiseur_spec.rb @@ -220,9 +220,9 @@ def synthese(profil) end it { expect(synthese(:profil1)).to eq 'illettrisme_potentiel' } - it { expect(synthese(:profil2)).not_to eq 'illettrisme_potentiel' } - it { expect(synthese(:profil3)).not_to eq 'illettrisme_potentiel' } - it { expect(synthese(:profil4)).not_to eq 'illettrisme_potentiel' } + it { expect(synthese(:profil2)).to eq 'illettrisme_potentiel' } + it { expect(synthese(:profil3)).to eq 'ni_ni' } + it { expect(synthese(:profil4)).to eq 'socle_clea' } it { expect(synthese(:indetermine)).to eq nil } end end @@ -300,5 +300,11 @@ def synthese(profil) expect(subject.positionnement_numeratie).to eq :profil1 end end + + describe '#synthese_positionnement_numeratie' do + it 'retourne la synthèse du niveau de positionnement de numératie' do + expect(subject.synthese_positionnement_numeratie).to eq 'illettrisme_potentiel' + end + end end end