From ef454e5a189d64c526c942243763eb58f0d15220 Mon Sep 17 00:00:00 2001 From: "pro.boooooo" Date: Thu, 8 Dec 2022 04:29:47 +0100 Subject: [PATCH] $ --- build/Test/Controller$1.class | Bin 625 -> 625 bytes build/Test/Controller.class | Bin 19562 -> 20069 bytes build/Test/MainMenu.class | Bin 9908 -> 9753 bytes src/Test/Controller.java | 24 ++++++++++++-- src/Test/MainMenu.java | 58 +++++++++++++++++++++------------- 5 files changed, 58 insertions(+), 24 deletions(-) diff --git a/build/Test/Controller$1.class b/build/Test/Controller$1.class index 61ad212766338acb0310c88bb8c15b8151a05f99..eb6b4c92a82c65a3641b446ac9eb76ee6daf9c8b 100644 GIT binary patch delta 19 acmey!@{whO3=?DWWLYM4#?;BKOgaER>;+-~ delta 19 acmey!@{whO3=?D0WLYM4#+1pfOgaER+y!6& diff --git a/build/Test/Controller.class b/build/Test/Controller.class index 10d2b0d59e4cfe73dd76b69bc1f2118d0a150a3b..38ff98998d7ae2f1d97c5df8df4f7dd1fdca1336 100644 GIT binary patch delta 7777 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 delta 7558 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 Hl_~!Nn}C-m diff --git a/src/Test/Controller.java b/src/Test/Controller.java index 586f271..4064e93 100644 --- a/src/Test/Controller.java +++ b/src/Test/Controller.java @@ -10,6 +10,7 @@ import java.awt.*; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; import javax.swing.table.TableModel; + import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.ArrayList; @@ -147,7 +148,6 @@ public class Controller implements ActionListener, ListSelectionListener { @Override public void actionPerformed(ActionEvent e) { String command = e.getActionCommand(); - this.e = this.db.getEtuList(); String groupeOption = this.pv.getComboSelection(); int groupeIndex = 0; String text = this.pv.getSearchStud(); @@ -432,6 +432,8 @@ public class Controller implements ActionListener, ListSelectionListener { type = 2; } + this.db.updateRow("ALTER TABLE fi_demandes AUTO_INCREMENT = " + this.r.size()); + if (this.db.insertRow("fi_demandes", new String[] { "id_eleve", "id_groupe", "message", "type" }, new String[] { @@ -632,7 +634,6 @@ public class Controller implements ActionListener, ListSelectionListener { }; for (int i = 0; i <= this.r.size() - 1; i++) { - System.out.println(this.getGroupeById(this.r.get(i).getWitchGroupe())); Object[] info = { this.getEtuNameById(this.r.get(i).getEtuId()), this.getGroupeById(this.r.get(i).getWitchGroupe()), @@ -837,6 +838,9 @@ public class Controller implements ActionListener, ListSelectionListener { } public JTable initTable() { + this.e = this.db.getEtuList(); + this.g = this.db.getGroupeList(); + Object[][] data = new Object[this.e.size()][3]; String[] title = { "Nom", @@ -893,6 +897,22 @@ public class Controller implements ActionListener, ListSelectionListener { return this.g; } + public BDatabase getDatabase() { + return this.db; + } + + public void setEtudiants(ArrayList e) { + this.e = e; + } + + public void setGroupes(ArrayList g) { + this.g = g; + } + + public void setRequest(ArrayList r) { + this.r = r; + } + public void setMainMenu(MainMenu m) { this.parent = m; } diff --git a/src/Test/MainMenu.java b/src/Test/MainMenu.java index 844b794..767b042 100644 --- a/src/Test/MainMenu.java +++ b/src/Test/MainMenu.java @@ -11,10 +11,11 @@ public class MainMenu extends JFrame { public static final int MENU = 0, ADMIN = 1, PROF = 2, STUDENT = 3; private static final int FULL = 4, WINDOW = 5; private final static Dimension MINIMUM_SIZE = new Dimension(960, 600); - private final CardLayout cards = new CardLayout(), adminCards = new CardLayout(), profCards = new CardLayout(), studentCards = new CardLayout(); + private final CardLayout cards = new CardLayout(), adminCards = new CardLayout(), profCards = new CardLayout(), + studentCards = new CardLayout(); private final JPanel adminPanel = new JPanel(), profPanel = new JPanel(), studentPanel = new JPanel(); - private final Color adminColor = new Color(255, 2, 2); - private final Color profColor = new Color(182, 2, 189); + private final Color adminColor = new Color(255, 2, 2); + private final Color profColor = new Color(182, 2, 189); private final Color studentColor = new Color(53, 242, 242); private int screenStatus = WINDOW; private int currentView = MENU; @@ -26,7 +27,7 @@ public class MainMenu extends JFrame { private JTable table; private int cardIndex = 0; private boolean uniqueView = false; - private String[] viewName = {"Administrateur", "Professeur", "Etudiant"}; + private String[] viewName = { "Administrateur", "Professeur", "Etudiant" }; private final CustomJButton[] buttonTab = { new CustomJButton(viewName[0]), new CustomJButton(viewName[1]), @@ -35,6 +36,7 @@ public class MainMenu extends JFrame { /** * Constructeur de base + * * @param listener controller initialisé dans le main */ public MainMenu(Controller listener) { @@ -60,10 +62,12 @@ public class MainMenu extends JFrame { } /** - * Construit un objet MainMenu sur la vue sélectionnée et le mode d'affichage choisi - * @param listener controller initialisé dans le main + * Construit un objet MainMenu sur la vue sélectionnée et le mode d'affichage + * choisi + * + * @param listener controller initialisé dans le main * @param selectedView vue à afficher - * @param screenStyle disposition d'affichage plein écran ou fenêtré + * @param screenStyle disposition d'affichage plein écran ou fenêtré */ public MainMenu(Controller listener, int selectedView, int screenStyle) { super(); @@ -82,6 +86,7 @@ public class MainMenu extends JFrame { /** * Initialise les paramètres de la fenêtre + * * @param listener */ private void init(Controller listener) { @@ -106,6 +111,7 @@ public class MainMenu extends JFrame { /** * Action réalisée par les boutons du menu principal + * * @param e */ private void action(ActionEvent e) { @@ -127,16 +133,16 @@ public class MainMenu extends JFrame { JMenu menu = new JMenu("Menu"), view = new JMenu("Affichage"); if (!uniqueView) { - JMenuItem adminMenuItem = new JMenuItem("Vue "+viewName[0]); + JMenuItem adminMenuItem = new JMenuItem("Vue " + viewName[0]); adminMenuItem.addActionListener((event) -> changeView(1)); - JMenuItem profMenuItem = new JMenuItem("Vue "+viewName[1]); + JMenuItem profMenuItem = new JMenuItem("Vue " + viewName[1]); profMenuItem.addActionListener((event) -> changeView(2)); - JMenuItem studentMenuItem = new JMenuItem("Vue "+viewName[2]); + JMenuItem studentMenuItem = new JMenuItem("Vue " + viewName[2]); studentMenuItem.addActionListener((event) -> changeView(3)); - JMenuItem mainMenuItem = new JMenuItem("Retourner au menu principal"); + JMenuItem mainMenuItem = new JMenuItem("Retourner au menu principal"); mainMenuItem.addActionListener(this::backtoMainMenu); menu.add(adminMenuItem); @@ -145,13 +151,13 @@ public class MainMenu extends JFrame { menu.add(mainMenuItem); } - JMenuItem fullScreenMenuItem = new JMenuItem("Plein écran"); + JMenuItem fullScreenMenuItem = new JMenuItem("Plein écran"); fullScreenMenuItem.addActionListener(this::setFullScreen); - JMenuItem notFullScreenMenuItem = new JMenuItem("Fenêtré"); + JMenuItem notFullScreenMenuItem = new JMenuItem("Fenêtré"); notFullScreenMenuItem.addActionListener(this::unsetFullScreen); - JMenuItem quitMenuItem = new JMenuItem("Quitter"); + JMenuItem quitMenuItem = new JMenuItem("Quitter"); quitMenuItem.addActionListener((event) -> System.exit(0)); menu.add(quitMenuItem); @@ -165,9 +171,9 @@ public class MainMenu extends JFrame { this.setJMenuBar(menuBar); } - /** * Crée une vue avec le résultat de la base de données à côté + * * @param sidePanel actions relatives à l'utilisateur * @param origin * @return panel contenant les boutons et la table @@ -178,17 +184,14 @@ public class MainMenu extends JFrame { panel.setLayout(new GridLayout(1, 2)); - if (origin.equals(viewName[0])){ + if (origin.equals(viewName[0])) { sidePanel.setBackground(adminColor); - System.out.println("admin"); } else if (origin.equals(viewName[1])) { sidePanel.setBackground(profColor); - System.out.println("prof"); } else { sidePanel.setBackground(studentColor); - System.out.println("student"); } panel.add(sidePanel); @@ -201,6 +204,7 @@ public class MainMenu extends JFrame { /** * Permet de naviguer entre les vues + * * @param index index de la vue */ private void changeView(int index) { @@ -224,7 +228,7 @@ public class MainMenu extends JFrame { this.profCards.next(this.profPanel); this.menuBar.setBackground(this.profColor); - } else if (index == 3){ + } else if (index == 3) { this.cardIndex = index; this.currentView = STUDENT; this.setTitle(this.viewName[2]); @@ -239,6 +243,7 @@ public class MainMenu extends JFrame { /** * Met à jour la table de cet objet + * * @param table nouvelle table */ public void updateTable(JTable table) { @@ -259,6 +264,7 @@ public class MainMenu extends JFrame { /** * Crée le menu principal + * * @return panel contenant le menu principal */ private JPanel firstCard() { @@ -272,7 +278,7 @@ public class MainMenu extends JFrame { GridBagConstraints gbc = new GridBagConstraints(); gbc.insets = insets; gbc.gridwidth = 1; - gbc.gridx = 0; + gbc.gridx = 0; for (int i = 0; i < buttonTab.length; i++) { gbc.gridy = i; @@ -288,6 +294,7 @@ public class MainMenu extends JFrame { /** * Initialise la vue sélectionnée + * * @param index index de la vue choisie */ private void initView(int index) { @@ -331,6 +338,7 @@ public class MainMenu extends JFrame { /** * Crée la vue administrateur + * * @return panel contenant la vue admin */ private JPanel adminView() { @@ -342,6 +350,7 @@ public class MainMenu extends JFrame { /** * Crée la vue professeur + * * @return panel contenant la vue professeur */ private JPanel profView() { @@ -353,6 +362,7 @@ public class MainMenu extends JFrame { /** * Crée la vue étudiant + * * @return panel contenant la vue étudiant */ private JPanel studentView() { @@ -361,7 +371,7 @@ public class MainMenu extends JFrame { mainPanel.add(this.sv, BorderLayout.CENTER); return mainPanel; } - + private void travelThroughCards(int index) { cards.first(this.getContentPane()); @@ -372,6 +382,7 @@ public class MainMenu extends JFrame { /** * Change le mode d'affichage + * * @param screenStyle */ private void setScreenStyle(int screenStyle) { @@ -387,6 +398,7 @@ public class MainMenu extends JFrame { /** * Passe la fenêtre en plein écran + * * @param e */ private void setFullScreen(ActionEvent e) { @@ -398,6 +410,7 @@ public class MainMenu extends JFrame { /** * Passe la fenêtre en fenêtré + * * @param e */ private void unsetFullScreen(ActionEvent e) { @@ -409,6 +422,7 @@ public class MainMenu extends JFrame { /** * Renvoie au menu principal + * * @param e */ private void backtoMainMenu(ActionEvent e) {