MAJ V4.4.0 Correction BUG

This commit is contained in:
pablo rodriguez 2022-12-13 15:32:28 +01:00
parent f22f63fb2a
commit 64faf9682c
46 changed files with 493 additions and 27 deletions

View File

@ -12,6 +12,6 @@
<classpathentry kind="lib" path="C:/Users/pabr6/git/analyseWriter/MEPTL/miglayout15-swing.jar"/>
<classpathentry kind="lib" path="jgoodies-forms-1.8.0.jar" sourcepath="jgoodies-forms-1.8.0-sources.jar"/>
<classpathentry kind="lib" path="C:/Users/pabr6/eclipse-workspace/Exportation documentation analyseWriter/plugins/documentation.analyseWriter_1.0.0.202212032022.jar"/>
<classpathentry kind="lib" path="C:/Users/pabr6/eclipse-workspace/cXML.jar" sourcepath="/cXML"/>
<classpathentry kind="lib" path="C:/Users/pabr6/eclipse-workspace/cXML.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>

Binary file not shown.

Binary file not shown.

5
bin/.gitignore vendored
View File

@ -1,6 +1,3 @@
/MEPTL/
/calcul/
/evaluer/
/fenetres/
/list/
/resources/
/evaluer/

Binary file not shown.

Binary file not shown.

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 204 KiB

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.3 KiB

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.

BIN
bin/heritagestyle.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

105
bin/heritagestyle.svg Normal file
View File

@ -0,0 +1,105 @@
<?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"
xml:space="preserve"
inkscape:export-filename="heritagestylemini.png"
inkscape:export-xdpi="51.200001"
inkscape:export-ydpi="51.200001"
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
sodipodi:docname="heritagestyle.svg"
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"
showguides="false"
inkscape:zoom="11.688363"
inkscape:cx="25.623777"
inkscape:cy="15.656598"
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="g729"
transform="translate(0,-0.17635092)"><g
id="g554"
transform="matrix(1.0257124,0,0,1.0257124,-0.55277824,1.1385828)"
style="stroke-width:0.974932"><path
style="fill:#ff0000;stroke:none;stroke-width:0.25795px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 1.7338794,0.7572401 1.7635307,1.6761206 6.4116944,0.345867 11.014585,1.6292556 10.997372,0.7475138 6.4257241,-0.61781387 Z"
id="path385"
sodipodi:nodetypes="ccccccc" /><path
id="path483"
style="fill:#ff0000;stroke:none;stroke-width:0.25795px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 6.4259644,0.6109905 2.9471069,1.6305666 H 4.4142008 L 6.411495,1.0590252 8.4620158,1.6305666 h 1.3776937 z" /><rect
style="fill:#ff0000;stroke:none;stroke-width:0.243733;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
id="rect540"
width="9.3300438"
height="0.74125445"
x="1.7069396"
y="1.8345761"
ry="0" /><rect
style="fill:#ff0000;stroke:none;stroke-width:0.243733;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
id="rect542"
width="9.3962507"
height="0.52056414"
x="1.7861673"
y="8.1492062"
ry="0" /><rect
style="fill:#ff0000;stroke:none;stroke-width:0.243733;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
id="rect544"
width="10.414891"
height="0.52056414"
x="1.1183913"
y="8.8735733"
ry="0" /><rect
style="fill:#ff0000;stroke:none;stroke-width:0.243733;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
id="rect546"
width="11.444851"
height="0.7853924"
x="0.62038881"
y="9.5639858"
ry="0" /></g><text
xml:space="preserve"
style="font-size:7.04934px;line-height:1.2;font-family:arial;-inkscape-font-specification:arial;fill:#0000ff;stroke-width:0.264584"
x="3.4197686"
y="9.1438246"
id="text610"><tspan
sodipodi:role="line"
id="tspan608"
style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-family:arial;-inkscape-font-specification:'arial Heavy';fill:#0000ff;stroke-width:0.264584"
x="3.4197686"
y="9.1438246">S</tspan></text><rect
style="fill:#ff0000;stroke:none;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
id="rect714"
width="0.76964015"
height="5.3422079"
x="1.8788275"
y="3.9699109" /><rect
style="fill:#ff0000;stroke:none;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
id="rect716"
width="0.76964015"
height="5.3422079"
x="9.3941374"
y="3.9925473" /></g></g></svg>

After

Width:  |  Height:  |  Size: 4.5 KiB

BIN
bin/heritagestylemini.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 719 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

View File

