diff --git a/analyseWriter.exe b/analyseWriter.exe
index 477aecc..0009513 100644
Binary files a/analyseWriter.exe and b/analyseWriter.exe differ
diff --git a/analyseWriter.jar b/analyseWriter.jar
index 7b396de..20ca3e8 100644
Binary files a/analyseWriter.jar and b/analyseWriter.jar differ
diff --git a/bin/.gitignore b/bin/.gitignore
index 608c16a..0f67b58 100644
--- a/bin/.gitignore
+++ b/bin/.gitignore
@@ -6,6 +6,19 @@
/calcul/
/evaluer/
/fenetres/
+/fichierSVG.png
+/fichierSVGmax.png
+/fichierSVGmini.png
+/fichier_analyse.svg
+/fichier_analyseXML info.svg
+/fichier_analyseXML info1.svg
+/fichier_analyseXML.svg
+/fichier_analyse_ODF.svg
+/fichier_csv_studen_delete.svg
+/fichier_csv_studen_modif.png
+/fichier_csv_studen_modif.svg
+/fichier_csv_studen_modifmini.png
+/fichier_csv_studen_suppr.svg
/fichier_csv_student.svg
/fichier_csv_student_info.svg
/fichier_csv_student_xml.svg
@@ -298,3 +311,4 @@
/zipstudent.png
/zipstudent.svg
/zipstudentmini.png
+/resources/
diff --git a/bin/accueil.png b/bin/accueil.png
index 75e03bc..e361e4e 100644
Binary files a/bin/accueil.png and b/bin/accueil.png differ
diff --git a/bin/accueil_new_version.png b/bin/accueil_new_version.png
index c8d7993..57f5697 100644
Binary files a/bin/accueil_new_version.png and b/bin/accueil_new_version.png differ
diff --git a/bin/accueill.svg b/bin/accueill.svg
index c03a489..77be1ca 100644
--- a/bin/accueill.svg
+++ b/bin/accueill.svg
@@ -2,14 +2,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ inkscape:snap-page="true"
+ inkscape:showpageshadow="2"
+ inkscape:deskcolor="#d1d1d1">
+ position="103.38382,1.210542"
+ inkscape:locked="false" />
+ id="guide2372"
+ inkscape:locked="false" />
+
@@ -216,6 +366,404 @@
id="layer1"
inkscape:groupmode="layer"
inkscape:label="Calque 1">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+ analyseWriter
+ id="text1">analyseWriter
+ analyseWriter
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ id="g25734"
+ transform="matrix(0.07298019,0,0,0.07092746,113.2208,35.830935)"
+ style="stroke-width:1.67298">
+ id="g923"
+ transform="matrix(0.7920046,0,0,0.77103428,152.87639,161.04016)"
+ style="stroke:none;stroke-width:0.566437">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+ style="fill:#000080;fill-opacity:1;stroke:none;stroke-width:0.836489;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke"
+ id="rect25418"
+ width="49.86594"
+ height="23.57299"
+ x="145.31274"
+ y="167.77364" />
+ ODF
+
+ Évaluer les savoir-faire de la mise en forme des documents ODF.
+ Évaluer les savoir-faire de la mise en forme des documents ODF.
+
diff --git a/bin/resources/accueil.png b/bin/resources/accueil.png
index 75e03bc..e361e4e 100644
Binary files a/bin/resources/accueil.png and b/bin/resources/accueil.png differ
diff --git a/bin/resources/accueil_new_version.png b/bin/resources/accueil_new_version.png
index c8d7993..57f5697 100644
Binary files a/bin/resources/accueil_new_version.png and b/bin/resources/accueil_new_version.png differ
diff --git a/icons/accueil.png b/icons/accueil.png
index 75e03bc..e361e4e 100644
Binary files a/icons/accueil.png and b/icons/accueil.png differ
diff --git a/icons/accueil_new_version.png b/icons/accueil_new_version.png
index c8d7993..57f5697 100644
Binary files a/icons/accueil_new_version.png and b/icons/accueil_new_version.png differ
diff --git a/icons/accueill.svg b/icons/accueill.svg
index c03a489..77be1ca 100644
--- a/icons/accueill.svg
+++ b/icons/accueill.svg
@@ -2,14 +2,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ inkscape:snap-page="true"
+ inkscape:showpageshadow="2"
+ inkscape:deskcolor="#d1d1d1">
+ position="103.38382,1.210542"
+ inkscape:locked="false" />
+ id="guide2372"
+ inkscape:locked="false" />
+
@@ -216,6 +366,404 @@
id="layer1"
inkscape:groupmode="layer"
inkscape:label="Calque 1">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+ analyseWriter
+ id="text1">analyseWriter
+ analyseWriter
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ id="g25734"
+ transform="matrix(0.07298019,0,0,0.07092746,113.2208,35.830935)"
+ style="stroke-width:1.67298">
+ id="g923"
+ transform="matrix(0.7920046,0,0,0.77103428,152.87639,161.04016)"
+ style="stroke:none;stroke-width:0.566437">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+ style="fill:#000080;fill-opacity:1;stroke:none;stroke-width:0.836489;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke"
+ id="rect25418"
+ width="49.86594"
+ height="23.57299"
+ x="145.31274"
+ y="167.77364" />
+ ODF
+
+ Évaluer les savoir-faire de la mise en forme des documents ODF.
+ Évaluer les savoir-faire de la mise en forme des documents ODF.
+
diff --git a/src/MEPTL/commandes.java b/src/MEPTL/commandes.java
index e4deb2a..6ee5f2d 100644
--- a/src/MEPTL/commandes.java
+++ b/src/MEPTL/commandes.java
@@ -41,7 +41,7 @@ public class commandes {
public static node nodeCSV = null;
//** Version
- public static String version ="V4.3.0"; // La version actuelle
+ public static String version ="V4.5.0"; // La version actuelle
public static String versionEvaluation = "";
public static String branch = "Origin";
public static String Annee ="2024";
diff --git a/src/action/actEvaluer.java b/src/action/actEvaluer.java
index a409277..4232d38 100644
--- a/src/action/actEvaluer.java
+++ b/src/action/actEvaluer.java
@@ -35,7 +35,7 @@ public class actEvaluer extends AbstractAction{
create.fermeCreate();
}else {
// Message à afficher
- String message = "Pour évaluer des fichiers d'étudiants,\nvous devez charger ou créer en mémoire une évaluation !";
+ String message = "La base des évaluations est vide (ou nulle).\nPour évaluer des fichiers d'étudiants,\nvous devez charger ou créer une évaluation.";
// Titre de la boîte de dialogue
String title = "Information";
diff --git a/src/baseEvaluations/validatorBaseEvaluation.java b/src/baseEvaluations/validatorBaseEvaluation.java
index a8a687a..515f6b7 100644
--- a/src/baseEvaluations/validatorBaseEvaluation.java
+++ b/src/baseEvaluations/validatorBaseEvaluation.java
@@ -8,6 +8,7 @@ public class validatorBaseEvaluation {
if(commandes.evaluationsBase==null) return true;
if(commandes.evaluationsBase.isVide()) return true;
if(commandes.evaluationsBase.getNodes().size()==0) return true;
+ if(!commandes.evaluationsBase.getNodes().get(0).getNomElt().equals("evaluation")) return true;
return false;
}
diff --git a/src/fenetres/mainApp.java b/src/fenetres/mainApp.java
index fdc1c34..98035b7 100644
--- a/src/fenetres/mainApp.java
+++ b/src/fenetres/mainApp.java
@@ -12,6 +12,7 @@ import javax.swing.ImageIcon;
import javax.swing.JButton;
import javax.swing.JFrame;
import javax.swing.JLabel;
+import javax.swing.JOptionPane;
import javax.swing.SwingConstants;
import javax.swing.UIManager;
@@ -78,15 +79,25 @@ public class mainApp extends JFrame implements ActionListener{
try {
LaBaseEvaluationsExiste = new CreerBaseParDefautEvaluation().isExist();
LabaseListesEtudiantsExiste = new CreerBaseParDefautListesEtudiants().isExist();
+ if(!LaBaseEvaluationsExiste) {
+ String message = "";
+ if(!LaBaseEvaluationsExiste) message = message + "Une nouvelle base des évaluation a été créée.
"
+ + "La base se trouve dans le dossier de l'application.
";
+ if (!message.isEmpty()) {
+ JOptionPane.showMessageDialog(null, message, "Message", JOptionPane.INFORMATION_MESSAGE);
+ }
+ }
} catch (IOException e) {
System.out.println("Problème au moment du charge de la base d'évaluation.");
e.printStackTrace();
}
+
+
frmEvalwriter = new JFrame();
frmEvalwriter.setResizable(false);
- frmEvalwriter.setBounds(100, 100, 530, 380);
+ frmEvalwriter.setBounds(100, 100, 530, 391);
int screenWidth = (int) java.awt.GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds().getWidth();
int screenHeight = (int) java.awt.GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds().getHeight();
frmEvalwriter.setLocation(( (screenWidth) - frmEvalwriter.getWidth()) / 2, (screenHeight - frmEvalwriter.getHeight()) / 2);
@@ -104,7 +115,7 @@ public class mainApp extends JFrame implements ActionListener{
btnCreate.setFont(new Font("Arial", Font.BOLD, 16));
btnCreate.addActionListener(this);
- btnCreate.setBounds(10, 181, 494, 60);
+ btnCreate.setBounds(10, 191, 494, 60);
frmEvalwriter.getContentPane().add(btnCreate);
actCharge = new JButton("Evaluer les fichiers des étudiants");
@@ -114,7 +125,7 @@ public class mainApp extends JFrame implements ActionListener{
actCharge.setIcon(new ImageIcon(mainApp.class.getResource("/resources/evaluate.png")));
actCharge.setBackground(SystemColor.inactiveCaption);
actCharge.setFont(new Font("Arial", Font.BOLD, 16));
- actCharge.setBounds(10, 110, 494, 60);
+ actCharge.setBounds(10, 120, 494, 60);
frmEvalwriter.getContentPane().add(actCharge);
if(LaBaseEvaluationsExiste) {
actCharge.setEnabled(!validatorBaseEvaluation.isVide());
@@ -123,7 +134,7 @@ public class mainApp extends JFrame implements ActionListener{
}
JLabel lblNewLabel = new JLabel();
- ImageIcon img2 = new ImageIcon(getClass().getResource("/accueil.png") );
+ ImageIcon img2 = new ImageIcon(getClass().getResource("/resources/accueil.png") );
if(commandes.newVersion) {
img2 = new ImageIcon(getClass().getResource("/resources/accueil_new_version.png") );
}
@@ -140,7 +151,7 @@ public class mainApp extends JFrame implements ActionListener{
btnNewButton.setHorizontalAlignment(SwingConstants.LEFT);
btnNewButton.setFont(new Font("Arial", Font.PLAIN, 14));
btnNewButton.setIcon(new ImageIcon(mainApp.class.getResource("/resources/apropos.png")));
- btnNewButton.setBounds(10, 252, 240, 60);
+ btnNewButton.setBounds(10, 262, 240, 60);
frmEvalwriter.getContentPane().add(btnNewButton);
JButton btnTutoriels = new JButton();
@@ -161,12 +172,12 @@ public class mainApp extends JFrame implements ActionListener{
btnTutoriels.setIcon(new ImageIcon(mainApp.class.getResource("/resources/documentation.png")));
btnTutoriels.setHorizontalAlignment(SwingConstants.LEFT);
btnTutoriels.setFont(new Font("Arial", Font.PLAIN, 14));
- btnTutoriels.setBounds(260, 252, 240, 60);
+ btnTutoriels.setBounds(260, 262, 240, 60);
frmEvalwriter.getContentPane().add(btnTutoriels);
JLabel lblpath = new JLabel(Paths.get("").toAbsolutePath().toString());
lblpath.setFont(new Font("Tahoma", Font.PLAIN, 9));
- lblpath.setBounds(10, 311, 494, 30);
+ lblpath.setBounds(10, 322, 494, 30);
frmEvalwriter.getContentPane().add(lblpath);
actCharge.addActionListener(new ActionListener() {
diff --git a/src/resources/accueil.png b/src/resources/accueil.png
index 75e03bc..e361e4e 100644
Binary files a/src/resources/accueil.png and b/src/resources/accueil.png differ
diff --git a/src/resources/accueil_new_version.png b/src/resources/accueil_new_version.png
index c8d7993..57f5697 100644
Binary files a/src/resources/accueil_new_version.png and b/src/resources/accueil_new_version.png differ