diff --git a/bin/evaluer/analyseFichier.class b/bin/evaluer/analyseFichier.class index 1a1751c..554df3d 100644 Binary files a/bin/evaluer/analyseFichier.class and b/bin/evaluer/analyseFichier.class differ diff --git a/bin/evaluer/analyseLesNodesPrincipaux.class b/bin/evaluer/analyseLesNodesPrincipaux.class index 513ea7d..552526b 100644 Binary files a/bin/evaluer/analyseLesNodesPrincipaux.class and b/bin/evaluer/analyseLesNodesPrincipaux.class differ diff --git a/bin/list/listeDesNodesEvalPlacement.class b/bin/list/listeDesNodesEvalPlacement.class index b1bb598..c995b1a 100644 Binary files a/bin/list/listeDesNodesEvalPlacement.class and b/bin/list/listeDesNodesEvalPlacement.class differ diff --git a/src/evaluer/analyseFichier.java b/src/evaluer/analyseFichier.java index 433f662..676404c 100644 --- a/src/evaluer/analyseFichier.java +++ b/src/evaluer/analyseFichier.java @@ -162,7 +162,10 @@ public class analyseFichier { if(nod.getNomElt().equals("frames")) { if(nod.getAttributs().get("evaluer")!=null) { if(nod.getAttributs().get("evaluer").equals("true")) { - nodframes = analyseLesNodesPrincipaux.analyseLesFrames(nodStudent.retourneFirstEnfantsByName("frames"), nod, a, nodmenu); + node nodSujetParagraphs = null; + if(nodSujet.retourneFirstEnfantsByName("style:paragraph").getNomElt().equals("style:paragraph")) nodSujetParagraphs = nodSujet.retourneFirstEnfantsByName("style:paragraph"); + node nodStudentParagraphs = nodStudent.retourneFirstEnfantsByName("style:paragraph"); + nodframes = analyseLesNodesPrincipaux.analyseLesFrames(nodStudent.retourneFirstEnfantsByName("frames"), nod,nodSujetParagraphs, nodStudentParagraphs,a, nodmenu); ordre.add("frames"); } } diff --git a/src/evaluer/analyseLesNodesPrincipaux.java b/src/evaluer/analyseLesNodesPrincipaux.java index fd0b54e..6171bdf 100644 --- a/src/evaluer/analyseLesNodesPrincipaux.java +++ b/src/evaluer/analyseLesNodesPrincipaux.java @@ -200,7 +200,7 @@ public class analyseLesNodesPrincipaux { * @param nodmenu * @return */ - public static node analyseLesFrames(node nodStudentFrames, node nodSujetFrames, Run a, node nodmenu) { + public static node analyseLesFrames(node nodStudentFrames, node nodSujetFrames, node nodSujetParagraphes, node nodStudentParagraphes,Run a, node nodmenu) { node nodframes = new node(); nodframes.setNomElt("frames"); nodframes.setAttributs(nodSujetFrames.getAttributs()); //ajoute tous les attributs du sujet @@ -254,7 +254,7 @@ public class analyseLesNodesPrincipaux { //************************************ //** analyse tous les nodes enfants ** //************************************ - frame = analyseLesNodesEnfants.nodeNext(frame, "ana:frame", frameStudent, null, null, frameSujet, null, null, nodmenu,a); + frame = analyseLesNodesEnfants.nodeNext(frame, "ana:frame", frameStudent, null, null, frameSujet, nodSujetParagraphes, nodStudentParagraphes, nodmenu,a); //**************************************************************** //** Insère les attributs des points dans les node de l'analyse ** diff --git a/src/list/listeDesNodesEvalPlacement.java b/src/list/listeDesNodesEvalPlacement.java index 08e2c5a..264198d 100644 --- a/src/list/listeDesNodesEvalPlacement.java +++ b/src/list/listeDesNodesEvalPlacement.java @@ -30,6 +30,15 @@ public class listeDesNodesEvalPlacement { case "text:conditional-text": return true; case "text:database-display": return true; case "text:s": return true; + case "text:sender-company": return true; + case "text:sender-street": return true; + case "text:sender-postal-code": return true; + case "text:sender-city": return true; + case "text:sender-phone-work": return true; + case "text:sender-email": return true; + case "text:hidden-text": return true; + case "text:hidden-paragraph": return true; + default: return false;