diff --git a/analyseWriter.exe b/analyseWriter.exe
index 78e7f2c..4bc50c0 100644
Binary files a/analyseWriter.exe and b/analyseWriter.exe differ
diff --git a/analyseWriter.jar b/analyseWriter.jar
index efb9010..59839bb 100644
Binary files a/analyseWriter.jar and b/analyseWriter.jar differ
diff --git a/bin/.gitignore b/bin/.gitignore
index 75cdcb7..3bba6e1 100644
--- a/bin/.gitignore
+++ b/bin/.gitignore
@@ -1 +1,2 @@
/fenetres/
+/MEPTL/
diff --git a/bin/MEPTL/HTML.class b/bin/MEPTL/HTML.class
index a87691d..ec70360 100644
Binary files a/bin/MEPTL/HTML.class and b/bin/MEPTL/HTML.class differ
diff --git a/bin/MEPTL/commandes.class b/bin/MEPTL/commandes.class
index d18a205..6196de7 100644
Binary files a/bin/MEPTL/commandes.class and b/bin/MEPTL/commandes.class differ
diff --git a/bin/MEPTL/feedbacks.class b/bin/MEPTL/feedbacks.class
index 40a031a..4740d3c 100644
Binary files a/bin/MEPTL/feedbacks.class and b/bin/MEPTL/feedbacks.class differ
diff --git a/bin/fenetres/evaluate$1.class b/bin/fenetres/evaluate$1.class
index cb4af95..2492baf 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 22eb306..3fef7fb 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 905d963..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 11b12c3..9bb54d5 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 7102f06..5921a39 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 cc3212b..8c984d8 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 c301637..a2f9f59 100644
Binary files a/bin/fenetres/evaluate$15.class and b/bin/fenetres/evaluate$15.class differ
diff --git a/bin/fenetres/evaluate$16.class b/bin/fenetres/evaluate$16.class
index 2fdfa0e..023cf6a 100644
Binary files a/bin/fenetres/evaluate$16.class and b/bin/fenetres/evaluate$16.class differ
diff --git a/bin/fenetres/evaluate$17.class b/bin/fenetres/evaluate$17.class
index 546398d..33718b8 100644
Binary files a/bin/fenetres/evaluate$17.class and b/bin/fenetres/evaluate$17.class differ
diff --git a/bin/fenetres/evaluate$18.class b/bin/fenetres/evaluate$18.class
index 0c13792..2c3882c 100644
Binary files a/bin/fenetres/evaluate$18.class and b/bin/fenetres/evaluate$18.class differ
diff --git a/bin/fenetres/evaluate$19.class b/bin/fenetres/evaluate$19.class
index bfa68fa..d39844e 100644
Binary files a/bin/fenetres/evaluate$19.class and b/bin/fenetres/evaluate$19.class differ
diff --git a/bin/fenetres/evaluate$2.class b/bin/fenetres/evaluate$2.class
index 220d4ef..288a866 100644
Binary files a/bin/fenetres/evaluate$2.class and b/bin/fenetres/evaluate$2.class differ
diff --git a/bin/fenetres/evaluate$20.class b/bin/fenetres/evaluate$20.class
index da02dbd..007c273 100644
Binary files a/bin/fenetres/evaluate$20.class and b/bin/fenetres/evaluate$20.class differ
diff --git a/bin/fenetres/evaluate$21.class b/bin/fenetres/evaluate$21.class
index 4586726..d82ce6f 100644
Binary files a/bin/fenetres/evaluate$21.class and b/bin/fenetres/evaluate$21.class differ
diff --git a/bin/fenetres/evaluate$22.class b/bin/fenetres/evaluate$22.class
index 0cd3a07..34c8a9e 100644
Binary files a/bin/fenetres/evaluate$22.class and b/bin/fenetres/evaluate$22.class differ
diff --git a/bin/fenetres/evaluate$23.class b/bin/fenetres/evaluate$23.class
index 707c378..f14165b 100644
Binary files a/bin/fenetres/evaluate$23.class and b/bin/fenetres/evaluate$23.class differ
diff --git a/bin/fenetres/evaluate$24.class b/bin/fenetres/evaluate$24.class
index 8753a64..0ad1ab6 100644
Binary files a/bin/fenetres/evaluate$24.class and b/bin/fenetres/evaluate$24.class differ
diff --git a/bin/fenetres/evaluate$25.class b/bin/fenetres/evaluate$25.class
index c5acba7..654fdf4 100644
Binary files a/bin/fenetres/evaluate$25.class and b/bin/fenetres/evaluate$25.class differ
diff --git a/bin/fenetres/evaluate$26.class b/bin/fenetres/evaluate$26.class
index d188127..f8474dd 100644
Binary files a/bin/fenetres/evaluate$26.class and b/bin/fenetres/evaluate$26.class differ
diff --git a/bin/fenetres/evaluate$27.class b/bin/fenetres/evaluate$27.class
index 9d46006..a60e8de 100644
Binary files a/bin/fenetres/evaluate$27.class and b/bin/fenetres/evaluate$27.class differ
diff --git a/bin/fenetres/evaluate$28.class b/bin/fenetres/evaluate$28.class
index 49e6848..f871b30 100644
Binary files a/bin/fenetres/evaluate$28.class and b/bin/fenetres/evaluate$28.class differ
diff --git a/bin/fenetres/evaluate$29.class b/bin/fenetres/evaluate$29.class
index 7bbadd9..4b9fa2f 100644
Binary files a/bin/fenetres/evaluate$29.class and b/bin/fenetres/evaluate$29.class differ
diff --git a/bin/fenetres/evaluate$3.class b/bin/fenetres/evaluate$3.class
index cf4f4b1..49331de 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 58cd1e4..4ab2302 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 f8da5e4..5035ac1 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 e23726f..0002b8a 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 a9663f9..d1d473f 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 2b4ff11..a72389e 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 ede4c71..4640206 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 37af3eb..57a748b 100644
Binary files a/bin/fenetres/evaluate.class and b/bin/fenetres/evaluate.class differ
diff --git a/src/MEPTL/HTML.java b/src/MEPTL/HTML.java
index a7325ec..8293f12 100644
--- a/src/MEPTL/HTML.java
+++ b/src/MEPTL/HTML.java
@@ -190,14 +190,17 @@ public class HTML {
+ "\r\n" +
"";
-
- return "\r\n" +
- ""
- + ""
- + "" +
- "├ " + titre +" | "
- + "
\r\n" +
- "
";
+ if(!commandes.noDetail) {
+ return "\r\n" +
+ ""
+ + ""
+ + "" +
+ "├ " + titre +" | "
+ + "
\r\n" +
+ "
";
+ }
+
+ return "";
// return "\r\n" +
// ""
diff --git a/src/MEPTL/commandes.java b/src/MEPTL/commandes.java
index b91fba5..3e92fc9 100644
--- a/src/MEPTL/commandes.java
+++ b/src/MEPTL/commandes.java
@@ -54,6 +54,7 @@ public class commandes {
public static boolean fourniCSV = false; // fourni le fichier CSV contenant la liste des étudiants
public static boolean badCommand = false ; //erreur dans les commandes
public static boolean noNote =false; // pas de note dans les feedbacks
+ public static boolean noDetail = false; // pas de détail dans les feedbacks
public static boolean noLogo =false; // pas de logo dans les feedbacks
public static boolean newLogo=false; // un nouveau logo dans le feedback
public static boolean licence = false; // affiche la licence
diff --git a/src/MEPTL/feedbacks.java b/src/MEPTL/feedbacks.java
index 080a4f1..5670747 100644
--- a/src/MEPTL/feedbacks.java
+++ b/src/MEPTL/feedbacks.java
@@ -247,8 +247,11 @@ public class feedbacks {
fichier.append("");
- //ajoute le menu
- fichier.append(HTML.getHTMLmenu(nodana.retourneFirstEnfantsByName("menu").getNodes()));
+ //ajoute le menu si pas de détails
+ if(!commandes.noDetail) {
+ fichier.append(HTML.getHTMLmenu(nodana.retourneFirstEnfantsByName("menu").getNodes()));
+ }
+
//Les erreurs
@@ -290,65 +293,68 @@ public class feedbacks {
fichier.append(HTML.TableEnteteTableurSynthese());
fichier = SyntheseTable(nodana,fichier);
- //Metadonnées
- if(nodana.retourneFirstEnfantsByName("meta")!=null) if(nodana.retourneFirstEnfantsByName("meta").isClose()) {
- fichier.append(HTML.Table(nodana.retourneFirstEnfantsByName("meta")));
- }
-
- //style de paragraphe
- if(nodana.retourneFirstEnfantsByName("paragraphs")!=null) if(nodana.retourneFirstEnfantsByName("paragraphs").isClose()) {
- fichier.append(HTML.Table(nodana.retourneFirstEnfantsByName("paragraphs")));
- }
-
- //pages
- if(nodana.retourneFirstEnfantsByName("pages")!=null) if(nodana.retourneFirstEnfantsByName("pages").isClose()) {
- fichier.append(HTML.Table(nodana.retourneFirstEnfantsByName("pages")));
- }
-
- //sequences
- if(nodana.retourneFirstEnfantsByName("sequences")!=null) if(nodana.retourneFirstEnfantsByName("sequences").isClose()) {
- fichier.append(HTML.Table(nodana.retourneFirstEnfantsByName("sequences")));
- }
+ if(!commandes.noDetail) {
+ //Metadonnées
+ if(nodana.retourneFirstEnfantsByName("meta")!=null) if(nodana.retourneFirstEnfantsByName("meta").isClose()) {
+ fichier.append(HTML.Table(nodana.retourneFirstEnfantsByName("meta")));
+ }
+
+ //style de paragraphe
+ if(nodana.retourneFirstEnfantsByName("paragraphs")!=null) if(nodana.retourneFirstEnfantsByName("paragraphs").isClose()) {
+ fichier.append(HTML.Table(nodana.retourneFirstEnfantsByName("paragraphs")));
+ }
+
+ //pages
+ if(nodana.retourneFirstEnfantsByName("pages")!=null) if(nodana.retourneFirstEnfantsByName("pages").isClose()) {
+ fichier.append(HTML.Table(nodana.retourneFirstEnfantsByName("pages")));
+ }
+
+ //sequences
+ if(nodana.retourneFirstEnfantsByName("sequences")!=null) if(nodana.retourneFirstEnfantsByName("sequences").isClose()) {
+ fichier.append(HTML.Table(nodana.retourneFirstEnfantsByName("sequences")));
+ }
- //numerotationchapitre
- if(nodana.retourneFirstEnfantsByName("numerotationchapitre")!=null) if(nodana.retourneFirstEnfantsByName("numerotationchapitre").isClose()) {
- fichier.append(HTML.Table(nodana.retourneFirstEnfantsByName("numerotationchapitre")));
- }
-
- //frames
- if(nodana.retourneFirstEnfantsByName("frames")!=null) if(nodana.retourneFirstEnfantsByName("frames").isClose()) {
- fichier.append(HTML.Table(nodana.retourneFirstEnfantsByName("frames")));
- }
-
- //section
- if(nodana.retourneFirstEnfantsByName("sections")!=null) if(nodana.retourneFirstEnfantsByName("sections").isClose()) {
- fichier.append(HTML.Table(nodana.retourneFirstEnfantsByName("sections")));
- }
-
- //tableau
- if(nodana.retourneFirstEnfantsByName("tableaux")!=null) if(nodana.retourneFirstEnfantsByName("tableaux").isClose()) {
- fichier.append(HTML.Table(nodana.retourneFirstEnfantsByName("tableaux")));
- }
-
- //bibliographies
- if(nodana.retourneFirstEnfantsByName("bibliographies")!=null) if(nodana.retourneFirstEnfantsByName("bibliographies").isClose()) {
- fichier.append(HTML.Table(nodana.retourneFirstEnfantsByName("bibliographies")));
- }
-
- //tablematieres
- if(nodana.retourneFirstEnfantsByName("tablematieres")!=null) if(nodana.retourneFirstEnfantsByName("tablematieres").isClose()) {
- fichier.append(HTML.Table(nodana.retourneFirstEnfantsByName("tablematieres")));
- }
+ //numerotationchapitre
+ if(nodana.retourneFirstEnfantsByName("numerotationchapitre")!=null) if(nodana.retourneFirstEnfantsByName("numerotationchapitre").isClose()) {
+ fichier.append(HTML.Table(nodana.retourneFirstEnfantsByName("numerotationchapitre")));
+ }
+
+ //frames
+ if(nodana.retourneFirstEnfantsByName("frames")!=null) if(nodana.retourneFirstEnfantsByName("frames").isClose()) {
+ fichier.append(HTML.Table(nodana.retourneFirstEnfantsByName("frames")));
+ }
+
+ //section
+ if(nodana.retourneFirstEnfantsByName("sections")!=null) if(nodana.retourneFirstEnfantsByName("sections").isClose()) {
+ fichier.append(HTML.Table(nodana.retourneFirstEnfantsByName("sections")));
+ }
+
+ //tableau
+ if(nodana.retourneFirstEnfantsByName("tableaux")!=null) if(nodana.retourneFirstEnfantsByName("tableaux").isClose()) {
+ fichier.append(HTML.Table(nodana.retourneFirstEnfantsByName("tableaux")));
+ }
+
+ //bibliographies
+ if(nodana.retourneFirstEnfantsByName("bibliographies")!=null) if(nodana.retourneFirstEnfantsByName("bibliographies").isClose()) {
+ fichier.append(HTML.Table(nodana.retourneFirstEnfantsByName("bibliographies")));
+ }
+
+ //tablematieres
+ if(nodana.retourneFirstEnfantsByName("tablematieres")!=null) if(nodana.retourneFirstEnfantsByName("tablematieres").isClose()) {
+ fichier.append(HTML.Table(nodana.retourneFirstEnfantsByName("tablematieres")));
+ }
- //tableillustrations
- if(nodana.retourneFirstEnfantsByName("tableillustrations")!=null) if(nodana.retourneFirstEnfantsByName("tableillustrations").isClose()) {
- fichier.append(HTML.Table(nodana.retourneFirstEnfantsByName("tableillustrations")));
+ //tableillustrations
+ if(nodana.retourneFirstEnfantsByName("tableillustrations")!=null) if(nodana.retourneFirstEnfantsByName("tableillustrations").isClose()) {
+ fichier.append(HTML.Table(nodana.retourneFirstEnfantsByName("tableillustrations")));
+ }
+
+ //structurepage
+ if(nodana.retourneFirstEnfantsByName("structurepage")!=null) if(nodana.retourneFirstEnfantsByName("structurepage").isClose()) {
+ fichier.append(HTML.Table(nodana.retourneFirstEnfantsByName("structurepage")));
+ }
}
-
- //structurepage
- if(nodana.retourneFirstEnfantsByName("structurepage")!=null) if(nodana.retourneFirstEnfantsByName("structurepage").isClose()) {
- fichier.append(HTML.Table(nodana.retourneFirstEnfantsByName("structurepage")));
- }
+
fichier.append("
");
}
diff --git a/src/fenetres/evaluate.java b/src/fenetres/evaluate.java
index f047d5f..ec30b36 100644
--- a/src/fenetres/evaluate.java
+++ b/src/fenetres/evaluate.java
@@ -71,6 +71,7 @@ public class evaluate extends JFrame {
private JCheckBox chckbxNoLogo;
private JCheckBox chckbxVerif;
private JCheckBox chckbxNewLogo;
+ private JCheckBox chckbxNoDetail;
private afficheText txtpnmessages;
@@ -198,6 +199,7 @@ public class evaluate extends JFrame {
}
}
});
+
chckbxNoNote.setToolTipText("Cochez si vous voulez pas faire apparaître les notes dans les feedbacks");
chckbxNoNote.setFont(new Font("Tahoma", Font.PLAIN, 12));
panelWest.add(chckbxNoNote, "cell 0 2,grow");
@@ -212,6 +214,21 @@ public class evaluate extends JFrame {
}
}
});
+
+
+ chckbxNoDetail = new JCheckBox("Pas de détails dans les feedbacks");
+ chckbxNoDetail.addChangeListener(new ChangeListener() {
+ public void stateChanged(ChangeEvent e) {
+ if(chckbxNoDetail.isSelected()) {
+ commandes.noDetail=true;
+ }else {
+ commandes.noDetail=false;
+ }
+ }
+ });
+ chckbxNoDetail.setToolTipText("Cochez si vous voulez que la table synthèse dans les feedbacks");
+ chckbxNoDetail.setFont(new Font("Tahoma", Font.PLAIN, 12));
+ panelWest.add(chckbxNoDetail, "cell 0 2");
chckbxVerif.setToolTipText("Cochez si vous voulez vérifier les échanges de fichiers entre les étudiants.");
chckbxVerif.setFont(new Font("Tahoma", Font.PLAIN, 12));
panelWest.add(chckbxVerif, "cell 0 2,grow");
@@ -459,6 +476,7 @@ public class evaluate extends JFrame {
chckbxNewLogo.setEnabled(false);
chckbxNoLogo.setEnabled(false);
chckbxVerif.setEnabled(false);
+ chckbxNoDetail.setEnabled(false);
}else {
chckbxfichiersEtudiants.setEnabled(true);
chckbxZipfeedback.setEnabled(true);
@@ -468,6 +486,7 @@ public class evaluate extends JFrame {
chckbxNewLogo.setEnabled(true);
chckbxNoLogo.setEnabled(true);
chckbxVerif.setEnabled(true);
+ chckbxNoDetail.setEnabled(true);
txtpnmessages.afficheChargementFichierAnalyse();
}