diff --git a/.classpath b/.classpath index 148593c..4b5675b 100644 --- a/.classpath +++ b/.classpath @@ -12,6 +12,6 @@ - + diff --git a/analyseWriter.exe b/analyseWriter.exe index aae13f0..01de6e0 100644 Binary files a/analyseWriter.exe and b/analyseWriter.exe differ diff --git a/analyseWriter.jar b/analyseWriter.jar index e31edf2..ff4cb44 100644 Binary files a/analyseWriter.jar and b/analyseWriter.jar differ diff --git a/bin/.gitignore b/bin/.gitignore index 1f05cf0..6f5d98a 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -1,6 +1,3 @@ -/MEPTL/ -/calcul/ -/evaluer/ /fenetres/ /list/ -/resources/ +/evaluer/ diff --git a/bin/MEPTL/HTML.class b/bin/MEPTL/HTML.class index 01f4b7d..801ac68 100644 Binary files a/bin/MEPTL/HTML.class and b/bin/MEPTL/HTML.class differ diff --git a/bin/MEPTL/meptl.class b/bin/MEPTL/meptl.class index ef5f8ca..7bdb12a 100644 Binary files a/bin/MEPTL/meptl.class and b/bin/MEPTL/meptl.class differ diff --git a/bin/dessin.svgparamètres évaluation et feedback.svg b/bin/dessin.svgparamètres évaluation et feedback.svg new file mode 100644 index 0000000..4edf861 --- /dev/null +++ b/bin/dessin.svgparamètres évaluation et feedback.svg @@ -0,0 +1,210 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bin/evaluer/evaluationAttribut.class b/bin/evaluer/evaluationAttribut.class index c4f99fe..1aeaa85 100644 Binary files a/bin/evaluer/evaluationAttribut.class and b/bin/evaluer/evaluationAttribut.class differ diff --git a/bin/evaluertouslesenfantsmaxi.png b/bin/evaluertouslesenfantsmaxi.png new file mode 100644 index 0000000..2c31e90 Binary files /dev/null and b/bin/evaluertouslesenfantsmaxi.png differ diff --git a/bin/fenetres/create_act/actsautmultiplefalse.class b/bin/fenetres/create_act/actsautmultiplefalse.class index 0ae7008..7a7f93f 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 55d25a9..b8fd01f 100644 Binary files a/bin/fenetres/create_act/actsautmultipletrue.class and b/bin/fenetres/create_act/actsautmultipletrue.class differ diff --git a/bin/fenetres/evaluate$1.class b/bin/fenetres/evaluate$1.class index e358570..96232ca 100644 Binary files a/bin/fenetres/evaluate$1.class and b/bin/fenetres/evaluate$1.class differ diff --git a/bin/fenetres/evaluate$10.class b/bin/fenetres/evaluate$10.class index f4ef6d1..caf88aa 100644 Binary files a/bin/fenetres/evaluate$10.class and b/bin/fenetres/evaluate$10.class differ diff --git a/bin/fenetres/evaluate$11.class b/bin/fenetres/evaluate$11.class index 22a0ade..eaf7477 100644 Binary files a/bin/fenetres/evaluate$11.class and b/bin/fenetres/evaluate$11.class differ diff --git a/bin/fenetres/evaluate$12.class b/bin/fenetres/evaluate$12.class index f61e322..e07df3d 100644 Binary files a/bin/fenetres/evaluate$12.class and b/bin/fenetres/evaluate$12.class differ diff --git a/bin/fenetres/evaluate$13.class b/bin/fenetres/evaluate$13.class index 2aa8589..94082c2 100644 Binary files a/bin/fenetres/evaluate$13.class and b/bin/fenetres/evaluate$13.class differ diff --git a/bin/fenetres/evaluate$14.class b/bin/fenetres/evaluate$14.class index 0863493..135a3fd 100644 Binary files a/bin/fenetres/evaluate$14.class and b/bin/fenetres/evaluate$14.class differ diff --git a/bin/fenetres/evaluate$15.class b/bin/fenetres/evaluate$15.class index ad9ea0b..3dea44d 100644 Binary files a/bin/fenetres/evaluate$15.class and b/bin/fenetres/evaluate$15.class differ diff --git a/bin/fenetres/evaluate$2.class b/bin/fenetres/evaluate$2.class index e176ee0..6ec2237 100644 Binary files a/bin/fenetres/evaluate$2.class and b/bin/fenetres/evaluate$2.class differ diff --git a/bin/fenetres/evaluate$3.class b/bin/fenetres/evaluate$3.class index 7808654..5462735 100644 Binary files a/bin/fenetres/evaluate$3.class and b/bin/fenetres/evaluate$3.class differ diff --git a/bin/fenetres/evaluate$4.class b/bin/fenetres/evaluate$4.class index 2a66a43..e10f518 100644 Binary files a/bin/fenetres/evaluate$4.class and b/bin/fenetres/evaluate$4.class differ diff --git a/bin/fenetres/evaluate$5.class b/bin/fenetres/evaluate$5.class index eba6011..535616d 100644 Binary files a/bin/fenetres/evaluate$5.class and b/bin/fenetres/evaluate$5.class differ diff --git a/bin/fenetres/evaluate$6.class b/bin/fenetres/evaluate$6.class index f6916a6..10ac3af 100644 Binary files a/bin/fenetres/evaluate$6.class and b/bin/fenetres/evaluate$6.class differ diff --git a/bin/fenetres/evaluate$7.class b/bin/fenetres/evaluate$7.class index 71cb5ec..c259e60 100644 Binary files a/bin/fenetres/evaluate$7.class and b/bin/fenetres/evaluate$7.class differ diff --git a/bin/fenetres/evaluate$8.class b/bin/fenetres/evaluate$8.class index a72389e..ae5e265 100644 Binary files a/bin/fenetres/evaluate$8.class and b/bin/fenetres/evaluate$8.class differ diff --git a/bin/fenetres/evaluate$9.class b/bin/fenetres/evaluate$9.class index d20a51e..cc216a8 100644 Binary files a/bin/fenetres/evaluate$9.class and b/bin/fenetres/evaluate$9.class differ diff --git a/bin/fenetres/evaluate.class b/bin/fenetres/evaluate.class index ab52812..4aeeb86 100644 Binary files a/bin/fenetres/evaluate.class and b/bin/fenetres/evaluate.class differ diff --git a/bin/fenetres/filechooserXML.class b/bin/fenetres/filechooserXML.class index d996e4e..fe9b787 100644 Binary files a/bin/fenetres/filechooserXML.class and b/bin/fenetres/filechooserXML.class differ diff --git a/bin/heritagestyle.png b/bin/heritagestyle.png new file mode 100644 index 0000000..18eca3c Binary files /dev/null and b/bin/heritagestyle.png differ diff --git a/bin/heritagestyle.svg b/bin/heritagestyle.svg new file mode 100644 index 0000000..bede975 --- /dev/null +++ b/bin/heritagestyle.svg @@ -0,0 +1,105 @@ + + + +S diff --git a/bin/heritagestylemini.png b/bin/heritagestylemini.png new file mode 100644 index 0000000..1e858de Binary files /dev/null and b/bin/heritagestylemini.png differ diff --git a/bin/heritagestyletouslesnodes.png b/bin/heritagestyletouslesnodes.png new file mode 100644 index 0000000..c160716 Binary files /dev/null and b/bin/heritagestyletouslesnodes.png differ diff --git a/bin/heritagestyletouslesnodes.svg b/bin/heritagestyletouslesnodes.svg new file mode 100644 index 0000000..d2acd20 --- /dev/null +++ b/bin/heritagestyletouslesnodes.svg @@ -0,0 +1,127 @@ + + + +SSS diff --git a/bin/heritagestyletouslesnodesmini.png b/bin/heritagestyletouslesnodesmini.png new file mode 100644 index 0000000..dd5bba2 Binary files /dev/null and b/bin/heritagestyletouslesnodesmini.png differ diff --git a/bin/lesnodesevaluermaxi.png b/bin/lesnodesevaluermaxi.png new file mode 100644 index 0000000..b0377d1 Binary files /dev/null and b/bin/lesnodesevaluermaxi.png differ diff --git a/bin/resources/heritagestyle.png b/bin/resources/heritagestyle.png new file mode 100644 index 0000000..18eca3c Binary files /dev/null and b/bin/resources/heritagestyle.png differ diff --git a/bin/resources/heritagestylemini.png b/bin/resources/heritagestylemini.png new file mode 100644 index 0000000..1e858de Binary files /dev/null and b/bin/resources/heritagestylemini.png differ diff --git a/bin/resources/heritagestyletouslesnodes.png b/bin/resources/heritagestyletouslesnodes.png new file mode 100644 index 0000000..c160716 Binary files /dev/null and b/bin/resources/heritagestyletouslesnodes.png differ diff --git a/bin/resources/heritagestyletouslesnodesmini.png b/bin/resources/heritagestyletouslesnodesmini.png new file mode 100644 index 0000000..dd5bba2 Binary files /dev/null and b/bin/resources/heritagestyletouslesnodesmini.png differ diff --git a/src/MEPTL/HTML.java b/src/MEPTL/HTML.java index 2db93ee..e324459 100644 --- a/src/MEPTL/HTML.java +++ b/src/MEPTL/HTML.java @@ -116,7 +116,12 @@ public class HTML { //Saut pour les marques nodes public static String SautP11(String titre) { - return "

" + titre+" ** supprimer la méthode marquage des nodes avant de fournir le feedback aux étudiants **

\r"; + return "

" + titre+" ** supprimer la méthode marquage des nodes avant de fournir le feedback aux étudiants **

\r"; + } + + //Saut pour les informatons nodes + public static String SautP11bis(String titre) { + return "

" + titre+"

\r"; } /** @@ -393,6 +398,9 @@ public static String TablePointsSyntheseStyle2(String titre,double prop, String if(nodeAna.getAttributs().get("marquenode")!=null) if(!nodeAna.getAttributs().get("marquenode").isEmpty()){ 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()); + } 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(); ; if(nodeAna.getAttributs().get("proportioncorrect")==null)if(nodeAna.getAttributs().get("id")!=null) code = code + HTML.SautLigne()+ HTML.H1(nodeAna.getAttributs().get("titre"),nodeAna.getAttributs().get("id")) + HTML.SautLigne(); ; @@ -5881,6 +5889,8 @@ public static String TablePointsSyntheseStyle2(String titre,double prop, String + ".sticky + .content {padding-top: 60px;}" + "#navbar2 {overflow: hidden; background-color: #333;}" + "#navbar2 a {float: left; font-size: 18px; color: white; text-align: center; padding: 16px 18px; text-decoration: none;}" + + "#grad1 {height: 40px;background-color: red; background-image: linear-gradient(red, yellow);}" + + "#grad2 {height: 40px;width:100px;background-color: white; background-image: linear-gradient(cyan, white,yellow,cyan);}" + ".dropdown {position: relative; display: inline-block;}" + ".dropbtn:hover, .dropbtn:focus { background-color: #3e8e41;}" + ".dropdown-content {display: none; position: absolute; background-color: #f9f9f9; min-width: 160px; box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);}" diff --git a/src/MEPTL/meptl.java b/src/MEPTL/meptl.java index fcc6f05..4728f14 100644 --- a/src/MEPTL/meptl.java +++ b/src/MEPTL/meptl.java @@ -1193,9 +1193,11 @@ public class meptl { nod.getNodes().get(i).setParent(nod); // nod = attributLesParentsAuxNodes(nod.getNodes().get(i)); for(int j = 0 ; j + * Raffraichissement des informationss.
+ * Activation des chckBoxs.
*/ private void refreshLabel() { if(!commandes.fichierAnalyseValide) { System.out.println( "Erreur du fichier d'analyse" ); - if(!MEPTL.verificationFichierAnalyse.messageErreur.toString().isEmpty()) txtpnmessages.setText(MEPTL.verificationFichierAnalyse.messageErreur.toString()); - + if(!MEPTL.verificationFichierAnalyse.messageErreur.toString().isEmpty()) { + txtpnmessages.setText(MEPTL.verificationFichierAnalyse.messageErreur.toString()); + } chckbxfichiersEtudiants.setEnabled(false); chckbxZipfeedback.setEnabled(false); chckbxnoFeedback.setEnabled(false); diff --git a/src/fenetres/filechooserXML.java b/src/fenetres/filechooserXML.java index fed79ee..0b07918 100644 --- a/src/fenetres/filechooserXML.java +++ b/src/fenetres/filechooserXML.java @@ -54,7 +54,6 @@ public class filechooserXML extends JFileChooser { String ext = file.getName().substring(file.getName().lastIndexOf(".")); if(ext.equals(".xml")){ - System.out.println( "Open file .xml" ); openFileXML(file); } }