ZIP
diff --git a/icons/saveZipEvaluationmini.png b/icons/saveZipEvaluationmini.png
index 881f5e6..2872497 100644
Binary files a/icons/saveZipEvaluationmini.png and b/icons/saveZipEvaluationmini.png differ
diff --git a/src/action/actAddStudentBaseListesEtudiants.java b/src/action/actAddStudentBaseListesEtudiants.java
new file mode 100644
index 0000000..d1b69c6
--- /dev/null
+++ b/src/action/actAddStudentBaseListesEtudiants.java
@@ -0,0 +1,28 @@
+package action;
+
+import java.awt.event.ActionEvent;
+
+import javax.swing.AbstractAction;
+import javax.swing.Action;
+import javax.swing.ImageIcon;
+
+import MEPTL.commandes;
+import baseListesEtudiants.recupeNodeBaseListesEtudiants;
+import fenetres.baseDonneesListesEtudiants;
+import fenetres.create;
+
+public class actAddStudentBaseListesEtudiants extends AbstractAction{
+ private static final long serialVersionUID = 1L;
+ {
+ putValue( Action.NAME, "Charger une liste d'étudiants" );
+ putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/addStudentbaselisteetudiant.png")) );
+ putValue( Action.SHORT_DESCRIPTION, "Charger une liste d'étudiants" );
+ }
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ new recupeNodeBaseListesEtudiants();
+ if(commandes.listesEtudiants!=null) {
+ baseDonneesListesEtudiants.getInstance();
+ }
+ }
+}
diff --git a/src/action/actOpenBaseListesEtudiants.java b/src/action/actOpenBaseListesEtudiants.java
index 89794fd..acd6985 100644
--- a/src/action/actOpenBaseListesEtudiants.java
+++ b/src/action/actOpenBaseListesEtudiants.java
@@ -15,9 +15,9 @@ public class actOpenBaseListesEtudiants extends AbstractAction{
private static final long serialVersionUID = 1L;
{
- putValue( Action.NAME, "Charger une liste d'étudiants" );
+ putValue( Action.NAME, "Ouvrir la base de données des listes des étudiants" );
putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/baselisteetudiant.png")) );
- putValue( Action.SHORT_DESCRIPTION, "Charger une liste d'étudiants" );
+ putValue( Action.SHORT_DESCRIPTION, "Ouvrir la base de données des listes des étudiants" );
}
@Override
public void actionPerformed(ActionEvent e) {
diff --git a/src/fenetres/baseDonneesEvaluations.java b/src/fenetres/baseDonneesEvaluations.java
index 83267b3..ec1dd13 100644
--- a/src/fenetres/baseDonneesEvaluations.java
+++ b/src/fenetres/baseDonneesEvaluations.java
@@ -148,7 +148,7 @@ public baseDonneesEvaluations() {
scrollPaneBoutons = new JScrollPane(panelGauche);
getContentPane().add(scrollPaneBoutons, BorderLayout.WEST);
- panelGauche.setLayout(new MigLayout("", "[:300px:400px,fill]", "[53px][][][][][][][][][30.00][20px:n][][][]"));
+ panelGauche.setLayout(new MigLayout("", "[:300px:400px,fill]", "[53px][][][][20px:n][][][][][30.00][20px:n][][][]"));
btndefautBaseEvaluation.setToolTipText("Recharge la base de données par défaut.");
btndefautBaseEvaluation.setHorizontalAlignment(SwingConstants.LEFT);
@@ -156,8 +156,8 @@ public baseDonneesEvaluations() {
panelGauche.add(btndefautBaseEvaluation, "cell 0 0,grow");
btndefautBaseEvaluation.setFont(new Font("Tahoma", Font.BOLD, 18));
btndefautBaseEvaluation.setIcon(new ImageIcon(baseDonneesEvaluations.class.getResource("/resources/defautBaseEvaluation.png")));
- btnChargerNewBase.setToolTipText("Charge les évaluations d'une autre base de données.");
+ btnChargerNewBase.setToolTipText("Charge les évaluations d'une autre base de données.");
btnChargerNewBase.setHorizontalAlignment(SwingConstants.LEFT);
btnChargerNewBase.setForeground(new Color(0, 128, 192));
panelGauche.add(btnChargerNewBase, "cell 0 1,growx,aligny top");
@@ -171,27 +171,27 @@ public baseDonneesEvaluations() {
btnArchiveBase.setIcon(new ImageIcon(baseDonneesEvaluations.class.getResource("/resources/saveZipEvaluation.png")));
panelGauche.add(btnArchiveBase, "cell 0 2,growx,aligny top");
- btnSaveEvaluation.setToolTipText("Enregistre l'évaluation chargée en mémoire.");
-
- btnSaveEvaluation.setHorizontalAlignment(SwingConstants.LEFT);
- btnSaveEvaluation.setIcon(new ImageIcon(baseDonneesEvaluations.class.getResource("/resources/saveEvaluation.png")));
- panelGauche.add(btnSaveEvaluation, "flowy,cell 0 4,growx,aligny top");
-
- btnSaveEvaluation.setForeground(new Color(0, 64, 128));
- btnSaveEvaluation.setFont(new Font("Tahoma", Font.BOLD, 15));
- btnRenommerEvaluation.setToolTipText("Renommer l'évaluation sélectionnée.");
- btnRenommerEvaluation.setHorizontalAlignment(SwingConstants.LEFT);
- btnRenommerEvaluation.setIcon(new ImageIcon(baseDonneesEvaluations.class.getResource("/resources/renommeEvaluaton.png")));
- panelGauche.add(btnRenommerEvaluation, "cell 0 5,growx,aligny top");
- btnRenommerEvaluation.setForeground(new Color(153, 50, 204));
- btnRenommerEvaluation.setFont(new Font("Tahoma", Font.BOLD, 15));
btnFusionnerBase.setToolTipText("Importer des évaluations dans la base par défaut depuis une autre base.");
btnFusionnerBase.setForeground(new Color(56, 184, 149));
btnFusionnerBase.setHorizontalAlignment(SwingConstants.LEFT);
btnFusionnerBase.setIcon(new ImageIcon(baseDonneesEvaluations.class.getResource("/resources/fusionneBaseEvaluation.png")));
btnFusionnerBase.setFont(new Font("Tahoma", Font.BOLD, 15));
- panelGauche.add(btnFusionnerBase, "cell 0 6,growx,aligny top");
+ panelGauche.add(btnFusionnerBase, "cell 0 3,growx,aligny top");
+ btnSaveEvaluation.setToolTipText("Enregistre l'évaluation chargée en mémoire.");
+
+ btnSaveEvaluation.setHorizontalAlignment(SwingConstants.LEFT);
+ btnSaveEvaluation.setIcon(new ImageIcon(baseDonneesEvaluations.class.getResource("/resources/saveEvaluation.png")));
+ panelGauche.add(btnSaveEvaluation, "flowy,cell 0 5,growx,aligny top");
+
+ btnSaveEvaluation.setForeground(new Color(0, 64, 128));
+ btnSaveEvaluation.setFont(new Font("Tahoma", Font.BOLD, 15));
+ btnRenommerEvaluation.setToolTipText("Renommer l'évaluation sélectionnée.");
+ btnRenommerEvaluation.setHorizontalAlignment(SwingConstants.LEFT);
+ btnRenommerEvaluation.setIcon(new ImageIcon(baseDonneesEvaluations.class.getResource("/resources/renommeEvaluaton.png")));
+ panelGauche.add(btnRenommerEvaluation, "cell 0 6,growx,aligny top");
+ btnRenommerEvaluation.setForeground(new Color(153, 50, 204));
+ btnRenommerEvaluation.setFont(new Font("Tahoma", Font.BOLD, 15));
btnChargerFichierAnalyse.setToolTipText("Création d'une évaluation à partir d'un fichier d'analyse au format XML.");
btnChargerFichierAnalyse.setForeground(new Color(0, 64, 128));
diff --git a/src/fenetres/baseDonneesListesEtudiants.java b/src/fenetres/baseDonneesListesEtudiants.java
index 2d87447..58a26c0 100644
--- a/src/fenetres/baseDonneesListesEtudiants.java
+++ b/src/fenetres/baseDonneesListesEtudiants.java
@@ -19,6 +19,7 @@ import javax.swing.event.ListSelectionListener;
import javax.swing.table.TableColumnModel;
import MEPTL.commandes;
+import action.actAddStudentBaseListesEtudiants;
import baseListesEtudiants.myTableBaseListesEtudiants;
import net.miginfocom.swing.MigLayout;
@@ -99,11 +100,17 @@ public class baseDonneesListesEtudiants extends JFrame{
}
}
});
-
+
+ JButton btnAddListeEtudiants = new JButton(new actAddStudentBaseListesEtudiants());
+ btnAddListeEtudiants.setFont(new Font("Tahoma", Font.BOLD, 15));
+ btnAddListeEtudiants.setHorizontalAlignment(SwingConstants.LEFT);
+ btnAddListeEtudiants.setText("Charger une liste d'étudiant
depuis un fichier CSV
");
+ panelGauche.add(btnAddListeEtudiants, "cell 0 1");
+
btnFermer.setIcon(new ImageIcon(baseDonneesEvaluations.class.getResource("/resources/quitteEvaluation.png")));
- btnFermer.setHorizontalAlignment(SwingConstants.LEFT);
- btnFermer.setFont(new Font("Tahoma", Font.BOLD, 15));
- panelGauche.add(btnFermer, "cell 0 12,growx,aligny top");
+ btnFermer.setHorizontalAlignment(SwingConstants.LEFT);
+ btnFermer.setFont(new Font("Tahoma", Font.BOLD, 15));
+ panelGauche.add(btnFermer, "cell 0 3,growx,aligny top");
diff --git a/src/fenetres/create.java b/src/fenetres/create.java
index cd29eda..32a683b 100644
--- a/src/fenetres/create.java
+++ b/src/fenetres/create.java
@@ -733,13 +733,15 @@ public final class create extends JFrame {
btnChargeEvaluation.setHideActionText(true);
toolBarPrincipal.add(btnChargeEvaluation);
- toolBarPrincipal.addSeparator();
+
JButton btnSaveEvaluation = toolBarPrincipal.add( new actSaveEvaluation() );
btnSaveEvaluation.setIcon(new ImageIcon(create.class.getResource("/resources/saveEvaluation.png")));
btnSaveEvaluation.setHideActionText(true);
toolBarPrincipal.add(btnSaveEvaluation);
+ toolBarPrincipal.addSeparator();
+
JButton btnNewFichierAnalyse = toolBarPrincipal.add( new actNewFichierAnalyse() );
btnNewFichierAnalyse.setIcon(new ImageIcon(create.class.getResource("/resources/fichierODF.png")));
diff --git a/src/fenetres/mainApp.java b/src/fenetres/mainApp.java
index 7eb2c98..8868cc6 100644
--- a/src/fenetres/mainApp.java
+++ b/src/fenetres/mainApp.java
@@ -73,7 +73,7 @@ public class mainApp extends JFrame implements ActionListener{
frmEvalwriter = new JFrame();
frmEvalwriter.setResizable(false);
- frmEvalwriter.setBounds(100, 100, 500, 360);
+ frmEvalwriter.setBounds(100, 100, 500, 371);
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);
diff --git a/src/resources/addStudentbaselisteetudiant.png b/src/resources/addStudentbaselisteetudiant.png
new file mode 100644
index 0000000..fae078e
Binary files /dev/null and b/src/resources/addStudentbaselisteetudiant.png differ
diff --git a/src/resources/addStudentbaselisteetudiantmini.png b/src/resources/addStudentbaselisteetudiantmini.png
new file mode 100644
index 0000000..b757594
Binary files /dev/null and b/src/resources/addStudentbaselisteetudiantmini.png differ
diff --git a/src/resources/baselisteetudiant.png b/src/resources/baselisteetudiant.png
index abda3ab..0d28ef8 100644
Binary files a/src/resources/baselisteetudiant.png and b/src/resources/baselisteetudiant.png differ
diff --git a/src/resources/baselisteetudiantmini.png b/src/resources/baselisteetudiantmini.png
index 57dff5e..e3f849e 100644
Binary files a/src/resources/baselisteetudiantmini.png and b/src/resources/baselisteetudiantmini.png differ
diff --git a/src/resources/fusionneBaseEvaluation.png b/src/resources/fusionneBaseEvaluation.png
index 38670cc..6d651c1 100644
Binary files a/src/resources/fusionneBaseEvaluation.png and b/src/resources/fusionneBaseEvaluation.png differ
diff --git a/src/resources/fusionneBaseEvaluationmini.png b/src/resources/fusionneBaseEvaluationmini.png
index 5a42726..e493e7a 100644
Binary files a/src/resources/fusionneBaseEvaluationmini.png and b/src/resources/fusionneBaseEvaluationmini.png differ
diff --git a/src/resources/quitteEvaluation.png b/src/resources/quitteEvaluation.png
index f5e6e41..4a9b116 100644
Binary files a/src/resources/quitteEvaluation.png and b/src/resources/quitteEvaluation.png differ
diff --git a/src/resources/quitteEvaluationmini.png b/src/resources/quitteEvaluationmini.png
index 7c484fd..72e14f6 100644
Binary files a/src/resources/quitteEvaluationmini.png and b/src/resources/quitteEvaluationmini.png differ
diff --git a/src/resources/removeEvaluaton.png b/src/resources/removeEvaluaton.png
index fd23199..0c9098b 100644
Binary files a/src/resources/removeEvaluaton.png and b/src/resources/removeEvaluaton.png differ
diff --git a/src/resources/removeEvaluatonmini.png b/src/resources/removeEvaluatonmini.png
index 4edcf7c..1c0356d 100644
Binary files a/src/resources/removeEvaluatonmini.png and b/src/resources/removeEvaluatonmini.png differ
diff --git a/src/resources/renommeEvaluaton.png b/src/resources/renommeEvaluaton.png
index 08689b1..87893b9 100644
Binary files a/src/resources/renommeEvaluaton.png and b/src/resources/renommeEvaluaton.png differ
diff --git a/src/resources/renommeEvaluatonmini.png b/src/resources/renommeEvaluatonmini.png
index 4509763..2ae0adb 100644
Binary files a/src/resources/renommeEvaluatonmini.png and b/src/resources/renommeEvaluatonmini.png differ
diff --git a/src/resources/sauvegardehistoriqueevaluation.png b/src/resources/sauvegardehistoriqueevaluation.png
index f5559bc..3d0b953 100644
Binary files a/src/resources/sauvegardehistoriqueevaluation.png and b/src/resources/sauvegardehistoriqueevaluation.png differ
diff --git a/src/resources/sauvegardehistoriqueevaluationmini.png b/src/resources/sauvegardehistoriqueevaluationmini.png
index 399e6ac..6eb5318 100644
Binary files a/src/resources/sauvegardehistoriqueevaluationmini.png and b/src/resources/sauvegardehistoriqueevaluationmini.png differ
diff --git a/src/resources/saveEvaluation.png b/src/resources/saveEvaluation.png
index 2685188..844f49a 100644
Binary files a/src/resources/saveEvaluation.png and b/src/resources/saveEvaluation.png differ
diff --git a/src/resources/saveEvaluationmini.png b/src/resources/saveEvaluationmini.png
index bb9943b..3d0a8d1 100644
Binary files a/src/resources/saveEvaluationmini.png and b/src/resources/saveEvaluationmini.png differ
diff --git a/src/resources/saveZipEvaluation.png b/src/resources/saveZipEvaluation.png
index 713a519..b17c9a9 100644
Binary files a/src/resources/saveZipEvaluation.png and b/src/resources/saveZipEvaluation.png differ
diff --git a/src/resources/saveZipEvaluationmini.png b/src/resources/saveZipEvaluationmini.png
index 881f5e6..2872497 100644
Binary files a/src/resources/saveZipEvaluationmini.png and b/src/resources/saveZipEvaluationmini.png differ