MAJ V4.5.0

This commit is contained in:
pablo rodriguez 2024-05-16 18:58:03 +02:00
parent 4296ab1268
commit c8e7d974c3
13 changed files with 198 additions and 129 deletions

107
bin/.gitignore vendored
View File

@ -6,112 +6,8 @@
/calcul/
/evaluer/
/fenetres/
/lesnodesevaluermini.png
/list/
/loadpreference.svg
/loadpreferencemini.png
/loadpreferences.png
/logo analyseWriter accueill.svg
/logo.png
/logo.svg
/marquenode.png
/marquenode.svg
/marquenodemini.png
/menuEvalTousParagraphe.png
/menuEvalTousParagraphe.svg
/menuEvalTousParagraphemini.png
/menucontextuel/
/menulegacystyleparentpresent.png
/menulegacystyleparentpresentmini.png
/meta.png
/meta.svg
/new.png
/newlogo.png
/newlogo.svg
/newlogomini.png
/nocsvstudent.png
/nocsvstudentmini.png
/nodeFichier.png
/nodeFichier_FichierAnalyse.svg
/nodeFichiermax.png
/nodeFichiermini.png
/nodetail.png
/nodetail.svg
/nodetailfeedback.png
/nodetailfeedbackmini.png
/nodetailmini.png
/nofeedback.png
/nofeedbackmini.png
/nofeedbackstudent.png
/nofeedbackstudent.svg
/nofeedbackstudentmini.png
/nologo.png
/nonewlogo.png
/nonewlogomini.png
/nonotestudent.png
/nonotestudentl.svg
/nonotestudentmini.png
/notestudent.png
/notestudentmini.png
/noverifhistoriquestudent.png
/noverifhistoriquestudentmini.png
/nozipstudent.png
/nozipstudentmini.png
/numerotationchapitre.png
/numerotationchapitre.svg
/objet.png
/objet.svg
/odreparagraphe.png
/odreparagraphemini.png
/open.png
/open.svg
/open2.png
/openmax.png
/openmini.png
/ordreparagraphe.png
/ordreparagraphe.svg
/ordreparagraphemini.png
/ou.png
/ouenviron.png
/ouenviron.svg
/ouenvironmini.png
/ouenvironsimilitude.png
/ouenvironsimilitude.svg
/ouenvironsimilitudemini.png
/oumini.png
/oustrict.png
/oustrict.svg
/oustrictmini.png
/oustrictseps.png
/oustrictseps.svg
/oustrictsepsmini.png
/paragraphe_source.svg
/paste.png
/piedpagenon.png
/piedpagenon.svg
/piedpagenonmini.png
/piedpageoui.png
/piedpageoui.svg
/piedpageouimini.png
/poids.svg
/poidsmini.png
/premierenfant.png
/premierenfant.svg
/premierenfantmini.png
/property.png
/property.svg
/quitteEvaluation.png
/quitteEvaluation.svg
/quitteEvaluationmini.png
/quitteListe.svg
/quitteliste.png
/quittelistemini.png
/recherche.png
/recherche.svg
/rechercheDoublon.png
/rechercheDoublon.svg
/rechercheDoublonmini.png
/rechercheancragepage.png
/rechercheancragepage.svg
/rechercheancragepagemini.png
/recherchecontenu.png
@ -251,6 +147,3 @@
/zipstudent.png
/zipstudent.svg
/zipstudentmini.png
/evalnombreparagraphe.png
/evalnombreparagraphe.svg
/evalnombreparagraphemini.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@ -0,0 +1,125 @@
<?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.3 (0e150ed6c4, 2023-07-21)"
sodipodi:docname="evalnombreparagraphe.svg"
inkscape:export-filename="evalnombreparagraphe.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96"
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="15.822222"
inkscape:cx="27.018961"
inkscape:cy="21.235955"
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">
<text
xml:space="preserve"
style="font-size:11.7061px;line-height:1.2;font-family:Symbol;-inkscape-font-specification:Symbol;stroke-width:0.264583;fill:#0000ff"
x="0.95308274"
y="8.9726267"
id="text265"
transform="scale(0.9988156,1.0011858)"><tspan
sodipodi:role="line"
id="tspan263"
style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-size:11.7061px;font-family:Arial;-inkscape-font-specification:'Arial Heavy';stroke-width:0.264583;fill:#0000ff"
x="0.95308274"
y="8.9726267">¶</tspan></text>
<g
id="g1"
transform="translate(-14.932979,0.36788975)">
<path
style="fill:none;stroke:#ff0000;stroke-width:0.8;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
d="M 1.0395499,0.83893503 10.924393,11.252672"
id="path479"
sodipodi:nodetypes="cc" />
<path
style="fill:none;stroke:#ff0000;stroke-width:0.8;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
d="M 10.924393,0.83893503 1.0395499,11.252672"
id="path1131"
sodipodi:nodetypes="cc" />
</g>
<g
id="g919"
transform="matrix(1.077757,0,0,1.1015764,4.5721538,7.6910246)"
style="fill:#0000ff;stroke:#000000;stroke-width:0.57493;stroke-opacity:1">
<rect
ry="0.56339979"
y="4.3255968"
x="0.92013353"
height="3.7594025"
width="3.8382711"
id="rect12"
style="fill:#de0000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.0373705;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
rx="0.5800662" />
<path
style="fill:#ffffff;stroke:#ffffff;stroke-width:0.324836;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 1.6159,5.0384659 3.9724208,7.4062084"
id="path841" />
<path
id="path843"
d="M 3.9724208,5.0384659 1.6159,7.4062084"
style="fill:none;stroke:#ffffff;stroke-width:0.324836;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
</g>
<g
id="g923-4"
transform="matrix(1.0781672,0,0,1.1004826,-0.1789203,12.234507)"
style="fill:#0000ff;stroke-width:0.553289">
<rect
style="fill:#00bf00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.0359638;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
id="rect10-6"
width="3.8382711"
height="3.7594025"
x="0.92013353"
y="0.34176376"
ry="0.56339979"
rx="0.5800662" />
<path
style="fill:#ffffff;stroke:none;stroke-width:0.146391px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 1.4619106,1.7500935 C 1.3627577,2.4034195 1.7869697,2.7038331 2.3820759,3.4752278 2.7236407,3.2105071 3.8437643,1.6082077 4.3539528,0.68451321 3.7444013,1.2569625 3.3467309,1.6796751 2.3752981,2.7432214 1.891109,2.378332 1.7782083,2.0571129 1.4619106,1.7500935 Z"
id="path16-3"
sodipodi:nodetypes="ccccc" />
</g>
<text
xml:space="preserve"
style="font-size:10.3848px;line-height:1.15;font-family:handwriting-draft_free-version;-inkscape-font-specification:handwriting-draft_free-version;fill:#ff0000;stroke:#000000;stroke-width:0.279597"
x="0.048285332"
y="10.841402"
id="text1"
transform="scale(0.97094439,1.0299251)"><tspan
sodipodi:role="line"
id="tspan1"
style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-family:Arial;-inkscape-font-specification:'Arial Heavy';fill:#ff0000;stroke:#000000;stroke-width:0.279597"
x="0.048285332"
y="10.841402">?</tspan></text>
</g>
</svg>

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 624 B