@ -0,0 +1,127 @@
<?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"
xml:space="preserve"
inkscape:export-filename="heritagestyletouslesnodes.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96"
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
sodipodi:docname="heritagestyletouslesnodes.svg"
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"
showguides="false"
inkscape:zoom="11.688363"
inkscape:cx="14.501603"
inkscape:cy="15.656598"
inkscape:window-width="1920"
inkscape:window-height="1009"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="g729" /><defs
id="defs2" /><g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"><g
id="g729"
transform="translate(0,-0.17635092)"><text
xml:space="preserve"
style="font-size:7.04934px;line-height:1.2;font-family:arial;-inkscape-font-specification:arial;fill:#00d4aa;stroke-width:0.264584"
x="2.3105812"
y="9.166461"
id="text305"><tspan
sodipodi:role="line"
id="tspan303"
style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-family:arial;-inkscape-font-specification:'arial Heavy';fill:#00d4aa;stroke-width:0.264584"
x="2.3105812"
y="9.166461">S</tspan></text><g
id="g554"
transform="matrix(1.0257124,0,0,1.0257124,-0.55277824,1.1385828)"
style="stroke-width:0.974932"><path
style="fill:#ff0000;stroke:none;stroke-width:0.25795px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 1.7338794,0.7572401 1.7635307,1.6761206 6.4116944,0.345867 11.014585,1.6292556 10.997372,0.7475138 6.4257241,-0.61781387 Z"
id="path385"
sodipodi:nodetypes="ccccccc" /><path
id="path483"
style="fill:#ff0000;stroke:none;stroke-width:0.25795px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 6.4259644,0.6109905 2.9471069,1.6305666 H 4.4142008 L 6.411495,1.0590252 8.4620158,1.6305666 h 1.3776937 z" /><rect
style="fill:#ff0000;stroke:none;stroke-width:0.243733;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
id="rect540"
width="9.3300438"
height="0.74125445"
x="1.7069396"
y="1.8345761"
ry="0" /><rect
style="fill:#ff0000;stroke:none;stroke-width:0.243733;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
id="rect542"
width="9.3962507"
height="0.52056414"
x="1.7861673"
y="8.1492062"
ry="0" /><rect
style="fill:#ff0000;stroke:none;stroke-width:0.243733;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
id="rect544"
width="10.414891"
height="0.52056414"
x="1.1183913"
y="8.8735733"
ry="0" /><rect
style="fill:#ff0000;stroke:none;stroke-width:0.243733;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
id="rect546"
width="11.444851"
height="0.7853924"
x="0.62038881"
y="9.5639858"
ry="0" /></g><text
xml:space="preserve"
style="font-size:7.63818px;line-height:1.2;font-family:arial;-inkscape-font-specification:arial;fill:#0000ff;stroke-width:0.264584"
x="3.4034598"
y="9.456274"
id="text610"
transform="scale(1.0050518,0.99497361)"><tspan
sodipodi:role="line"
id="tspan608"
style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-family:arial;-inkscape-font-specification:'arial Heavy';fill:#0000ff;stroke-width:0.264584"
x="3.4034598"
y="9.456274">S</tspan></text><rect
style="fill:#ff0000;stroke:none;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
id="rect714"
width="0.76964015"
height="5.3422079"
x="1.8788275"
y="3.9699109" /><rect
style="fill:#ff0000;stroke:none;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
id="rect716"
width="0.76964015"
height="5.3422079"
x="9.3941374"
y="3.9925473" /><text
xml:space="preserve"
style="font-size:9.20417px;line-height:1.2;font-family:arial;-inkscape-font-specification:arial;fill:#000080;stroke-width:0.264584"
x="4.7968283"
y="10.175141"
id="text301"
transform="scale(1.0082574,0.99181025)"><tspan
sodipodi:role="line"
id="tspan299"
style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-family:arial;-inkscape-font-specification:'arial Heavy';fill:#000080;stroke-width:0.264584"
x="4.7968283"
y="10.175141">S</tspan></text></g></g></svg>

After

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
bin/lesnodesevaluermaxi.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 719 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

View File

