diff --git a/bin/.gitignore b/bin/.gitignore index ad8b717..633c7e6 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -9,3 +9,9 @@ /evaltextuserdefined.png /evaltextuserdefined.svg /evaltextuserdefinedmini.png +/enteteoui.png +/enteteoui.svg +/enteteouimini.png +/piedpageoui.png +/piedpageoui.svg +/piedpageouimini.png diff --git a/bin/evaluer/evaluationAttribut.class b/bin/evaluer/evaluationAttribut.class index 7c7b866..81a0f03 100644 Binary files a/bin/evaluer/evaluationAttribut.class and b/bin/evaluer/evaluationAttribut.class differ diff --git a/icons/enteteoui.png b/icons/enteteoui.png new file mode 100644 index 0000000..43f8129 Binary files /dev/null and b/icons/enteteoui.png differ diff --git a/icons/enteteoui.svg b/icons/enteteoui.svg new file mode 100644 index 0000000..4696846 --- /dev/null +++ b/icons/enteteoui.svg @@ -0,0 +1,259 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/icons/enteteouimini.png b/icons/enteteouimini.png new file mode 100644 index 0000000..32c2f63 Binary files /dev/null and b/icons/enteteouimini.png differ diff --git a/icons/piedpageoui.png b/icons/piedpageoui.png new file mode 100644 index 0000000..18e38bd Binary files /dev/null and b/icons/piedpageoui.png differ diff --git a/icons/piedpageoui.svg b/icons/piedpageoui.svg new file mode 100644 index 0000000..ed8526e --- /dev/null +++ b/icons/piedpageoui.svg @@ -0,0 +1,259 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/icons/piedpageouimini.png b/icons/piedpageouimini.png new file mode 100644 index 0000000..d743a3b Binary files /dev/null and b/icons/piedpageouimini.png differ diff --git a/src/evaluer/evaluationAttribut.java b/src/evaluer/evaluationAttribut.java index 2ff6be2..ddceeb2 100644 --- a/src/evaluer/evaluationAttribut.java +++ b/src/evaluer/evaluationAttribut.java @@ -378,10 +378,10 @@ public class evaluationAttribut { private static node evaluEntetePasActive(node retour, String nbAttributStudent, String nbAttribut, String point, String nameElt) { node item = null; if(nbAttributStudent!=null) { - item = retourneNoteAvecResultatsAnalyse(nbAttribut,"active", nbAttributStudent,nbAttribut + "‽" +point, nameElt ); + item = retourneNoteAvecResultatsAnalyse(nbAttribut,"pas active", nbAttributStudent,nbAttribut + "‽" +point, nameElt ); }else { evaluation.IncrementPointTotal(Integer.valueOf(point)); - item = new node(nbAttribut, "Erreur", "active" , "null", nbAttribut, 2, evaluation.getPointEnJeu(),nameElt); + item = new node(nbAttribut, "Erreur", "pas active" , "null", nbAttribut, 2, evaluation.getPointEnJeu(),nameElt); } retour.getNodes().add(item); return retour; @@ -420,10 +420,10 @@ public class evaluationAttribut { private static node evaluPiedPagePasActive(node retour, String nbAttributStudent, String nbAttribut, String point, String nameElt) { node item = null; if(nbAttributStudent!=null) { - item = retourneNoteAvecResultatsAnalyse(nbAttribut,"active", nbAttributStudent,nbAttribut + "‽" +point, nameElt ); + item = retourneNoteAvecResultatsAnalyse(nbAttribut,"pas active", nbAttributStudent,nbAttribut + "‽" +point, nameElt ); }else { evaluation.IncrementPointTotal(Integer.valueOf(point)); - item = new node(nbAttribut, "Erreur", "active" , "null", nbAttribut, 2, evaluation.getPointEnJeu(),nameElt); + item = new node(nbAttribut, "Erreur", "pas active" , "null", nbAttribut, 2, evaluation.getPointEnJeu(),nameElt); } retour.getNodes().add(item); return retour;