View File

@ -29,6 +29,7 @@ public class commandes {
//** Le node base de données des évaluations
public static node evaluationsBase = null;
public static node evaluationChargeEnMemoire = null;
public static int hashCodeEvaluationSave = 0;
//** Le node contenant les listes des étudiants
public static node listesEtudiants = null;

View File

@ -9,6 +9,7 @@ import javax.swing.ImageIcon;
import javax.swing.JOptionPane;
import javax.swing.KeyStroke;
import MEPTL.commandes;
import fenetres.baseDonneesEvaluations;
import fenetres.create;
import fenetres.evaluate;
@ -32,11 +33,20 @@ public class actExit extends AbstractAction {
@Override
public void actionPerformed(ActionEvent e) {
if(JOptionPane.showConfirmDialog(null,"Voulez-vous quitter analyseWriter?", "Quitter", JOptionPane.YES_NO_OPTION,JOptionPane.QUESTION_MESSAGE)==JOptionPane.YES_OPTION) {
baseDonneesEvaluations.ferme();
create.fermeCreate();
evaluate.ferme();
}
int H = commandes.evaluationChargeEnMemoire.hashCode();
if(H==commandes.hashCodeEvaluationSave){
if(JOptionPane.showConfirmDialog(null,"Voulez-vous quitter analyseWriter?", "Quitter", JOptionPane.YES_NO_OPTION,JOptionPane.QUESTION_MESSAGE)==JOptionPane.YES_OPTION) {
baseDonneesEvaluations.ferme();
create.fermeCreate();
evaluate.ferme();
}
}else{
if(JOptionPane.showConfirmDialog(null,"Vous avez apporté des modifications à cette évaluation.\nVoulez-vous quitter analyseWriter?", "Quitter", JOptionPane.YES_NO_OPTION,JOptionPane.QUESTION_MESSAGE)==JOptionPane.YES_OPTION) {
baseDonneesEvaluations.ferme();
create.fermeCreate();
evaluate.ferme();
}
}
}
}

View File

@ -71,6 +71,7 @@ public class chargeEvaluation {
//* Charge le node sujet provisoirement
commandes.evaluationChargeEnMemoire = evaluation;
commandes.hashCodeEvaluationSave = evaluation.hashCode();
commandes.NameEvaluationCharger= evaluation.getAttributs().get("name");
commandes.path = evaluation.getAttributs().get("path"); //Dossier des fichiers des étudiants

View File

@ -52,6 +52,7 @@ public class creerNouvelleEvaluation {
evaluation.getAttributs().put("dateModification", calcul.formatDateWriter.DateLibreOffice(aujourdhui));
evaluation.getNodes().add(commandes.sujet);
commandes.evaluationChargeEnMemoire = evaluation;
commandes.hashCodeEvaluationSave = evaluation.hashCode();
}else {
//Mise à jour
if(!importation) evaluation.getAttributs().put("dateModification", calcul.formatDateWriter.DateLibreOffice(aujourdhui));

View File

@ -54,7 +54,10 @@ public class recupeNodeBaseEvaluations {
evaluations = evaluations.allFirstNodesEvaluationFichierOnly(targetString.toString().replace("\t","").replace("\r", "").replace("\n", ""));
if(evaluations!=null) commandes.evaluationsBase = evaluations;
if(evaluations!=null) {
commandes.evaluationsBase = evaluations;
commandes.hashCodeEvaluationSave = evaluations.hashCode();
}
if(evaluations.getNodes().size()>0) HasEvaluation=true;
}catch (Exception e) {

View File

@ -474,9 +474,10 @@ public class afficheText extends JEditorPane {
StringBuilder text = new StringBuilder();
text.append(baliseStyle.balise());
text.append("<h1><u>INFORMATIONS</u></h1><p>Fichier d'analyse créé avec la version : " + v + "</p>"
+ "<p>Nom du fichier d'analyse : <b>"+ commandes.nameSujet + "</b></p>"
+ "<p> Nom de l'évaluation : <b>"+ commandes.NameEvaluationCharger + "</b></p><hr><br>");
text.append("<h1><u>INFORMATIONS</u>"
+ "</h1><p>Fichier d'analyse créé avec la version : " + v + "</p>"
+ "<p>Nom du fichier d'analyse : <b>"+ commandes.sujet.getAttributs().get("analysis_filename") + "</b></p>"
+ "<p> Nom de l'évaluation : <b><span class=\"red\">"+ commandes.NameEvaluationCharger + "</span></b></p><hr><br>");
text.append("<h3>Le titre de l'exercice est : <u>" + commandes.analyse_titre+"</u></h3>");
text.append("<p>Le sujet (metaSujet) est : <b>" + commandes.analyse_metaSujet+"</b></p>");
text.append("<p>L'auteur de l'exercice est : <b>" + commandes.analyse_auteur+"</b></p>");

View File

@ -21,6 +21,7 @@ public class baliseStyle {
+ ".city { background-color: transparent;color: #008B8B;padding: 10px;}"
+ ".rouge { background-color: #8B0000;color: white;padding: 10px;}"
+ "li.p2{color:green;font-family:\"Arial\";font-size: 15pt;margin-bottom: 0cm; margin-top: 0cm; line-height: 0%; background: transparent; margin-left: 0cm; white-space: pre;}"
+ ".red {color:#FF0505}"
+ "li.p4{color:#1122EE;font-family:\"Arial\";font-size: 15pt;margin-bottom: 0cm; margin-top: 0cm; line-height: 0%; background: transparent; margin-left: 0cm; white-space: pre;}"
+ "li.p3{color:red;font-family:\"Arial\";font-size: 14pt;margin-bottom: 0cm; margin-top: 0cm; line-height: 0%; background: transparent; margin-left: 0cm; white-space: pre;}"
+ "li.p5{color:#55BB11;font-family:\"Arial\";font-size: 16pt;margin-bottom: 0cm; margin-top: 0cm; line-height: 0%; background: transparent; margin-left: 0cm; white-space: pre;}"

View File

@ -622,16 +622,23 @@ public final class create extends JFrame {
addWindowListener(new java.awt.event.WindowAdapter() {
@Override
public void windowClosing(java.awt.event.WindowEvent windowEvent) {
if(JOptionPane.showConfirmDialog(null,"Voulez-vous quitter analyseWriter?", "Quitter", JOptionPane.YES_NO_OPTION,JOptionPane.QUESTION_MESSAGE)==JOptionPane.YES_OPTION) {
baseDonneesEvaluations.ferme();
evaluate.ferme();
fermeCreate();
};
int H = commandes.evaluationChargeEnMemoire.hashCode();
if(H==commandes.hashCodeEvaluationSave){
if(JOptionPane.showConfirmDialog(null,"Voulez-vous quitter analyseWriter?", "Quitter", JOptionPane.YES_NO_OPTION,JOptionPane.QUESTION_MESSAGE)==JOptionPane.YES_OPTION) {
baseDonneesEvaluations.ferme();
evaluate.ferme();
fermeCreate();
}
}else{
if(JOptionPane.showConfirmDialog(null,"Vous avez apporté des modifications à cette évaluation.\nVoulez-vous quitter analyseWriter?", "Quitter", JOptionPane.YES_NO_OPTION,JOptionPane.QUESTION_MESSAGE)==JOptionPane.YES_OPTION) {
baseDonneesEvaluations.ferme();
create.fermeCreate();
}
}
}
});
}
/**

View File

@ -179,9 +179,11 @@ public class evaluate extends JFrame {
if(chckbxfichiersEtudiants.isSelected()) {
commandes.fichierStudentMoodle=true;
lblImageDossierEtudiant.setIcon(new ImageIcon(getClass().getResource("/resources/fichieretudiant.png")));
commandes.evaluationChargeEnMemoire.getAttributs().put("fichierStudentMoodle", "true" );
}else {
commandes.fichierStudentMoodle=false;
lblImageDossierEtudiant.setIcon(new ImageIcon(getClass().getResource("/resources/dossieretudiant.png")));
commandes.evaluationChargeEnMemoire.getAttributs().put("fichierStudentMoodle", "false" );
}
}
});
@ -192,8 +194,10 @@ public class evaluate extends JFrame {
public void stateChanged(ChangeEvent e) {
if(chckPasDeProgression.isSelected()) {
commandes.noAfficheProgression=true;
commandes.evaluationChargeEnMemoire.getAttributs().put("noAfficheProgression", "true" );
}else {
commandes.noAfficheProgression=false;
commandes.evaluationChargeEnMemoire.getAttributs().put("noAfficheProgression", "false" );
}
}
});
@ -214,9 +218,11 @@ public class evaluate extends JFrame {
if(chckbxnoFeedback.isSelected()) {
lblNoFeedBack.setIcon(new ImageIcon(getClass().getResource("/resources/nofeedbackstudent.png")));
commandes.sansFeeback=true;
commandes.evaluationChargeEnMemoire.getAttributs().put("sansFeeback", "true" );
}else {
lblNoFeedBack.setIcon(new ImageIcon(getClass().getResource("/resources/feedbackstudent.png")));
commandes.sansFeeback=false;
commandes.evaluationChargeEnMemoire.getAttributs().put("sansFeeback", "false" );
}
}
});
@ -238,9 +244,11 @@ public class evaluate extends JFrame {
if(chckbxNoDetail.isSelected()) {
lblNoDeatail.setIcon(new ImageIcon(getClass().getResource("/resources/nodetailfeedback.png")));
commandes.noDetail=true;
commandes.evaluationChargeEnMemoire.getAttributs().put("noDetail", "true" );
}else {
lblNoDeatail.setIcon(new ImageIcon(getClass().getResource("/resources/detailfeedback.png")));
commandes.noDetail=false;
commandes.evaluationChargeEnMemoire.getAttributs().put("noDetail", "false" );
}
}
});
@ -268,9 +276,11 @@ public class evaluate extends JFrame {
if(chckbxNoNote.isSelected()) {
lblnonote.setIcon(new ImageIcon(evaluate.class.getResource("/resources/nonotestudent.png")));
commandes.noNote=true;
commandes.evaluationChargeEnMemoire.getAttributs().put("noNote", "true" );
}else {
lblnonote.setIcon(new ImageIcon(evaluate.class.getResource("/resources/notestudent.png")));
commandes.noNote=false;
commandes.evaluationChargeEnMemoire.getAttributs().put("noNote", "false" );
}
}
});
@ -291,9 +301,11 @@ public class evaluate extends JFrame {
if(chckbxZipfeedback.isSelected()) {
lblnozip.setIcon(new ImageIcon(evaluate.class.getResource("/resources/zipstudent.png")));
commandes.zipfeedback=true;
commandes.evaluationChargeEnMemoire.getAttributs().put("zipfeedback", "true" );
}else {
lblnozip.setIcon(new ImageIcon(evaluate.class.getResource("/resources/nozipstudent.png")));
commandes.zipfeedback=false;
commandes.evaluationChargeEnMemoire.getAttributs().put("zipfeedback", "false" );
}
}
});
@ -303,9 +315,11 @@ public class evaluate extends JFrame {
if(chckbxVerif.isSelected()) {
lblVerifHistorique.setIcon(new ImageIcon(evaluate.class.getResource("/resources/verifhistoriquestudent.png")));
commandes.verifHisto2=true;
commandes.evaluationChargeEnMemoire.getAttributs().put("verifHisto2", "true" );
}else {
lblVerifHistorique.setIcon(new ImageIcon(evaluate.class.getResource("/resources/noverifhistoriquestudent.png")));
commandes.verifHisto2=false;
commandes.evaluationChargeEnMemoire.getAttributs().put("verifHisto2", "false" );
}
}
});
@ -342,9 +356,11 @@ public class evaluate extends JFrame {
if(chckCSVNotes.isSelected()) {
lblCsvNote.setIcon(new ImageIcon(evaluate.class.getResource("/resources/csvstudent.png")));
commandes.ecritNoteCSV=true;
commandes.evaluationChargeEnMemoire.getAttributs().put("ecritNoteCSV", "true" );
}else {
lblCsvNote.setIcon(new ImageIcon(evaluate.class.getResource("/resources/nocsvstudent.png")));
commandes.ecritNoteCSV=false;
commandes.evaluationChargeEnMemoire.getAttributs().put("ecritNoteCSV", "false" );
}
}
});
@ -369,9 +385,11 @@ public class evaluate extends JFrame {
lblNewLogo.setIcon(new ImageIcon(evaluate.class.getResource("/resources/newlogo.png")));
chckbxNoLogo.setSelected(true);
commandes.newLogo=true;
commandes.evaluationChargeEnMemoire.getAttributs().put("newLogo", "true" );
}else {
lblNewLogo.setIcon(new ImageIcon(evaluate.class.getResource("/resources/nonewlogo.png")));
commandes.newLogo=false;
commandes.evaluationChargeEnMemoire.getAttributs().put("newLogo", "false" );
}
}
});
@ -390,16 +408,16 @@ public class evaluate extends JFrame {
if(chckbxNoLogo.isSelected()) {
lblnologo.setIcon(new ImageIcon(evaluate.class.getResource("/resources/nologo.png")));
commandes.noLogo=true;
commandes.evaluationChargeEnMemoire.getAttributs().put("noLogo", "true" );
}else {
lblnologo.setIcon(new ImageIcon(evaluate.class.getResource("/resources/logo.png")));
commandes.noLogo=false;
commandes.evaluationChargeEnMemoire.getAttributs().put("noLogo", "false" );
}
}
});
JPanel panelCentre = new JPanel();
contentPane.add(panelCentre, BorderLayout.CENTER);
panelCentre.setLayout(new BorderLayout(0, 0));
@ -445,11 +463,19 @@ public class evaluate extends JFrame {
addWindowListener(new java.awt.event.WindowAdapter() {
@Override
public void windowClosing(java.awt.event.WindowEvent windowEvent) {
if(JOptionPane.showConfirmDialog(null,"Voulez-vous quitter analyseWriter?", "Quitter", JOptionPane.YES_NO_OPTION,JOptionPane.QUESTION_MESSAGE)==JOptionPane.YES_OPTION) {
baseDonneesEvaluations.ferme();
create.fermeCreate();
ferme();
}
if(commandes.evaluationChargeEnMemoire.hashCode()==commandes.hashCodeEvaluationSave){
if(JOptionPane.showConfirmDialog(null,"Voulez-vous quitter analyseWriter?", "Quitter", JOptionPane.YES_NO_OPTION,JOptionPane.QUESTION_MESSAGE)==JOptionPane.YES_OPTION) {
baseDonneesEvaluations.ferme();
create.fermeCreate();
ferme();
}
}else{
if(JOptionPane.showConfirmDialog(null,"Vous avez apporté des modifications à cette évaluation.\nVoulez-vous quitter analyseWriter?", "Quitter", JOptionPane.YES_NO_OPTION,JOptionPane.QUESTION_MESSAGE)==JOptionPane.YES_OPTION) {
baseDonneesEvaluations.ferme();
create.fermeCreate();
ferme();
}
}
}
});