@ -116,7 +116,12 @@ public class HTML {
//Saut pour les marques nodes
public static String SautP11(String titre) {
return "<br><p class=\"p11\"><b><u>" + titre+"</u></b> ** supprimer la méthode marquage des nodes avant de fournir le feedback aux étudiants ** </p>\r";
return "<br><div id=\"grad1\"><p class=\"p11\"><b><u>" + titre+"</u></b> ** supprimer la méthode marquage des nodes avant de fournir le feedback aux étudiants ** </p></div>\r";
}
//Saut pour les informatons nodes
public static String SautP11bis(String titre) {
return "<br><div id=\"grad2\"><p>" + titre+"</p></div>\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);}"

View File

@ -1193,9 +1193,11 @@ public class meptl {
nod.getNodes().get(i).setParent(nod);
// nod = attributLesParentsAuxNodes(nod.getNodes().get(i));
for(int j = 0 ; j<nod.getNodes().get(i).getNodes().size();j++) {
node A = nod.getNodes().get(i).getNodes().get(j);
A.setParent(nod.getNodes().get(i));
A = PlaceLePere(A);
if(nod.getNodes().get(i).getNodes().get(j)!=null) {
node A = nod.getNodes().get(i).getNodes().get(j);
A.setParent(nod.getNodes().get(i));
A = PlaceLePere(A);
}
}
}
return nod;
@ -1208,9 +1210,11 @@ public class meptl {
*/
private static node PlaceLePere(node nod) {
for(int i = 0 ; i<nod.getNodes().size();i++) {
node B = nod.getNodes().get(i);
B.setParent(nod);
B = PlaceLePere(B);
if(nod.getNodes().get(i)!=null) {
node B = nod.getNodes().get(i);
B.setParent(nod);
B = PlaceLePere(B);
}
}
return nod;
}

View File

@ -218,15 +218,17 @@ public class evaluationAttribut {
String nameLegacyStyleStudent="";
if(nodeStudent!=null) {
nameLegacyStyleStudent = nodeStudent.getAttributs().get("text:style-name");
Matcher m = p.matcher(nameLegacyStyleStudent);
if(m.find()) {
if(nodeStudent.getAttributs().get("text:style-name")!=null) {
String nameStyle1 = nodeStudent.getAttributs().get("text:style-name");
node fichier = nodeStudent.racineDuNode();
node styleParagraphs = fichier.retourneFirstEnfantsByName("style:paragraph").retourneFirstNodeByNameAndAttributValueExactStrict("style:style", "style:name", nameStyle1);
if(styleParagraphs!=null) {
if(styleParagraphs.getAttributs().get("style:parent-style-name")!=null) {
nameLegacyStyleStudent = styleParagraphs.getAttributs().get("style:parent-style-name");
if(nameLegacyStyleStudent!=null) {
Matcher m = p.matcher(nameLegacyStyleStudent);
if(m.find()) {
if(nodeStudent.getAttributs().get("text:style-name")!=null) {
String nameStyle1 = nodeStudent.getAttributs().get("text:style-name");
node fichier = nodeStudent.racineDuNode();
node styleParagraphs = fichier.retourneFirstEnfantsByName("style:paragraph").retourneFirstNodeByNameAndAttributValueExactStrict("style:style", "style:name", nameStyle1);
if(styleParagraphs!=null) {
if(styleParagraphs.getAttributs().get("style:parent-style-name")!=null) {
nameLegacyStyleStudent = styleParagraphs.getAttributs().get("style:parent-style-name");
}
}
}
}

View File

@ -5,6 +5,7 @@ import java.awt.event.ActionEvent;
import javax.swing.AbstractAction;
import javax.swing.Action;
import javax.swing.ImageIcon;
import javax.swing.JOptionPane;
import cXML.node;
import fenetres.create;
@ -23,9 +24,13 @@ public class actsautmultiplefalse extends AbstractAction{
@Override
public void actionPerformed(ActionEvent e) {
node nod = (node) fenetres.create.getSelectNode().getUserObject();
boolean informations = false;
if(JOptionPane.showConfirmDialog(null,"Voulez-vous retirer les informations sur le node (nature du node)?", "Information", JOptionPane.YES_NO_OPTION,JOptionPane.QUESTION_MESSAGE)==JOptionPane.YES_OPTION) {
informations=true;
}
for(int i = 0 ; i < nod.getNodes().size();i++) {
nod.getNodes().get(i).getAttributs().put("saut", "false");
nod.getNodes().get(i).getAttributs().remove("titre3");
if(informations)nod.getNodes().get(i).getAttributs().remove("information");
}
fenetres.create.getTextNodeSelect().refreshAffichage(nod);
}

View File

@ -5,6 +5,7 @@ import java.awt.event.ActionEvent;
import javax.swing.AbstractAction;
import javax.swing.Action;
import javax.swing.ImageIcon;
import javax.swing.JOptionPane;
import cXML.node;
import fenetres.create;
@ -23,9 +24,13 @@ public class actsautmultipletrue extends AbstractAction{
@Override
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) {
informations=true;
}
for(int i = 0 ; i < nod.getNodes().size();i++) {
nod.getNodes().get(i).getAttributs().put("saut", "true");
nod.getNodes().get(i).getAttributs().put("titre3", "** node **");
if(informations) nod.getNodes().get(i).getAttributs().put("information", nod.getNodes().get(i).retourneLesContenusEnfants(""));
}
fenetres.create.getTextNodeSelect().refreshAffichage(nod);
}

View File

@ -540,13 +540,15 @@ public class evaluate extends JFrame {
/**
* Raffraichi les informations.</br>
* Raffraichissement des informationss.</br>
* Activation des chckBoxs.</br>
*/
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);

View File

@ -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);
}
}