diff --git a/.classpath b/.classpath index 4b5675b..148593c 100644 --- a/.classpath +++ b/.classpath @@ -12,6 +12,6 @@ - + diff --git a/analyseWriter.exe b/analyseWriter.exe index 01de6e0..6ff6592 100644 Binary files a/analyseWriter.exe and b/analyseWriter.exe differ diff --git a/analyseWriter.jar b/analyseWriter.jar index ff4cb44..df869ae 100644 Binary files a/analyseWriter.jar and b/analyseWriter.jar differ diff --git a/bin/.gitignore b/bin/.gitignore index 6f5d98a..b1c64a5 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -1,3 +1,5 @@ /fenetres/ /list/ /evaluer/ +/MEPTL/ +/resources/ diff --git a/bin/MEPTL/HTML.class b/bin/MEPTL/HTML.class index 801ac68..3c86e53 100644 Binary files a/bin/MEPTL/HTML.class and b/bin/MEPTL/HTML.class differ diff --git a/bin/MEPTL/feedbacks.class b/bin/MEPTL/feedbacks.class index 510a0d1..c4ca000 100644 Binary files a/bin/MEPTL/feedbacks.class and b/bin/MEPTL/feedbacks.class differ diff --git a/bin/MEPTL/meptl.class b/bin/MEPTL/meptl.class index 7bdb12a..9b3132a 100644 Binary files a/bin/MEPTL/meptl.class and b/bin/MEPTL/meptl.class differ diff --git a/bin/evaluer/evaluationAttribut.class b/bin/evaluer/evaluationAttribut.class index 1aeaa85..30bd5f9 100644 Binary files a/bin/evaluer/evaluationAttribut.class and b/bin/evaluer/evaluationAttribut.class differ diff --git a/bin/fenetres/afficheText.class b/bin/fenetres/afficheText.class index 1eb9421..3e75a7d 100644 Binary files a/bin/fenetres/afficheText.class and b/bin/fenetres/afficheText.class differ diff --git a/bin/fenetres/createPopupMenu.class b/bin/fenetres/createPopupMenu.class index ad3cae9..2d6a19f 100644 Binary files a/bin/fenetres/createPopupMenu.class and b/bin/fenetres/createPopupMenu.class differ diff --git a/bin/fenetres/create_act/actEvalPlacementParagrapheOui.class b/bin/fenetres/create_act/actEvalPlacementParagrapheOui.class index c065dd8..9057c94 100644 Binary files a/bin/fenetres/create_act/actEvalPlacementParagrapheOui.class and b/bin/fenetres/create_act/actEvalPlacementParagrapheOui.class differ diff --git a/bin/fenetres/create_act/actsautfalse.class b/bin/fenetres/create_act/actsautfalse.class index f381ef5..7d9d939 100644 Binary files a/bin/fenetres/create_act/actsautfalse.class and b/bin/fenetres/create_act/actsautfalse.class differ diff --git a/bin/fenetres/create_act/actsautmultiplefalse.class b/bin/fenetres/create_act/actsautmultiplefalse.class index 7a7f93f..5b66916 100644 Binary files a/bin/fenetres/create_act/actsautmultiplefalse.class and b/bin/fenetres/create_act/actsautmultiplefalse.class differ diff --git a/bin/fenetres/create_act/actsautmultipletrue.class b/bin/fenetres/create_act/actsautmultipletrue.class index b8fd01f..b1208be 100644 Binary files a/bin/fenetres/create_act/actsautmultipletrue.class and b/bin/fenetres/create_act/actsautmultipletrue.class differ diff --git a/bin/fenetres/create_act/actsauttrue.class b/bin/fenetres/create_act/actsauttrue.class index 986695d..8a55397 100644 Binary files a/bin/fenetres/create_act/actsauttrue.class and b/bin/fenetres/create_act/actsauttrue.class differ diff --git a/bin/list/listeAttributsAnalyseWriter.class b/bin/list/listeAttributsAnalyseWriter.class index 8b1645b..48e517f 100644 Binary files a/bin/list/listeAttributsAnalyseWriter.class and b/bin/list/listeAttributsAnalyseWriter.class differ diff --git a/bin/list/listeDesNodesEvalPlacement.class b/bin/list/listeDesNodesEvalPlacement.class index 554244a..f9690ab 100644 Binary files a/bin/list/listeDesNodesEvalPlacement.class and b/bin/list/listeDesNodesEvalPlacement.class differ diff --git a/icons/information.png b/icons/information.png new file mode 100644 index 0000000..d386f4d Binary files /dev/null and b/icons/information.png differ diff --git a/icons/information.svg b/icons/information.svg new file mode 100644 index 0000000..f274821 --- /dev/null +++ b/icons/information.svg @@ -0,0 +1,72 @@ + + + + diff --git a/icons/informationmaxi.png b/icons/informationmaxi.png new file mode 100644 index 0000000..f8a63e6 Binary files /dev/null and b/icons/informationmaxi.png differ diff --git a/icons/informationmini.png b/icons/informationmini.png new file mode 100644 index 0000000..dd71230 Binary files /dev/null and b/icons/informationmini.png differ diff --git a/src/MEPTL/HTML.java b/src/MEPTL/HTML.java index e324459..52f7cdc 100644 --- a/src/MEPTL/HTML.java +++ b/src/MEPTL/HTML.java @@ -120,8 +120,8 @@ public class HTML { } //Saut pour les informatons nodes - public static String SautP11bis(String titre) { - return "

" + titre+"

\r"; + public static String SautInformation(String titre) { + return "

" + titre+"

\r"; //style=\"font-size:12px\" } /** @@ -399,7 +399,7 @@ public static String TablePointsSyntheseStyle2(String titre,double prop, String code = code + HTML.SautLigne()+ HTML.SautP11(nodeAna.getAttributs().get("marquenode") + HTML.SautLigne()); } if(nodeAna.getAttributs().get("information")!=null) if(!nodeAna.getAttributs().get("information").isEmpty()){ - code = code + HTML.SautLigne()+ HTML.SautP11bis(nodeAna.getAttributs().get("marquenode") + HTML.SautLigne()); + code = code + HTML.SautLigne()+ HTML.SautInformation(nodeAna.getAttributs().get("information") + HTML.SautLigne()); } if(nodeAna.getAttributs().get("titre")!=null) if(!nodeAna.getAttributs().get("titre").isEmpty()){ if(nodeAna.getAttributs().get("proportioncorrect")!=null)if(!nodeAna.getAttributs().get("proportioncorrect").equals("NaN"))if(nodeAna.getAttributs().get("id")!=null) code = code + HTML.SautLigne()+ HTML.H1(nodeAna.getAttributs().get("titre"),nodeAna.getAttributs().get("id")) + HTML.SautLigne(); ; @@ -5852,7 +5852,7 @@ public static String TablePointsSyntheseStyle2(String titre,double prop, String // Date aujourdhui = new Date(); // DateFormat mediumDateFormat = DateFormat.getDateTimeInstance(DateFormat.MEDIUM,DateFormat.MEDIUM); return "\r