diff --git a/Base.xlsx b/Base.xlsx index 8ceb8b1..60a6bf6 100644 Binary files a/Base.xlsx and b/Base.xlsx differ diff --git a/GestionDesInscriptions_1.jar b/GestionDesInscriptions_1.jar index 02e6fed..4e92dbe 100644 Binary files a/GestionDesInscriptions_1.jar and b/GestionDesInscriptions_1.jar differ diff --git a/GestionDesInscriptions_2.jar b/GestionDesInscriptions_2.jar index fcc1492..94ede76 100644 Binary files a/GestionDesInscriptions_2.jar and b/GestionDesInscriptions_2.jar differ diff --git a/GestionDesInscriptions_3.jar b/GestionDesInscriptions_3.jar index 242becf..5c0d952 100644 Binary files a/GestionDesInscriptions_3.jar and b/GestionDesInscriptions_3.jar differ diff --git a/resources/accueil.svg b/resources/accueil.svg index 3445f29..8debdd3 100644 --- a/resources/accueil.svg +++ b/resources/accueil.svg @@ -7,9 +7,9 @@ inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)" id="svg8" version="1.1" - viewBox="0 0 90.019821 11.532569" - height="43.587662" - width="340.23239" + viewBox="0 0 174.66718 10.000005" + height="37.795296" + width="660.15942" xml:space="preserve" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" @@ -20,6 +20,17 @@ xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">image/svg+xmlGestion des inscriptions des étudiantsGestion des inscriptions, des groupes, feuilles d'émargement + transform="translate(-18.759485,-28.372554)"> diff --git a/src/baseUFRHG/demarre.java b/src/baseUFRHG/demarre.java index f0f978d..9c1e3cd 100644 --- a/src/baseUFRHG/demarre.java +++ b/src/baseUFRHG/demarre.java @@ -1,6 +1,7 @@ package baseUFRHG; import java.awt.Font; +import java.awt.Image; import java.awt.Window; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -17,6 +18,7 @@ import javax.swing.JLabel; import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.SwingConstants; +import java.awt.Color; public class demarre extends JFrame { @@ -70,7 +72,7 @@ public class demarre extends JFrame { private void initialize() { frmEvalwriter = new JFrame(); frmEvalwriter.setTitle("Gestion des inscriptions et des groupes - langues - informatique - stage - rentrée"); - frmEvalwriter.setBounds(100, 100, 760, 484); + frmEvalwriter.setBounds(100, 100, 789, 613); 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); @@ -82,7 +84,8 @@ public class demarre extends JFrame { frmEvalwriter.setResizable(false); - btnCreate = new JButton("Exporter toute la base dans un classeur MS Excel (base.xlsx)"); + btnCreate = new JButton("Exporter toute la base dans
un classeur MS Excel (base.xlsx)"); + btnCreate.setHorizontalAlignment(SwingConstants.LEFT); btnCreate.setIcon(new ImageIcon(demarre.class.getResource("/resources/exportbasetoexcel.png"))); btnCreate.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -93,23 +96,22 @@ public class demarre extends JFrame { exportBaseToExcel.exportBase(); } }); - btnCreate.setHorizontalAlignment(SwingConstants.LEFT); btnCreate.setFont(new Font("Arial", Font.BOLD, 16)); // btnCreate.addActionListener(this); - btnCreate.setBounds(10, 211, 722, 60); + btnCreate.setBounds(10, 394, 377, 78); frmEvalwriter.getContentPane().add(btnCreate); actCharge = new JButton("Importer des inscriptions
depuis CSV (UTF-8, point-virgule)"); + actCharge.setHorizontalAlignment(SwingConstants.LEFT); actCharge.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { importInscriptionCSV.importe(); } }); - actCharge.setHorizontalAlignment(SwingConstants.LEFT); actCharge.setIcon(new ImageIcon(demarre.class.getResource("/resources/importationcsv.png"))); actCharge.setFont(new Font("Arial", Font.BOLD, 16)); - actCharge.setBounds(10, 109, 356, 60); + actCharge.setBounds(10, 323, 377, 60); frmEvalwriter.getContentPane().add(actCharge); JLabel lblNewLabel = new JLabel(); @@ -117,12 +119,12 @@ public class demarre extends JFrame { // lblNewLabel.setIcon(new ImageIcon(demarre.class.getResource("/resources/accueilanalysecalc.png"))); lblNewLabel.setHorizontalAlignment(SwingConstants.CENTER); lblNewLabel.setFont(new Font("Pacifico", Font.PLAIN, 26)); - lblNewLabel.setBounds(10, 14, 722, 60); + lblNewLabel.setBounds(10, 82, 753, 106); frmEvalwriter.getContentPane().add(lblNewLabel); JButton btnNewButton = new JButton("Mise à jour de la base
depuis classeur MS Excel"); - btnNewButton.setIcon(new ImageIcon(demarre.class.getResource("/resources/majInscriptionToBase.png"))); btnNewButton.setHorizontalAlignment(SwingConstants.LEFT); + btnNewButton.setIcon(new ImageIcon(demarre.class.getResource("/resources/majInscriptionToBase.png"))); btnNewButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { File f = FileChooserXLSX.retourneFileXLSX(); @@ -135,10 +137,10 @@ public class demarre extends JFrame { }); btnNewButton.setFont(new Font("Arial", Font.BOLD, 16)); // btnNewButton.setIcon(new ImageIcon(demarre.class.getResource("/resources/apropos.png"))); - btnNewButton.setBounds(10, 313, 356, 60); + btnNewButton.setBounds(10, 483, 377, 60); frmEvalwriter.getContentPane().add(btnNewButton); - JButton btnTutoriels = new JButton("Gestionnaire de la base"); + JButton btnTutoriels = new JButton("Gestionnaire"); btnTutoriels.setIcon(new ImageIcon(demarre.class.getResource("/resources/gestionnaire.png"))); btnTutoriels.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -148,32 +150,15 @@ public class demarre extends JFrame { afficheGestionnaire(); } }); -// btnTutoriels.setIcon(new ImageIcon(demarre.class.getResource("/resources/tutoriel.png"))); - btnTutoriels.setHorizontalAlignment(SwingConstants.LEFT); btnTutoriels.setFont(new Font("Arial", Font.BOLD, 16)); - btnTutoriels.setBounds(376, 313, 356, 95); + btnTutoriels.setBounds(397, 394, 366, 175); frmEvalwriter.getContentPane().add(btnTutoriels); - JLabel lblNewLabel_1 = new JLabel("Importer dans la base des inscriptions depuis un fichier"); - lblNewLabel_1.setFont(new Font("Arial", Font.BOLD, 14)); - lblNewLabel_1.setBounds(10, 77, 455, 30); - frmEvalwriter.getContentPane().add(lblNewLabel_1); - - JLabel lblNewLabel_1_1 = new JLabel("Exporter la base"); - lblNewLabel_1_1.setFont(new Font("Arial", Font.BOLD, 14)); - lblNewLabel_1_1.setBounds(10, 180, 347, 30); - frmEvalwriter.getContentPane().add(lblNewLabel_1_1); - - JLabel lblNewLabel_1_1_1 = new JLabel("Mise à jour de la base"); - lblNewLabel_1_1_1.setFont(new Font("Arial", Font.BOLD, 14)); - lblNewLabel_1_1_1.setBounds(10, 283, 347, 30); - frmEvalwriter.getContentPane().add(lblNewLabel_1_1_1); - JButton btnimporterDesInscriptionsdepuis = new JButton("Importer des inscriptions
depuis tableur MS Excel"); - btnimporterDesInscriptionsdepuis.setIcon(new ImageIcon(demarre.class.getResource("/resources/importationexcel.png"))); btnimporterDesInscriptionsdepuis.setHorizontalAlignment(SwingConstants.LEFT); + btnimporterDesInscriptionsdepuis.setIcon(new ImageIcon(demarre.class.getResource("/resources/importationexcel.png"))); btnimporterDesInscriptionsdepuis.setFont(new Font("Arial", Font.BOLD, 16)); - btnimporterDesInscriptionsdepuis.setBounds(376, 109, 356, 60); + btnimporterDesInscriptionsdepuis.setBounds(397, 323, 366, 60); btnimporterDesInscriptionsdepuis.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { File f = FileChooserXLSX.retourneFileXLSX(); @@ -184,12 +169,12 @@ public class demarre extends JFrame { }); frmEvalwriter.getContentPane().add(btnimporterDesInscriptionsdepuis); - JLabel lblNewLabel_2 = new JLabel("version 1.0.1"); - lblNewLabel_2.setBounds(139, 426, 128, 14); - frmEvalwriter.getContentPane().add(lblNewLabel_2); - - JLabel lblNewLabel_3 = new JLabel("pablo rodriguez - 2023"); - lblNewLabel_3.setBounds(10, 426, 151, 14); + JLabel lblNewLabel_3 = new JLabel("pablo rodriguez - 2023
Version 1.0.1"); + lblNewLabel_3.setVerticalAlignment(SwingConstants.TOP); + lblNewLabel_3.setHorizontalAlignment(SwingConstants.LEFT); + lblNewLabel_3.setFont(new Font("Tahoma", Font.BOLD, 14)); + lblNewLabel_3.setForeground(new Color(255, 255, 255)); + lblNewLabel_3.setBounds(22, 11, 265, 40); frmEvalwriter.getContentPane().add(lblNewLabel_3); JButton btnNAideMiseAJour = new JButton("Aide à la mise en jour"); @@ -199,10 +184,28 @@ public class demarre extends JFrame { } }); btnNAideMiseAJour.setFont(new Font("Tahoma", Font.BOLD, 12)); - btnNAideMiseAJour.setBounds(10, 378, 356, 30); + btnNAideMiseAJour.setBounds(10, 539, 377, 30); frmEvalwriter.getContentPane().add(btnNAideMiseAJour); + ImageIcon imageIcon = new ImageIcon(demarre.class.getResource("/resources/Sans titre.png")); + Image image = imageIcon.getImage(); + + // Détermination de la taille souhaitée pour l'image + int newWidth = frmEvalwriter.getWidth(); + int newHeight = frmEvalwriter.getHeight()-260; + + // Redimensionnement de l'image pour qu'elle s'adapte à la taille souhaitée + Image resizedImage = image.getScaledInstance(newWidth, newHeight, Image.SCALE_SMOOTH); + + JLabel lblNewLabel_4 = new JLabel(new ImageIcon(resizedImage)); + lblNewLabel_4.setVerticalAlignment(SwingConstants.BOTTOM); +// lblNewLabel_4.setHorizontalAlignment(SwingConstants.CENTER); +// lblNewLabel_4.setIcon(new ImageIcon(demarre.class.getResource("/resources/Sans titre.png"))); + lblNewLabel_4.setBounds(10, -48, 753, 365); + frmEvalwriter.getContentPane().add(lblNewLabel_4); + + // Ajoutez un WindowListener à la fenêtre principale frmEvalwriter.addWindowListener(new WindowAdapter() { @Override @@ -248,6 +251,4 @@ public class demarre extends JFrame { JOptionPane.showMessageDialog(null, panel, "Erreur", JOptionPane.ERROR_MESSAGE); } } - - } diff --git a/src/baseUFRHG/gestionnaire.java b/src/baseUFRHG/gestionnaire.java index b37ae92..daaf33e 100644 --- a/src/baseUFRHG/gestionnaire.java +++ b/src/baseUFRHG/gestionnaire.java @@ -45,7 +45,6 @@ import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.DefaultTableModel; -import javax.swing.table.TableCellRenderer; import javax.swing.table.TableModel; import baseUFRHG.sauvegardeXMLBase.saveType; diff --git a/src/resources/Sans titre.png b/src/resources/Sans titre.png new file mode 100644 index 0000000..7ef30f3 Binary files /dev/null and b/src/resources/Sans titre.png differ diff --git a/src/resources/accueil.png b/src/resources/accueil.png index b9fa60e..9dfb680 100644 Binary files a/src/resources/accueil.png and b/src/resources/accueil.png differ