diff --git a/analyseWriter.exe b/analyseWriter.exe index 018139e..65c2a8f 100644 Binary files a/analyseWriter.exe and b/analyseWriter.exe differ diff --git a/analyseWriter.jar b/analyseWriter.jar index 47c3329..2e17a21 100644 Binary files a/analyseWriter.jar and b/analyseWriter.jar differ diff --git a/bin/.gitignore b/bin/.gitignore index 1f05cf0..311fd9c 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -4,3 +4,5 @@ /fenetres/ /list/ /resources/ +/nocsvstudent.png +/nocsvstudentmini.png diff --git a/bin/evaluer/evaluationAttribut.class b/bin/evaluer/evaluationAttribut.class index 62e8ede..67ddf6e 100644 Binary files a/bin/evaluer/evaluationAttribut.class and b/bin/evaluer/evaluationAttribut.class differ diff --git a/bin/fenetres/createPopupMenu.class b/bin/fenetres/createPopupMenu.class index 2d6a19f..6030539 100644 Binary files a/bin/fenetres/createPopupMenu.class and b/bin/fenetres/createPopupMenu.class differ diff --git a/bin/fenetres/create_act/actEvalueTrue.class b/bin/fenetres/create_act/actEvalueTrue.class index 98739ab..2941fad 100644 Binary files a/bin/fenetres/create_act/actEvalueTrue.class and b/bin/fenetres/create_act/actEvalueTrue.class differ diff --git a/bin/fenetres/create_act/actEvaluerStyleTrue.class b/bin/fenetres/create_act/actEvaluerStyleTrue.class index a08dfc2..7eb1a1e 100644 Binary files a/bin/fenetres/create_act/actEvaluerStyleTrue.class and b/bin/fenetres/create_act/actEvaluerStyleTrue.class differ diff --git a/bin/fenetres/create_act/actEvaluerTousEnfantsTrue.class b/bin/fenetres/create_act/actEvaluerTousEnfantsTrue.class index eb7a28f..5747fb4 100644 Binary files a/bin/fenetres/create_act/actEvaluerTousEnfantsTrue.class and b/bin/fenetres/create_act/actEvaluerTousEnfantsTrue.class differ diff --git a/bin/fenetres/create_act/actTitre1.class b/bin/fenetres/create_act/actTitre1.class index 778d1b4..95699bf 100644 Binary files a/bin/fenetres/create_act/actTitre1.class and b/bin/fenetres/create_act/actTitre1.class differ diff --git a/bin/fenetres/create_act/actTitre2.class b/bin/fenetres/create_act/actTitre2.class index bc08a9e..0fef891 100644 Binary files a/bin/fenetres/create_act/actTitre2.class and b/bin/fenetres/create_act/actTitre2.class differ diff --git a/bin/fenetres/create_act/actTitre3.class b/bin/fenetres/create_act/actTitre3.class index 9ff53f5..eded533 100644 Binary files a/bin/fenetres/create_act/actTitre3.class and b/bin/fenetres/create_act/actTitre3.class differ diff --git a/bin/fenetres/create_act/actsautmultipletrue.class b/bin/fenetres/create_act/actsautmultipletrue.class index b1208be..c0e7db0 100644 Binary files a/bin/fenetres/create_act/actsautmultipletrue.class and b/bin/fenetres/create_act/actsautmultipletrue.class differ diff --git a/src/evaluer/evaluationAttribut.java b/src/evaluer/evaluationAttribut.java index 08c9750..d5e5526 100644 --- a/src/evaluer/evaluationAttribut.java +++ b/src/evaluer/evaluationAttribut.java @@ -898,10 +898,10 @@ public class evaluationAttribut { node item = null; if(nodStudent!=null) { //compare la même valeur "contenuParagraph" pour obtenir les points mais si un voisinage du contenu. - item = retourneNoteAvecResultatsAnalyse("Placement","avant", contenuParagraph,contenuParagraph + "‽" +point, nameElt ); + item = retourneNoteAvecResultatsAnalyse("Placement","avant", "Oui","Oui" + "‽" +point, nameElt ); }else { evaluation.IncrementPointTotal(Integer.valueOf(point)); - item = new node("Placement", "Erreur : -"+ point, "avant" , "null", contenuParagraph, 2, evaluation.getPointEnJeu(),nameElt); + item = new node("Placement", "Erreur : -"+ point, "avant" , "null", "non", 2, evaluation.getPointEnJeu(),nameElt); } retour.getNodes().add(item); return retour; diff --git a/src/fenetres/createPopupMenu.java b/src/fenetres/createPopupMenu.java index 3b01c22..4e57f50 100644 --- a/src/fenetres/createPopupMenu.java +++ b/src/fenetres/createPopupMenu.java @@ -56,6 +56,8 @@ import fenetres.create_act.actEvaluerTousLesStylesParagraphesTrue; import fenetres.create_act.actExpandAll; import fenetres.create_act.actExpandNode; import fenetres.create_act.actInsereInformationFalse; +import fenetres.create_act.actInsereInformationMultipleFalse; +import fenetres.create_act.actInsereInformationMultipleTrue; import fenetres.create_act.actInsereInformationTrue; import fenetres.create_act.actOu; import fenetres.create_act.actPaste; @@ -246,6 +248,10 @@ if(nod!=null) { return mnTitre; } + /** + * + * @return + */ private JMenu mnInsereInformation() { JMenu mnInsereInformation = new JMenu("Insère information contenu du node"); mnInsereInformation.setIcon( new ImageIcon(create.class.getResource("/resources/informationmini.png"))); @@ -254,6 +260,18 @@ if(nod!=null) { return mnInsereInformation; } + /** + * + * @return + */ + private JMenu mnInsereInformationMultiple() { + JMenu mnInsereInformationMultiple = new JMenu("Insère les informations contenus de tous les nodes enfants"); + mnInsereInformationMultiple.setIcon( new ImageIcon(create.class.getResource("/resources/informationmultiplemini.png"))); + mnInsereInformationMultiple.add(new actInsereInformationMultipleTrue()); + mnInsereInformationMultiple.add(new actInsereInformationMultipleFalse()); + return mnInsereInformationMultiple; + } + /** * Menu Titre pour le niveau 1.
@@ -506,6 +524,8 @@ if(nod!=null) { mnPourFeedback.addSeparator(); mnPourFeedback.add(mnAddMenuNiveauSup1()); if(listeDesNodesPourEvaluerPage.isPage(nod)) { + mnPourFeedback.addSeparator(); + mnPourFeedback.add(mnInsereInformationMultiple()); mnPourFeedback.addSeparator(); mnPourFeedback.add(mnSautMultiple()); mnPourFeedback.addSeparator(); @@ -585,7 +605,7 @@ if(nod!=null) { */ private JMenu mnNiveau1 () { JMenu mnNiveau1 = new JMenu("Pour représentation & coefficient"); - mnNiveau1.setIcon( new ImageIcon(create.class.getResource("/resources/attributanalysewritermini.png"))); + mnNiveau1.setIcon( new ImageIcon(create.class.getResource("/resources/feedbackmini.png"))); ///resources/attributanalysewritermini.png mnNiveau1.add(new actCoefficient()); mnNiveau1.addSeparator(); mnNiveau1.add(mnSautNiveau1()); diff --git a/src/fenetres/create_act/actEvalueTrue.java b/src/fenetres/create_act/actEvalueTrue.java index 7ae54f8..5bcdcde 100644 --- a/src/fenetres/create_act/actEvalueTrue.java +++ b/src/fenetres/create_act/actEvalueTrue.java @@ -32,6 +32,7 @@ public class actEvalueTrue extends AbstractAction{ public void actionPerformed(ActionEvent e) { node nod = (node) fenetres.create.getSelectNode().getUserObject(); nod.evaluerTrue(); + //Ajoute addmenu au node de niveau 1. if(nod.getLevel()==1) nod.addMenu(true); @@ -39,7 +40,10 @@ public class actEvalueTrue extends AbstractAction{ //Change les évaluateurs pour les nodes style:style if(nod.getNomElt().equals("style:style")) { // Change les évaluateurs ‼ en ‽ - if(nod.getAttributs().get("EvaluerATraversAnalyseStyle")!=null) { + + String value = nod.getAttributs().get("EvaluerATraversAnalyseStyle"); + + if(value==null){ if(!listeNodeFormatageDirectDeWriter.isFormatageDirect(nod)) { nod.changeLesCodesEvaluateursVersCodeEvaluateurDirect(); @@ -58,17 +62,20 @@ public class actEvalueTrue extends AbstractAction{ } } + + TreePath path = fenetres.create.getTree().getSelectionPath(); - + DefaultTreeModel model = (DefaultTreeModel) fenetres.create.getTree().getModel(); - DefaultMutableTreeNode root = (DefaultMutableTreeNode) model.getRoot(); - model.reload(root); - - fenetres.create.getTree().setSelectionPath(path); - fenetres.create.getTree().expandPath(path); - - fenetres.create.getTextNodeSelect().refreshAffichage(nod); + DefaultMutableTreeNode root = (DefaultMutableTreeNode) model.getRoot(); + model.reload(root); + + fenetres.create.getTree().setSelectionPath(path); + fenetres.create.getTree().expandPath(path); + + + fenetres.create.getTextNodeSelect().refreshAffichage(nod); } diff --git a/src/fenetres/create_act/actEvaluerStyleTrue.java b/src/fenetres/create_act/actEvaluerStyleTrue.java index 09fb164..2ffb7fa 100644 --- a/src/fenetres/create_act/actEvaluerStyleTrue.java +++ b/src/fenetres/create_act/actEvaluerStyleTrue.java @@ -36,7 +36,7 @@ public class actEvaluerStyleTrue extends AbstractAction{ node nodStyle = commandes.sujet.retourneFirstNodeByNameAndAttributValueExactStrict("style:style", "style:name", nod.getAttributs().get("text:style-name")); if(nodStyle!=null) { nodStyle.getAttributs().put("EvaluerATraversAnalyseStyle", "true"); -// nodStyle.evaluerTrue(); + nodStyle.evaluerTrue(); nodStyle.changeLesCodesEvaluateursVersCodeATraversAnalyseStyle(); } diff --git a/src/fenetres/create_act/actEvaluerTousEnfantsTrue.java b/src/fenetres/create_act/actEvaluerTousEnfantsTrue.java index 0322a9b..3ce7c0b 100644 --- a/src/fenetres/create_act/actEvaluerTousEnfantsTrue.java +++ b/src/fenetres/create_act/actEvaluerTousEnfantsTrue.java @@ -29,7 +29,8 @@ public class actEvaluerTousEnfantsTrue extends AbstractAction{ node nod = (node) fenetres.create.getSelectNode().getUserObject(); if(!nod.getNomElt().equals("fichier")) { - //Evalue tous les child et place addmenu=true pour les level=1. + //Evalue tous les childs et place addmenu=true pour les level=1. + nod.evaluerTrue(); nod.evaluerAllChildTrue(); fenetres.create.getTextNodeSelect().refreshAffichage(nod); } diff --git a/src/fenetres/create_act/actInsereInformationMultipleFalse.java b/src/fenetres/create_act/actInsereInformationMultipleFalse.java new file mode 100644 index 0000000..07ce036 --- /dev/null +++ b/src/fenetres/create_act/actInsereInformationMultipleFalse.java @@ -0,0 +1,32 @@ +package fenetres.create_act; + +import java.awt.event.ActionEvent; + +import javax.swing.AbstractAction; +import javax.swing.Action; +import javax.swing.ImageIcon; + +import cXML.node; +import fenetres.create; + +public class actInsereInformationMultipleFalse extends AbstractAction{ + { + putValue( Action.NAME, "false" ); + putValue( Action.SHORT_DESCRIPTION, "false" ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/falsemini.png"))); + } + /** + * + */ + private static final long serialVersionUID = 1L; + + @Override + public void actionPerformed(ActionEvent e) { + node nod = (node) fenetres.create.getSelectNode().getUserObject(); + for(int i = 0 ; i < nod.getNodes().size();i++) { + nod.getNodes().get(i).getAttributs().remove("information"); + } + fenetres.create.getTextNodeSelect().refreshAffichage(nod); + } + +} diff --git a/src/fenetres/create_act/actInsereInformationMultipleTrue.java b/src/fenetres/create_act/actInsereInformationMultipleTrue.java new file mode 100644 index 0000000..54bf06f --- /dev/null +++ b/src/fenetres/create_act/actInsereInformationMultipleTrue.java @@ -0,0 +1,38 @@ +package fenetres.create_act; + +import java.awt.event.ActionEvent; + +import javax.swing.AbstractAction; +import javax.swing.Action; +import javax.swing.ImageIcon; + +import cXML.node; +import fenetres.create; + +public class actInsereInformationMultipleTrue extends AbstractAction{ + { + putValue( Action.NAME, "true" ); + putValue( Action.SHORT_DESCRIPTION, "true" ); + putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/truemini.png"))); + } + /** + * + */ + private static final long serialVersionUID = 1L; + + @Override + public void actionPerformed(ActionEvent e) { + node nod = (node) fenetres.create.getSelectNode().getUserObject(); + + for(int i = 0 ; i < nod.getNodes().size();i++) { + String content = nod.getNodes().get(i).retourneLesContenusEnfants(""); + if(!content.isEmpty()) if(content.replaceAll(" ", "").length()==0) content=content.replaceAll(" ", ""); + if(content.length()>300) content = content.substring(0, 299); + content = nod.getNodes().get(i).getNomElt() + " : " + content; + nod.getNodes().get(i).getAttributs().put("information", content); + } + + fenetres.create.getTextNodeSelect().refreshAffichage(nod); + } + +} diff --git a/src/fenetres/create_act/actTitre1.java b/src/fenetres/create_act/actTitre1.java index 4ddf462..6cf39f8 100644 --- a/src/fenetres/create_act/actTitre1.java +++ b/src/fenetres/create_act/actTitre1.java @@ -40,7 +40,7 @@ public class actTitre1 extends AbstractAction{ int result = JOptionPane.showConfirmDialog(null, myPanel, "Saisissez votre titre 1 ", JOptionPane.OK_CANCEL_OPTION); if (result == JOptionPane.OK_OPTION) { - nod.titre(xField.getText()); + nod.titre1(xField.getText()); fenetres.create.getTextNodeSelect().refreshAffichage(nod); } diff --git a/src/fenetres/create_act/actTitre2.java b/src/fenetres/create_act/actTitre2.java index a85e9b6..107cc00 100644 --- a/src/fenetres/create_act/actTitre2.java +++ b/src/fenetres/create_act/actTitre2.java @@ -41,7 +41,7 @@ public class actTitre2 extends AbstractAction{ int result = JOptionPane.showConfirmDialog(null, myPanel, "Saisissez votre titre 2 ", JOptionPane.OK_CANCEL_OPTION); if (result == JOptionPane.OK_OPTION) { - nod.titre(xField.getText()); + nod.titre2(xField.getText()); fenetres.create.getTextNodeSelect().refreshAffichage(nod); } // diff --git a/src/fenetres/create_act/actTitre3.java b/src/fenetres/create_act/actTitre3.java index 54aff71..0b995b8 100644 --- a/src/fenetres/create_act/actTitre3.java +++ b/src/fenetres/create_act/actTitre3.java @@ -41,7 +41,7 @@ public class actTitre3 extends AbstractAction{ int result = JOptionPane.showConfirmDialog(null, myPanel, "Saisissez votre titre 3 ", JOptionPane.OK_CANCEL_OPTION); if (result == JOptionPane.OK_OPTION) { - nod.titre(xField.getText()); + nod.titre3(xField.getText()); fenetres.create.getTextNodeSelect().refreshAffichage(nod); } diff --git a/src/fenetres/create_act/actTitrePrincipal.java b/src/fenetres/create_act/actTitrePrincipal.java index 5dc19eb..e9e448e 100644 --- a/src/fenetres/create_act/actTitrePrincipal.java +++ b/src/fenetres/create_act/actTitrePrincipal.java @@ -38,7 +38,7 @@ public class actTitrePrincipal extends AbstractAction{ myPanel.add(xField); - int result = JOptionPane.showConfirmDialog(null, myPanel, "Saisissez votre titre principal", JOptionPane.OK_CANCEL_OPTION); + int result = JOptionPane.showConfirmDialog(null,myPanel,"Saisissez votre titre principal", JOptionPane.OK_CANCEL_OPTION); if (result == JOptionPane.OK_OPTION) { nod.titre(xField.getText()); fenetres.create.getTextNodeSelect().refreshAffichage(nod); diff --git a/src/fenetres/create_act/actsautmultipletrue.java b/src/fenetres/create_act/actsautmultipletrue.java index e325e0e..4506508 100644 --- a/src/fenetres/create_act/actsautmultipletrue.java +++ b/src/fenetres/create_act/actsautmultipletrue.java @@ -25,7 +25,7 @@ public class actsautmultipletrue extends AbstractAction{ public void actionPerformed(ActionEvent e) { node nod = (node) fenetres.create.getSelectNode().getUserObject(); boolean informations = false; - if(JOptionPane.showConfirmDialog(null,"Voulez-vous placer le contenu du node après le saut?", "Information", JOptionPane.YES_NO_OPTION,JOptionPane.QUESTION_MESSAGE)==JOptionPane.YES_OPTION) { + if(JOptionPane.showConfirmDialog(null,"Voulez-vous placer l'information du node juste après le saut?", "Information", JOptionPane.YES_NO_OPTION,JOptionPane.QUESTION_MESSAGE)==JOptionPane.YES_OPTION) { informations=true; } for(int i = 0 ; i < nod.getNodes().size();i++) { @@ -35,7 +35,7 @@ public class actsautmultipletrue extends AbstractAction{ if(!content.isEmpty()) if(content.replaceAll(" ", "").length()==0) content=content.replaceAll(" ", ""); if(content.length()>300) content = content.substring(0, 299); - content = nod.getNodes().get(i).toString() + " : " + content; + content = nod.getNodes().get(i).getNomElt() + " : " + content; nod.getNodes().get(i).getAttributs().put("information", content); } } @@ -46,7 +46,7 @@ public class actsautmultipletrue extends AbstractAction{ if(!content.isEmpty()) if(content.replaceAll(" ", "").length()==0) content=content.replaceAll(" ", ""); if(content.length()>300) content = content.substring(0, 299); - content = nod.toString() + " : " + content; + content = nod.getNomElt() + " : " + content; nod.getAttributs().put("information", content); } diff --git a/src/resources/informationmultiple.png b/src/resources/informationmultiple.png new file mode 100644 index 0000000..2d50cb1 Binary files /dev/null and b/src/resources/informationmultiple.png differ diff --git a/src/resources/informationmultiplemini.png b/src/resources/informationmultiplemini.png new file mode 100644 index 0000000..5f9d0e6 Binary files /dev/null and b/src/resources/informationmultiplemini.png differ