MAJ 4.4.2 - ajout de la méthode addTitreToutesLesPages qui permet
ajouter des titres à toutes les pages depuis le node structurepage. Ajout dans le menu contextuel du node structurepage de la possibilité d'évaluer les nodes page (allContent et evalNamePage). Ajout dans la rechercher de node du node text:note (recherche identique à text:p) Amélioration de la récupération par héritage des informations dans les nodes style:style (ajout des familles des style : section et graphic).
This commit is contained in:
pablo rodriguez
parent
2c20177c27
commit
0eca3a99e1
Binary file not shown.
Binary file not shown.
|
|
@ -3,79 +3,4 @@
|
|||
/evaluer/
|
||||
/fenetres/
|
||||
/list/
|
||||
/sequence.png
|
||||
/sequence.svg
|
||||
/setting.png
|
||||
/setting.svg
|
||||
/settingmini.png
|
||||
/similitude.png
|
||||
/similitude.svg
|
||||
/similitudemini.png
|
||||
/structurepage.png
|
||||
/structurepage.svg
|
||||
/stylepage.png
|
||||
/stylepage.svg
|
||||
/styleparagraphe.png
|
||||
/styleparagraphe.svg
|
||||
/supprime.svg
|
||||
/supprimemini.png
|
||||
/textclean.png
|
||||
/textclean.svg
|
||||
/textcleanmini.png
|
||||
/titre.svg
|
||||
/titremini.png
|
||||
/totalpoint.png
|
||||
/totalpoint.svg
|
||||
/totalpointmini.png
|
||||
/totalpointnode.png
|
||||
/totalpointnode.svg
|
||||
/totalpointnodemini.png
|
||||
/touslesnodes.png
|
||||
/touslesnodes.svg
|
||||
/touslesnodesmini.png
|
||||
/toutext.png
|
||||
/toutext.svg
|
||||
/toutextmini.png
|
||||
/traduction.png
|
||||
/traduction.svg
|
||||
/traductionmini.png
|
||||
/treeClose.png
|
||||
/treeClose.svg
|
||||
/treeLeaf.png
|
||||
/treeLeaf.svg
|
||||
/treeOpen.png
|
||||
/treeOpen.svg
|
||||
/triche.png
|
||||
/triche.svg
|
||||
/trichemini.png
|
||||
/true.png
|
||||
/true.svg
|
||||
/truemini.png
|
||||
/tutoriel.png
|
||||
/tutoriel.svg
|
||||
/tutorielmini.png
|
||||
/undo.png
|
||||
/upnode.png
|
||||
/upnode.svg
|
||||
/upnodemini.png
|
||||
/verifhistorique.png
|
||||
/verifhistoriquemax.png
|
||||
/verifhistoriquemini.png
|
||||
/verifhistoriquestudent.png
|
||||
/verifhistoriquestudent.svg
|
||||
/verifhistoriquestudentmini.png
|
||||
/versevaluate.png
|
||||
/versevaluate.svg
|
||||
/versevaluatemini.png
|
||||
/versfichierAnalyse.png
|
||||
/versfichierAnalyseModifmax.svg
|
||||
/voir.svg
|
||||
/voirmini.png
|
||||
/what.svg
|
||||
/whatmini.png
|
||||
/zip.png
|
||||
/zip.svg
|
||||
/zipmini.png
|
||||
/zipstudent.png
|
||||
/zipstudent.svg
|
||||
/zipstudentmini.png
|
||||
/resources/
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
After Width: | Height: | Size: 1.7 KiB |
|
|
@ -0,0 +1,93 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||
|
||||
<svg
|
||||
width="45"
|
||||
height="45"
|
||||
viewBox="0 0 11.90625 11.90625"
|
||||
version="1.1"
|
||||
id="svg5"
|
||||
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
|
||||
sodipodi:docname="ajoutetitretouteslespages.svg"
|
||||
inkscape:export-filename="ajoutetitretouteslespagesmini.png"
|
||||
inkscape:export-xdpi="51.200001"
|
||||
inkscape:export-ydpi="51.200001"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:svg="http://www.w3.org/2000/svg">
|
||||
<sodipodi:namedview
|
||||
id="namedview7"
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1.0"
|
||||
inkscape:showpageshadow="2"
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pagecheckerboard="0"
|
||||
inkscape:deskcolor="#d1d1d1"
|
||||
inkscape:document-units="mm"
|
||||
showgrid="false"
|
||||
inkscape:zoom="6.3118084"
|
||||
inkscape:cx="8.7930426"
|
||||
inkscape:cy="45.549545"
|
||||
inkscape:window-width="1920"
|
||||
inkscape:window-height="1009"
|
||||
inkscape:window-x="-8"
|
||||
inkscape:window-y="-8"
|
||||
inkscape:window-maximized="1"
|
||||
inkscape:current-layer="layer1" />
|
||||
<defs
|
||||
id="defs2" />
|
||||
<g
|
||||
inkscape:label="Calque 1"
|
||||
inkscape:groupmode="layer"
|
||||
id="layer1">
|
||||
<g
|
||||
id="g2647"
|
||||
transform="matrix(0.28793276,0,0,0.26458333,-0.38675935,2.6906589)"
|
||||
style="stroke-width:0.958596">
|
||||
<path
|
||||
id="rect984"
|
||||
style="fill:#000000;stroke-width:191.719;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
|
||||
d="m 18.34554,-6.6838893 -0.24475,0.1035157 0.179632,1.3066406 -1.966974,0.8378907 -0.177387,-1.3066407 -10.7442682,4.5820313 0.1796324,1.30664048 -1.96473,0.8378906 -0.1796325,-1.30468744 -0.3368108,0.14257809 2.2768414,16.56054497 0.013473,-0.0059 2.0770005,15.115234 15.2552872,-6.505859 -2.276842,-16.5605451 -0.01347,0.0059 z m -0.0067,1.8437501 0.238013,1.7324219 -1.96473,0.8378906 -0.238013,-1.7324219 z M 15.900292,-2.9983423 17.528212,8.8434549 7.8505123,12.97236 6.2203475,1.1286108 Z m 2.73715,0.3242187 0.238014,1.73046868 -1.964731,0.83789065 L 16.672712,-1.836233 Z M 18.933835,-0.51006116 19.17185,1.2223608 17.207118,2.0602514 16.969105,0.32782938 Z M 5.6320512,0.58173568 5.8700642,2.3122045 3.9030887,3.1500949 3.6650757,1.4196263 Z m 13.6004238,1.07421872 0.238013,1.7304685 -1.96473,0.837891 -0.238012,-1.730469 z m -13.3040302,1.0898435 0.2380129,1.730469 -1.96473,0.839844 -0.2380131,-1.732422 z m 13.6026692,1.076172 0.238013,1.730469 -1.964731,0.837891 -0.238012,-1.730469 z m -13.3040302,1.087891 0.2380129,1.732422 -1.96473,0.83789 -0.238013,-1.732421 z m 13.6004232,1.076172 0.238013,1.732422 -1.96473,0.83789 -0.238012,-1.732422 z M 6.5234773,7.0758759 6.7614904,8.8063449 4.7967603,9.6442355 4.5587472,7.9157199 Z m 13.6026687,1.076172 0.231278,1.6894536 -1.953504,0.8320315 -0.179632,-1.3066415 -0.01126,0.0039 -0.05164,-0.3808586 z M 6.8221163,9.2418915 7.0601294,10.972361 5.0953992,11.812205 4.8573863,10.079782 Z m 13.6071597,1.0273435 0.238014,1.732423 -1.964732,0.837889 -0.238012,-1.732421 z m -13.3107662,1.13672 0.2402585,1.732419 -1.9669755,0.837892 -0.238013,-1.732422 z m 10.8722552,0.703125 1.62792,11.843748 -9.6799448,4.128906 -1.6279198,-11.84375 z m 2.73715,0.326171 0.238013,1.730468 -1.96473,0.837891 -0.238012,-1.730469 z m -13.3107662,1.136718 0.2312769,1.689452 -1.9512577,0.832032 -0.1796324,-1.30664 -0.013473,0.0059 -0.051645,-0.382812 z m 13.6071602,1.027344 0.238013,1.732421 -1.96473,0.83789 -0.238013,-1.732421 z M 7.7202786,15.689156 7.960537,17.421578 5.9935615,18.259468 5.7555486,16.527046 Z m 13.6026684,1.076172 0.238014,1.730468 -1.964731,0.837891 -0.238012,-1.730469 z M 8.0189177,17.855171 8.2569306,19.58564 6.2922005,20.423531 6.0541875,18.693062 Z m 13.6026683,1.076172 0.238013,1.730469 -1.96473,0.837891 -0.240257,-1.730469 z m -13.3040294,1.087891 0.2380129,1.732422 -1.96473,0.83789 -0.2402584,-1.732422 z m 13.6004234,1.076172 0.238013,1.732422 -1.964731,0.83789 -0.238012,-1.732422 z M 8.6139502,22.185251 8.8519634,23.915718 6.8872332,24.753609 6.64922,23.02314 Z m 13.6026688,1.074217 0.238013,1.732422 -1.96473,0.837891 -0.238012,-1.732422 z m -13.3040294,1.091797 0.238012,1.730469 -1.9647295,0.83789 -0.2380131,-1.730467 z m 0.2963929,2.164063 0.2380121,1.732422 -1.9647289,0.83789 -0.2380132,-1.732422 z m 0.2986394,2.164062 0.2380132,1.732422 -1.9647305,0.837891 -0.238013,-1.730469 z" />
|
||||
<text
|
||||
xml:space="preserve"
|
||||
style="font-size:13.3333px;line-height:1.25;font-family:'C.A. Gatintas';-inkscape-font-specification:'C.A. Gatintas';text-align:center;text-anchor:middle;fill:#008080;stroke-width:0.958596"
|
||||
x="9.6482239"
|
||||
y="15.382297"
|
||||
id="text2186"
|
||||
transform="matrix(1,-0.48925329,0.20865383,0.89791543,0,0)"><tspan
|
||||
sodipodi:role="line"
|
||||
id="tspan2184"
|
||||
x="9.6482239"
|
||||
y="15.382297"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:Arial;-inkscape-font-specification:Arial;fill:#008080;stroke-width:0.958596">T</tspan></text>
|
||||
<text
|
||||
xml:space="preserve"
|
||||
style="font-size:13.3333px;line-height:1.25;font-family:'C.A. Gatintas';-inkscape-font-specification:'C.A. Gatintas';text-align:center;text-anchor:middle;fill:#008080;stroke-width:0.958596"
|
||||
x="8.372529"
|
||||
y="32.285374"
|
||||
id="text2468"
|
||||
transform="matrix(1,-0.48925329,0.20865383,0.89791543,0,0)"><tspan
|
||||
sodipodi:role="line"
|
||||
id="tspan2466"
|
||||
x="8.372529"
|
||||
y="32.285374"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:Arial;-inkscape-font-specification:Arial;fill:#008080;stroke-width:0.958596">T</tspan></text>
|
||||
</g>
|
||||
<rect
|
||||
style="fill:#f2f2f2;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stop-color:#000000"
|
||||
id="rect566"
|
||||
width="3.479259"
|
||||
height="4.2337971"
|
||||
x="7.1398783"
|
||||
y="1.2383752" />
|
||||
<rect
|
||||
style="fill:#f2f2f2;stroke:#000000;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stop-color:#000000"
|
||||
id="rect568"
|
||||
width="3.479259"
|
||||
height="4.2337971"
|
||||
x="7.1398783"
|
||||
y="6.272171" />
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 6.4 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 819 B |
|
|
@ -562,6 +562,8 @@ public class meptl {
|
|||
nodstyleparagraphe.setNomElt("style:paragraph");
|
||||
nodstyleparagraphe.addNode(a.NodesAyantAttribut(nodstyle, "style:family","paragraph"));
|
||||
nodstyleparagraphe.addNode(a.NodesAyantAttribut(nodstyle, "style:family","text"));
|
||||
nodstyleparagraphe.addNode(a.NodesAyantAttribut(nodstyle, "style:family","section"));
|
||||
nodstyleparagraphe.addNode(a.NodesAyantAttribut(nodstyle, "style:family","graphic"));
|
||||
nodstyleparagraphe = ajouteValeurLesValeursDuStyleParagraphParent(nodstyleparagraphe);
|
||||
nodstyleparagraphe = ajouteValeurParDefautAuStyleParagraph(nodstyleparagraphe);
|
||||
|
||||
|
|
@ -2722,45 +2724,47 @@ public class meptl {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
if(parent!=null) {
|
||||
|
||||
//le paragraph properties
|
||||
node nodeStyleParentParagraphProperties = parent.retourneFirstEnfantsByName("style:paragraph-properties");
|
||||
node LesNodesStyleParagraph = nodStyle.retourneFirstEnfantsByName("style:paragraph-properties");
|
||||
Enumeration<String > K = nodeStyleParentParagraphProperties.getAttributs().keys();
|
||||
while(K.hasMoreElements()){
|
||||
String Key = K.nextElement();
|
||||
if(LesNodesStyleParagraph.getNomElt().equals("style:paragraph-properties")) {
|
||||
if(LesNodesStyleParagraph.getAttributs().get(Key)==null) {
|
||||
LesNodesStyleParagraph.getAttributs().put(Key, nodeStyleParentParagraphProperties.getAttributs().get(Key));
|
||||
}
|
||||
}else {
|
||||
node n = new node();
|
||||
n.setNomElt("style:paragraph-properties");
|
||||
n.setAttributs(nodeStyleParentParagraphProperties.getAttributs());
|
||||
nodStyle.getNodes().add(n);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
//le text properties
|
||||
node nodeStyleParDefautTextProperties = parent.retourneFirstEnfantsByName("style:text-properties");
|
||||
node LesNodesStyleText = nodStyle.retourneFirstEnfantsByName("style:text-properties");
|
||||
K = nodeStyleParDefautTextProperties.getAttributs().keys();
|
||||
while(K.hasMoreElements()){
|
||||
String Key = K.nextElement();
|
||||
if(LesNodesStyleText.getNomElt().equals("style:text-properties")) {
|
||||
if(LesNodesStyleText.getAttributs().get(Key)==null) {
|
||||
LesNodesStyleText.getAttributs().put(Key, nodeStyleParDefautTextProperties.getAttributs().get(Key));
|
||||
}
|
||||
}else {
|
||||
node n = new node();
|
||||
n.setNomElt("style:text-properties");
|
||||
n.setAttributs(nodeStyleParDefautTextProperties.getAttributs());
|
||||
nodStyle.getNodes().add(n);
|
||||
break;
|
||||
}
|
||||
}
|
||||
addStyleParent(parent, nodStyle, ensembleDesParagraphes);
|
||||
// //le paragraph properties
|
||||
// node nodeStyleParentParagraphProperties = parent.retourneFirstEnfantsByName("style:paragraph-properties");
|
||||
// node LesNodesStyleParagraph = nodStyle.retourneFirstEnfantsByName("style:paragraph-properties");
|
||||
// Enumeration<String > K = nodeStyleParentParagraphProperties.getAttributs().keys();
|
||||
// while(K.hasMoreElements()){
|
||||
// String Key = K.nextElement();
|
||||
// if(LesNodesStyleParagraph.getNomElt().equals("style:paragraph-properties")) {
|
||||
// if(LesNodesStyleParagraph.getAttributs().get(Key)==null) {
|
||||
// LesNodesStyleParagraph.getAttributs().put(Key, nodeStyleParentParagraphProperties.getAttributs().get(Key));
|
||||
// }
|
||||
// }else {
|
||||
// node n = new node();
|
||||
// n.setNomElt("style:paragraph-properties");
|
||||
// n.setAttributs(nodeStyleParentParagraphProperties.getAttributs());
|
||||
// nodStyle.getNodes().add(n);
|
||||
// break;
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// //le text properties
|
||||
// node nodeStyleParDefautTextProperties = parent.retourneFirstEnfantsByName("style:text-properties");
|
||||
// node LesNodesStyleText = nodStyle.retourneFirstEnfantsByName("style:text-properties");
|
||||
// K = nodeStyleParDefautTextProperties.getAttributs().keys();
|
||||
// while(K.hasMoreElements()){
|
||||
// String Key = K.nextElement();
|
||||
// if(LesNodesStyleText.getNomElt().equals("style:text-properties")) {
|
||||
// if(LesNodesStyleText.getAttributs().get(Key)==null) {
|
||||
// LesNodesStyleText.getAttributs().put(Key, nodeStyleParDefautTextProperties.getAttributs().get(Key));
|
||||
// }
|
||||
// }else {
|
||||
// node n = new node();
|
||||
// n.setNomElt("style:text-properties");
|
||||
// n.setAttributs(nodeStyleParDefautTextProperties.getAttributs());
|
||||
// nodStyle.getNodes().add(n);
|
||||
// break;
|
||||
// }
|
||||
// }
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -2772,7 +2776,59 @@ public class meptl {
|
|||
|
||||
|
||||
|
||||
|
||||
//Ajout les informations du style parent
|
||||
private static void addStyleParent(node parent, node nodStyle, node ensembleDesParagraphes) {
|
||||
|
||||
|
||||
if(parent.getAttributs().get("style:parent-style-name")!=null) {
|
||||
String nameStyleParent = nodStyle.getAttributs().get("style:parent-style-name");
|
||||
if(ensembleDesParagraphes.retourneFirstNodeByNameAndAttributValueExactStrict("style:style", "style:name", nameStyleParent)!=null) {
|
||||
node parent2 = ensembleDesParagraphes.retourneFirstNodeByNameAndAttributValueExactStrict("style:style", "style:name", nameStyleParent);
|
||||
if(parent!=null) addStyleParent(parent2, parent, ensembleDesParagraphes);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
//le paragraph properties
|
||||
node nodeStyleParentParagraphProperties = parent.retourneFirstEnfantsByName("style:paragraph-properties");
|
||||
node LesNodesStyleParagraph = nodStyle.retourneFirstEnfantsByName("style:paragraph-properties");
|
||||
Enumeration<String > K = nodeStyleParentParagraphProperties.getAttributs().keys();
|
||||
while(K.hasMoreElements()){
|
||||
String Key = K.nextElement();
|
||||
if(LesNodesStyleParagraph.getNomElt().equals("style:paragraph-properties")) {
|
||||
if(LesNodesStyleParagraph.getAttributs().get(Key)==null) {
|
||||
LesNodesStyleParagraph.getAttributs().put(Key, nodeStyleParentParagraphProperties.getAttributs().get(Key));
|
||||
}
|
||||
}else {
|
||||
node n = new node();
|
||||
n.setNomElt("style:paragraph-properties");
|
||||
n.setAttributs(nodeStyleParentParagraphProperties.getAttributs());
|
||||
nodStyle.getNodes().add(n);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
//le text properties
|
||||
node nodeStyleParDefautTextProperties = parent.retourneFirstEnfantsByName("style:text-properties");
|
||||
node LesNodesStyleText = nodStyle.retourneFirstEnfantsByName("style:text-properties");
|
||||
K = nodeStyleParDefautTextProperties.getAttributs().keys();
|
||||
while(K.hasMoreElements()){
|
||||
String Key = K.nextElement();
|
||||
if(LesNodesStyleText.getNomElt().equals("style:text-properties")) {
|
||||
if(LesNodesStyleText.getAttributs().get(Key)==null) {
|
||||
LesNodesStyleText.getAttributs().put(Key, nodeStyleParDefautTextProperties.getAttributs().get(Key));
|
||||
}
|
||||
}else {
|
||||
node n = new node();
|
||||
n.setNomElt("style:text-properties");
|
||||
n.setAttributs(nodeStyleParDefautTextProperties.getAttributs());
|
||||
nodStyle.getNodes().add(n);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -78,9 +78,9 @@ public class rechercherUnNodeStudent {
|
|||
|
||||
|
||||
|
||||
//*************************************************************************************
|
||||
//** Recherche les nodes text:p, text:h, text:span, text:list par le contenu textuel **
|
||||
//*************************************************************************************
|
||||
//************************************************************************************************
|
||||
//** Recherche les nodes text:p, text:h, text:span, text:list, text:note par le contenu textuel **
|
||||
//************************************************************************************************
|
||||
if(nodSujet.getNomElt().contains("text:")) {
|
||||
nodStudent = findNodeByContenuTextuel(nameNode, nodSujet, nod0Student, nod1Student, nod2Student, a);
|
||||
if(nameNode.equals("text:line-break")) return nodStudent;
|
||||
|
|
@ -243,7 +243,7 @@ public class rechercherUnNodeStudent {
|
|||
if(nodSujet.retourneLesContenusEnfants("").length()<1) return null;
|
||||
String valueAttribut = evaluation.withoutCodeAndPointPourRechercheContenuExact(nodSujet.retourneLesContenusEnfants(""));
|
||||
|
||||
Pattern p = Pattern.compile("^text:p|^text:h|^text:span|^text:list|^text:line-break"); //le node qui peuvent rechercher par le contenu textuel
|
||||
Pattern p = Pattern.compile("^text:p$|^text:h$|^text:span$|^text:list|^text:line-break$|^text:note$"); //le node qui peuvent rechercher par le contenu textuel
|
||||
Matcher m = p.matcher(nameNode);
|
||||
if(m.find()) {
|
||||
|
||||
|
|
|
|||
|
|
@ -991,7 +991,20 @@ public class evaluationAttribut {
|
|||
private static node evaluationNameCreator(node retour, node nodStudent, String nameCreator, String point, String nameElt) {
|
||||
node item = null;
|
||||
if(nodStudent!=null) {
|
||||
item = retourneNoteAvecResultatsAnalyse(nameCreator,"name", nodStudent.getAttributs().get("creator"),nameCreator + "↑‽" +point, nameElt );
|
||||
String reponseSujet = nameCreator;
|
||||
String reponseStudent = nodStudent.getAttributs().get("creator");
|
||||
if(reponseStudent!=null) if(!reponseStudent.isEmpty()) {
|
||||
reponseStudent = reponseStudent.replace(".odt", "");
|
||||
reponseStudent = reponseStudent.toLowerCase();
|
||||
}
|
||||
nameCreator = nameCreator.toLowerCase();
|
||||
if(reponseStudent.contains(nameCreator)) {
|
||||
reponseStudent = "auteur créateur "+ nameCreator + " identifié dans le nom du fichier.";
|
||||
reponseSujet = "auteur créateur "+ nameCreator + " identifié dans le nom du fichier.";
|
||||
}else {
|
||||
reponseStudent = "auteur créateur "+ nameCreator + " n'est pas identifié dans le nom du fichier.";
|
||||
}
|
||||
item = retourneNoteAvecResultatsAnalyse(nameCreator,"name", reponseStudent,reponseSujet+ "‽" +point, nameElt );
|
||||
}else {
|
||||
evaluation.IncrementPointTotal(Integer.valueOf(point));
|
||||
item = new node(nameCreator, "Erreur", "Nom du l'éditeur" , "null", nameCreator, 2, evaluation.getPointEnJeu(),nameElt);
|
||||
|
|
|
|||
|
|
@ -90,6 +90,8 @@ import fenetres.create_act.actsautfalse;
|
|||
import fenetres.create_act.actsautmultiplefalse;
|
||||
import fenetres.create_act.actsautmultipletrue;
|
||||
import fenetres.create_act.actsauttrue;
|
||||
import fenetres.create_act.addTitreToutesLesPagesFalse;
|
||||
import fenetres.create_act.addTitreToutesLesPagesTrue;
|
||||
import fenetres.create_act.mnEvaluerATraversAnalyseStyleFalse;
|
||||
import fenetres.create_act.mnEvaluerATraversAnalyseStyleTrue;
|
||||
import list.listeDesNodesAllContent;
|
||||
|
|
@ -130,6 +132,12 @@ public class createPopupMenu extends JPopupMenu {
|
|||
mnPopupTree.add(new actCoefficient());
|
||||
mnPopupTree.addSeparator();
|
||||
mnPopupTree.add(mnNiveau1());
|
||||
if(nod.getNomElt().equals("structurepage")) {
|
||||
mnPopupTree.addSeparator();
|
||||
mnPopupTree.add(mnaddTitreToutesLesPages());
|
||||
mnPopupTree.addSeparator();
|
||||
mnPopupTree.add(mnGroupeMethodeEvaluerMultiple(nod));
|
||||
}
|
||||
}
|
||||
|
||||
//********************************************
|
||||
|
|
@ -193,7 +201,17 @@ public class createPopupMenu extends JPopupMenu {
|
|||
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Menu permettant ajouter des titre1 à toutes les pages.</br>
|
||||
* @return
|
||||
*/
|
||||
private JMenu mnaddTitreToutesLesPages() {
|
||||
JMenu mnaddTitreToutesLesPages = new JMenu("Ajoute un titre à toutes les pages");
|
||||
mnaddTitreToutesLesPages.setIcon( new ImageIcon(create.class.getResource("/resources/ajoutetitretouteslespagesmini.png")));
|
||||
mnaddTitreToutesLesPages.add(new addTitreToutesLesPagesTrue());
|
||||
mnaddTitreToutesLesPages.add(new addTitreToutesLesPagesFalse());
|
||||
return mnaddTitreToutesLesPages;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -868,6 +886,14 @@ public class createPopupMenu extends JPopupMenu {
|
|||
//Image pour evaluer les nodes enfants
|
||||
mnGroupeMethodeEvaluerMultiple.setIcon( new ImageIcon(create.class.getResource("/resources/evaluatemultiplemini.png")));
|
||||
|
||||
if(nod.getNomElt().equals("structurepage")) {
|
||||
mnGroupeMethodeEvaluerMultiple.addSeparator();
|
||||
mnGroupeMethodeEvaluerMultiple.add(new actAllContentChilds());
|
||||
mnGroupeMethodeEvaluerMultiple.add(mnEvalNamePage());
|
||||
mnGroupeMethodeEvaluerMultiple.addSeparator();
|
||||
}
|
||||
|
||||
|
||||
if(listeDesNodesAllContent.isAllContent(nod) ) {
|
||||
if(listeDesNodesPourEvaluerPage.isPage(nod)) {
|
||||
mnGroupeMethodeEvaluerMultiple.addSeparator();
|
||||
|
|
|
|||
|
|
@ -23,7 +23,12 @@ public class actEvalNamePageNon extends AbstractAction{
|
|||
@Override
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
node nod = (node) fenetres.create.getSelectNode().getUserObject();
|
||||
nod.supprimeAttribut("evalNamePage");
|
||||
if(nod.getNomElt().equals("page")) nod.getAttributs().remove("evalNamePage");
|
||||
if(nod.getNomElt().equals("structurepage")) {
|
||||
for(int i = 0 ; i < nod.getNodes().size();i++) {
|
||||
nod.getNodes().get(i).getAttributs().remove("evalNamePage");
|
||||
}
|
||||
}
|
||||
fenetres.create.getTextNodeSelect().refreshAffichage(nod);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -33,21 +33,45 @@ public class actEvalNamePageOui extends AbstractAction{
|
|||
String a = JOptionPane.showInputDialog(null,"Quel est le nombre de point?",point);
|
||||
|
||||
if(!a.isEmpty()) {
|
||||
|
||||
try {
|
||||
point = Integer.valueOf(a);
|
||||
if(point<=0) {
|
||||
nod.getAttributs().put("evalNamePage", String.valueOf(0));
|
||||
if(nod.getNomElt().equals("page")) {
|
||||
nod.getAttributs().put("evalNamePage", String.valueOf(0));
|
||||
}
|
||||
if(nod.getNomElt().equals("structurepage")) {
|
||||
ajouteAToutesLesPages(nod,"0");
|
||||
}
|
||||
|
||||
fenetres.create.getTextNodeSelect().setText(baliseStyle.balise());
|
||||
fenetres.create.getTextNodeSelect().setText("<h2>Erreur la valeur doit être un nombre entier POSITIF supérieur à zéro.<br>Cependant,la valeur a été modifiée.<br>evalNamePage=0.</h2>");
|
||||
}else {
|
||||
nod.getAttributs().put("evalNamePage", String.valueOf(point));
|
||||
if(nod.getNomElt().equals("page")) {
|
||||
nod.getAttributs().put("evalNamePage", String.valueOf(point));
|
||||
}
|
||||
if(nod.getNomElt().equals("structurepage")) {
|
||||
ajouteAToutesLesPages(nod,String.valueOf(point));
|
||||
}
|
||||
}
|
||||
} catch (Exception e2) {
|
||||
fenetres.create.getTextNodeSelect().setText(baliseStyle.balise());
|
||||
fenetres.create.getTextNodeSelect().setText("<h2>Erreur la valeur doit être un nombre entier.<br>L'attribut n'a pas été modifiée.</h2>");
|
||||
}
|
||||
|
||||
}
|
||||
fenetres.create.getTextNodeSelect().refreshAffichage(nod);
|
||||
}
|
||||
|
||||
|
||||
private void ajouteAToutesLesPages(node nod,String point) {
|
||||
for(int i=0; i < nod.getNodes().size();i++) {
|
||||
nod.getNodes().get(i).getAttributs().put("evalNamePage", point);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,40 @@
|
|||
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 addTitreToutesLesPagesFalse extends AbstractAction{
|
||||
{
|
||||
putValue( Action.NAME, "Supprime tous les titres des pages" );
|
||||
putValue( Action.SHORT_DESCRIPTION, "Supprime tous les titres des pages." );
|
||||
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();
|
||||
|
||||
if(nod.getNomElt().equals("structurepage")) {
|
||||
for(int i = 0 ; i< nod.getNodes().size();i++) {
|
||||
nod.getNodes().get(i).getAttributs().remove("titre");
|
||||
nod.getNodes().get(i).getAttributs().remove("titre2");
|
||||
nod.getNodes().get(i).getAttributs().remove("titre3");
|
||||
nod.getNodes().get(i).getAttributs().remove("titre1");
|
||||
}
|
||||
}
|
||||
fenetres.create.getTextNodeSelect().refreshAffichage(nod);
|
||||
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,39 @@
|
|||
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 addTitreToutesLesPagesTrue extends AbstractAction{
|
||||
{
|
||||
putValue( Action.NAME, "true" );
|
||||
putValue( Action.SHORT_DESCRIPTION, "Ajoute un titre 1 à toutes les pages.");
|
||||
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();
|
||||
|
||||
if(nod.getNomElt().equals("structurepage")) {
|
||||
for(int i = 0 ; i< nod.getNodes().size();i++) {
|
||||
nod.getNodes().get(i).getAttributs().remove("titre");
|
||||
nod.getNodes().get(i).getAttributs().remove("titre2");
|
||||
nod.getNodes().get(i).getAttributs().remove("titre3");
|
||||
nod.getNodes().get(i).getAttributs().put("titre1", "page" + String.valueOf(i+1));
|
||||
}
|
||||
}
|
||||
fenetres.create.getTextNodeSelect().refreshAffichage(nod);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -62,28 +62,28 @@ public class evaluate extends JFrame {
|
|||
*/
|
||||
private JToolBar toolBar;
|
||||
private JPanel contentPane;
|
||||
private JLabel lblPath;
|
||||
private JLabel lblFileAnalyse;
|
||||
private JLabel lblFichierCSV;
|
||||
private JLabel lblFichierSVG;
|
||||
private JLabel lblChargementFichierCSV;
|
||||
private JLabel lblImageDossierEtudiant;
|
||||
private JLabel lblNoFeedBack;
|
||||
private JLabel lblNoDeatail;
|
||||
private JLabel lblnonote;
|
||||
private JLabel lblnozip;
|
||||
private JLabel lblVerifHistorique;
|
||||
private JLabel lblnologo;
|
||||
private JLabel lblCsvNote;
|
||||
private JCheckBox chckbxfichiersEtudiants;
|
||||
private JCheckBox chckbxZipfeedback;
|
||||
private JCheckBox chckbxnoFeedback;
|
||||
private JCheckBox chckbxNoNote;
|
||||
private JCheckBox chckCSVNotes;
|
||||
private JCheckBox chckbxNoLogo;
|
||||
private JCheckBox chckbxVerif;
|
||||
private JCheckBox chckbxNewLogo;
|
||||
private JCheckBox chckbxNoDetail;
|
||||
private static JLabel lblPath;
|
||||
private static JLabel lblFileAnalyse;
|
||||
private static JLabel lblFichierCSV;
|
||||
private static JLabel lblFichierSVG;
|
||||
private static JLabel lblChargementFichierCSV;
|
||||
private static JLabel lblImageDossierEtudiant;
|
||||
private static JLabel lblNoFeedBack;
|
||||
private static JLabel lblNoDeatail;
|
||||
private static JLabel lblnonote;
|
||||
private static JLabel lblnozip;
|
||||
private static JLabel lblVerifHistorique;
|
||||
private static JLabel lblnologo;
|
||||
private static JLabel lblCsvNote;
|
||||
private static JCheckBox chckbxfichiersEtudiants;
|
||||
private static JCheckBox chckbxZipfeedback;
|
||||
private static JCheckBox chckbxnoFeedback;
|
||||
private static JCheckBox chckbxNoNote;
|
||||
private static JCheckBox chckCSVNotes;
|
||||
private static JCheckBox chckbxNoLogo;
|
||||
private static JCheckBox chckbxVerif;
|
||||
private static JCheckBox chckbxNewLogo;
|
||||
private static JCheckBox chckbxNoDetail;
|
||||
private static afficheText txtpnmessages;
|
||||
|
||||
private static evaluate instance;
|
||||
|
|
@ -391,7 +391,8 @@ public class evaluate extends JFrame {
|
|||
}
|
||||
|
||||
if(commandes.fichierAnalyseValide) {
|
||||
txtpnmessages.afficheChargementFichierAnalyse();
|
||||
// txtpnmessages.afficheChargementFichierAnalyse();
|
||||
refreshLabel();
|
||||
}else {
|
||||
txtpnmessages.setText(baliseStyle.balise() + "<hr class=\"city\"><h1>*** Veuillez charger un fichier d'analyse ***</h1><hr>");
|
||||
}
|
||||
|
|
@ -587,7 +588,7 @@ public class evaluate extends JFrame {
|
|||
* Raffraichissement des informationss.</br>
|
||||
* Activation des chckBoxs.</br>
|
||||
*/
|
||||
private void refreshLabel() {
|
||||
private static void refreshLabel() {
|
||||
if(!commandes.fichierAnalyseValide) {
|
||||
System.out.println( "Erreur du fichier d'analyse" );
|
||||
if(!MEPTL.verificationFichierAnalyse.messageErreur.toString().isEmpty()) {
|
||||
|
|
|
|||
|
|
@ -33,6 +33,7 @@ public class listeAttributsAnalyseWriter {
|
|||
case "numero": return true;
|
||||
case "numeroabsolue": return true;
|
||||
case "isDoublon": return true;
|
||||
case "addTitreToutesLesPages":return true;
|
||||
|
||||
case "EvaluerATraversAnalyseStyle": return true;
|
||||
case "evalNameCreator": return true;
|
||||
|
|
@ -56,6 +57,7 @@ public class listeAttributsAnalyseWriter {
|
|||
case "evalFormatageDirect": return true;
|
||||
case "evalSautPageColonne": return true;
|
||||
case "evalPasParagrapheVide": return true;
|
||||
case "evalAUnStyleParent":return true; // A faire
|
||||
|
||||
case "analysis_filename": return true;
|
||||
case "auteur": return true;
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ public class listeDesNodesAncrable {
|
|||
*/
|
||||
public static Boolean isAncrable(node nod) {
|
||||
|
||||
//Les enfants du node structurepage uniquement
|
||||
if(nod.retourneNodeStructurePage()==null) return false;
|
||||
|
||||
|
||||
|
|
@ -23,6 +24,7 @@ public class listeDesNodesAncrable {
|
|||
case "text:list": return true;
|
||||
case "text:title": return true;
|
||||
case "text:span": return true;
|
||||
case "text:note" : return true;
|
||||
case "text:list-item": return true;
|
||||
case "text:subject": return true;
|
||||
case "text:initial-creator": return true;
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ public static boolean isContientEnfant(node nod) {
|
|||
case "text:h": return true;
|
||||
case "text:list": return true;
|
||||
case "text:list-item": return true;
|
||||
case "text:note":return true;
|
||||
|
||||
default:
|
||||
return false;
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 1.7 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 819 B |
Loading…
Reference in New Issue