diff --git a/build/API/AbstractChangementFactory.class b/build/API/AbstractChangementFactory.class index 7bb0ac2..ad80235 100644 Binary files a/build/API/AbstractChangementFactory.class and b/build/API/AbstractChangementFactory.class differ diff --git a/build/API/AbstractGroupeFactory.class b/build/API/AbstractGroupeFactory.class index b07b9a9..cc61166 100644 Binary files a/build/API/AbstractGroupeFactory.class and b/build/API/AbstractGroupeFactory.class differ diff --git a/build/API/Changement.class b/build/API/Changement.class index 29fe6e5..17a2e8e 100644 Binary files a/build/API/Changement.class and b/build/API/Changement.class differ diff --git a/build/API/Etudiant.class b/build/API/Etudiant.class index 81c1c3d..8313375 100644 Binary files a/build/API/Etudiant.class and b/build/API/Etudiant.class differ diff --git a/build/API/Groupe.class b/build/API/Groupe.class index 2de578e..afe4ab2 100644 Binary files a/build/API/Groupe.class and b/build/API/Groupe.class differ diff --git a/build/API/MonPrint.class b/build/API/MonPrint.class index 92a67e7..74b2632 100644 Binary files a/build/API/MonPrint.class and b/build/API/MonPrint.class differ diff --git a/build/API/TypeGroupe.class b/build/API/TypeGroupe.class index 8566d06..922fef6 100644 Binary files a/build/API/TypeGroupe.class and b/build/API/TypeGroupe.class differ diff --git a/build/MNP/AbstractChangementFactoryNP.class b/build/MNP/AbstractChangementFactoryNP.class index 29869c1..0e1f6e5 100644 Binary files a/build/MNP/AbstractChangementFactoryNP.class and b/build/MNP/AbstractChangementFactoryNP.class differ diff --git a/build/MNP/AbstractGroupeFactoryNP.class b/build/MNP/AbstractGroupeFactoryNP.class index e7f1083..5e35ada 100644 Binary files a/build/MNP/AbstractGroupeFactoryNP.class and b/build/MNP/AbstractGroupeFactoryNP.class differ diff --git a/build/MNP/ChangementNP.class b/build/MNP/ChangementNP.class index 98bad41..6cd5563 100644 Binary files a/build/MNP/ChangementNP.class and b/build/MNP/ChangementNP.class differ diff --git a/build/MNP/EtudiantNP.class b/build/MNP/EtudiantNP.class index f1208d6..124c014 100644 Binary files a/build/MNP/EtudiantNP.class and b/build/MNP/EtudiantNP.class differ diff --git a/build/MNP/GroupeNP.class b/build/MNP/GroupeNP.class index d92474f..c6c14b3 100644 Binary files a/build/MNP/GroupeNP.class and b/build/MNP/GroupeNP.class differ diff --git a/build/Test/AdminView.class b/build/Test/AdminView.class index 9107e49..58528fd 100644 Binary files a/build/Test/AdminView.class and b/build/Test/AdminView.class differ diff --git a/build/Test/BDatabase.class b/build/Test/BDatabase.class index f86e9d2..a829de3 100644 Binary files a/build/Test/BDatabase.class and b/build/Test/BDatabase.class differ diff --git a/build/Test/BFrame.class b/build/Test/BFrame.class index 3b9cee8..8986649 100644 Binary files a/build/Test/BFrame.class and b/build/Test/BFrame.class differ diff --git a/build/Test/BLayout.class b/build/Test/BLayout.class index 6800331..01daf98 100644 Binary files a/build/Test/BLayout.class and b/build/Test/BLayout.class differ diff --git a/build/Test/Controller$1.class b/build/Test/Controller$1.class index 1a642c7..b36326e 100644 Binary files a/build/Test/Controller$1.class and b/build/Test/Controller$1.class differ diff --git a/build/Test/Controller.class b/build/Test/Controller.class index 99332a6..bc15f0e 100644 Binary files a/build/Test/Controller.class and b/build/Test/Controller.class differ diff --git a/build/Test/ProfView$1.class b/build/Test/ProfView$1.class index 58f85f4..d377b53 100644 Binary files a/build/Test/ProfView$1.class and b/build/Test/ProfView$1.class differ diff --git a/build/Test/ProfView.class b/build/Test/ProfView.class index cb044d9..6c7fd19 100644 Binary files a/build/Test/ProfView.class and b/build/Test/ProfView.class differ diff --git a/build/Test/TestTexteMNP.class b/build/Test/TestTexteMNP.class index 05e047e..0eeaafc 100644 Binary files a/build/Test/TestTexteMNP.class and b/build/Test/TestTexteMNP.class differ diff --git a/out/production/FIProjetIHM2022/API/AbstractChangementFactory.class b/out/production/FIProjetIHM2022/API/AbstractChangementFactory.class new file mode 100644 index 0000000..3ce3579 Binary files /dev/null and b/out/production/FIProjetIHM2022/API/AbstractChangementFactory.class differ diff --git a/out/production/FIProjetIHM2022/API/AbstractGroupeFactory.class b/out/production/FIProjetIHM2022/API/AbstractGroupeFactory.class new file mode 100644 index 0000000..a04ccaa Binary files /dev/null and b/out/production/FIProjetIHM2022/API/AbstractGroupeFactory.class differ diff --git a/out/production/FIProjetIHM2022/API/Changement.class b/out/production/FIProjetIHM2022/API/Changement.class new file mode 100644 index 0000000..215e1ef Binary files /dev/null and b/out/production/FIProjetIHM2022/API/Changement.class differ diff --git a/out/production/FIProjetIHM2022/API/Etudiant.class b/out/production/FIProjetIHM2022/API/Etudiant.class new file mode 100644 index 0000000..bd2ec0e Binary files /dev/null and b/out/production/FIProjetIHM2022/API/Etudiant.class differ diff --git a/out/production/FIProjetIHM2022/API/Groupe.class b/out/production/FIProjetIHM2022/API/Groupe.class new file mode 100644 index 0000000..e01cae6 Binary files /dev/null and b/out/production/FIProjetIHM2022/API/Groupe.class differ diff --git a/out/production/FIProjetIHM2022/API/MonPrint.class b/out/production/FIProjetIHM2022/API/MonPrint.class new file mode 100644 index 0000000..7f0751c Binary files /dev/null and b/out/production/FIProjetIHM2022/API/MonPrint.class differ diff --git a/out/production/FIProjetIHM2022/API/TypeGroupe.class b/out/production/FIProjetIHM2022/API/TypeGroupe.class new file mode 100644 index 0000000..f836efa Binary files /dev/null and b/out/production/FIProjetIHM2022/API/TypeGroupe.class differ diff --git a/out/production/FIProjetIHM2022/MNP/AbstractChangementFactoryNP.class b/out/production/FIProjetIHM2022/MNP/AbstractChangementFactoryNP.class new file mode 100644 index 0000000..01ffb65 Binary files /dev/null and b/out/production/FIProjetIHM2022/MNP/AbstractChangementFactoryNP.class differ diff --git a/out/production/FIProjetIHM2022/MNP/AbstractGroupeFactoryNP.class b/out/production/FIProjetIHM2022/MNP/AbstractGroupeFactoryNP.class new file mode 100644 index 0000000..d044cc2 Binary files /dev/null and b/out/production/FIProjetIHM2022/MNP/AbstractGroupeFactoryNP.class differ diff --git a/out/production/FIProjetIHM2022/MNP/ChangementNP.class b/out/production/FIProjetIHM2022/MNP/ChangementNP.class new file mode 100644 index 0000000..da19d1e Binary files /dev/null and b/out/production/FIProjetIHM2022/MNP/ChangementNP.class differ diff --git a/out/production/FIProjetIHM2022/MNP/EtudiantNP.class b/out/production/FIProjetIHM2022/MNP/EtudiantNP.class new file mode 100644 index 0000000..4cf70da Binary files /dev/null and b/out/production/FIProjetIHM2022/MNP/EtudiantNP.class differ diff --git a/out/production/FIProjetIHM2022/MNP/GroupeNP.class b/out/production/FIProjetIHM2022/MNP/GroupeNP.class new file mode 100644 index 0000000..e202b72 Binary files /dev/null and b/out/production/FIProjetIHM2022/MNP/GroupeNP.class differ diff --git a/out/production/FIProjetIHM2022/Test/AdminView.class b/out/production/FIProjetIHM2022/Test/AdminView.class new file mode 100644 index 0000000..a0d635f Binary files /dev/null and b/out/production/FIProjetIHM2022/Test/AdminView.class differ diff --git a/out/production/FIProjetIHM2022/Test/BDatabase.class b/out/production/FIProjetIHM2022/Test/BDatabase.class new file mode 100644 index 0000000..55dbf8e Binary files /dev/null and b/out/production/FIProjetIHM2022/Test/BDatabase.class differ diff --git a/out/production/FIProjetIHM2022/Test/BFrame.class b/out/production/FIProjetIHM2022/Test/BFrame.class new file mode 100644 index 0000000..9d206d2 Binary files /dev/null and b/out/production/FIProjetIHM2022/Test/BFrame.class differ diff --git a/out/production/FIProjetIHM2022/Test/BLayout.class b/out/production/FIProjetIHM2022/Test/BLayout.class new file mode 100644 index 0000000..67c8b30 Binary files /dev/null and b/out/production/FIProjetIHM2022/Test/BLayout.class differ diff --git a/out/production/FIProjetIHM2022/Test/Controller$1.class b/out/production/FIProjetIHM2022/Test/Controller$1.class new file mode 100644 index 0000000..c24ce4e Binary files /dev/null and b/out/production/FIProjetIHM2022/Test/Controller$1.class differ diff --git a/out/production/FIProjetIHM2022/Test/Controller.class b/out/production/FIProjetIHM2022/Test/Controller.class new file mode 100644 index 0000000..0aea74e Binary files /dev/null and b/out/production/FIProjetIHM2022/Test/Controller.class differ diff --git a/out/production/FIProjetIHM2022/Test/ProfView$1.class b/out/production/FIProjetIHM2022/Test/ProfView$1.class new file mode 100644 index 0000000..f5455e1 Binary files /dev/null and b/out/production/FIProjetIHM2022/Test/ProfView$1.class differ diff --git a/out/production/FIProjetIHM2022/Test/ProfView.class b/out/production/FIProjetIHM2022/Test/ProfView.class new file mode 100644 index 0000000..b47facd Binary files /dev/null and b/out/production/FIProjetIHM2022/Test/ProfView.class differ diff --git a/out/production/FIProjetIHM2022/Test/TestTexteMNP.class b/out/production/FIProjetIHM2022/Test/TestTexteMNP.class new file mode 100644 index 0000000..74f24ec Binary files /dev/null and b/out/production/FIProjetIHM2022/Test/TestTexteMNP.class differ diff --git a/out/production/FIProjetIHM2022/Test/libs/mariadb-connector.jar b/out/production/FIProjetIHM2022/Test/libs/mariadb-connector.jar new file mode 100644 index 0000000..58d75f3 Binary files /dev/null and b/out/production/FIProjetIHM2022/Test/libs/mariadb-connector.jar differ diff --git a/src/Test/AdminView.java b/src/Test/AdminView.java index 3b23f7b..3460e0b 100644 --- a/src/Test/AdminView.java +++ b/src/Test/AdminView.java @@ -1,13 +1,9 @@ package Test; -import API.*; -import MNP.*; - +import API.Etudiant; +import API.Groupe; import java.util.ArrayList; import javax.swing.JButton; -import javax.swing.JTable; -import javax.swing.JScrollPane; -import java.awt.*; public class AdminView extends BFrame { private final ArrayList e; @@ -38,7 +34,7 @@ public class AdminView extends BFrame { settings.setPositionY(0); JButton moveStud = new JButton("Deplacer un etudiant"); moveStud.addActionListener(this.listener); - moveStud.setActionCommand("fi::MoveStudent"); + moveStud.setActionCommand("av::MoveStudent"); this.add(moveStud, settings); this.openBFrame(); diff --git a/src/Test/BFrame.java b/src/Test/BFrame.java index 1d8f1a8..aa697bc 100644 --- a/src/Test/BFrame.java +++ b/src/Test/BFrame.java @@ -169,6 +169,6 @@ public class BFrame extends JFrame { @Override public String toString() { - return this.title + ": is opened"; + return this.title + ": est ouverte"; } } \ No newline at end of file diff --git a/src/Test/Controller.java b/src/Test/Controller.java index d2277d2..50d0064 100644 --- a/src/Test/Controller.java +++ b/src/Test/Controller.java @@ -36,7 +36,7 @@ public class Controller implements ActionListener { int groupeIndex = this.pv.getComboSelectionIndex(); String text = this.pv.getSearchStud(); - if (Objects.equals(command, "fi::GetStudList")) { + if(Objects.equals(command, "pv::GetStudList")) { BFrame frame = new BFrame( "Liste des eleves", 1, @@ -70,7 +70,7 @@ public class Controller implements ActionListener { Display(frame, data, titre); } - else if(Objects.equals(command, "fi::GetListFiltered")) { + else if(Objects.equals(command, "pv::GetListFiltered")) { BFrame frame = new BFrame( "Liste des eleves du " + groupeOption, 1, @@ -112,7 +112,7 @@ public class Controller implements ActionListener { Display(frame, data_final, titre); } - else if(Objects.equals(command, "fi::SearchStudentPer3Letters")) { + else if(Objects.equals(command, "pv::SearchStudentPer3Letters")) { if(text.length() < 3 || text == null) { JOptionPane.showMessageDialog( this.pv, @@ -171,8 +171,18 @@ public class Controller implements ActionListener { } } } + + else if(Objects.equals(command, "av::MoveStudent")) { + + } } + /** + * Pour afficher le JTable + * @param frame La fenetre + * @param data Les donnees des colonnes du tableau + * @param titre Les titres des colonnes + * */ private void Display(BFrame frame, String[][] data, String[] titre) { JTable liste = new JTable(data, titre) { public boolean editCellAt(int row, int column, java.util.EventObject e) { diff --git a/src/Test/ProfView.java b/src/Test/ProfView.java index 88007a8..df46694 100644 --- a/src/Test/ProfView.java +++ b/src/Test/ProfView.java @@ -1,29 +1,23 @@ package Test; -import API.*; -import MNP.*; +import API.Etudiant; +import API.Groupe; import javax.swing.JComboBox; import javax.swing.JTextField; import javax.swing.JButton; import javax.swing.JLabel; -import javax.swing.JTable; -import javax.swing.JOptionPane; -import javax.swing.JScrollPane; import java.awt.Dimension; import java.awt.Insets; import java.awt.GridBagConstraints; -import java.awt.event.ActionListener; -import java.awt.event.ActionEvent; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; -import java.sql.SQLException; import java.util.ArrayList; public class ProfView extends BFrame { private final ArrayList e; private final ArrayList g; - private JComboBox groupeOption; private final Controller listener; + private JComboBox groupeOption; private JTextField text; public ProfView(ArrayList e, ArrayList g, Controller listener) { @@ -62,7 +56,7 @@ public class ProfView extends BFrame { settings.setPositionY(0); JButton studList = new JButton("Voir la liste des etudiants"); - studList.setActionCommand("fi::GetStudList"); + studList.setActionCommand("pv::GetStudList"); studList.addActionListener(this.listener); this.add(studList, settings); @@ -89,7 +83,7 @@ public class ProfView extends BFrame { settings.setPadding(new Insets(0, 0, 0, 0)); settings.setAnchor(GridBagConstraints.EAST); JButton confirm = new JButton("Rechercher"); - confirm.setActionCommand("fi::GetListFiltered"); + confirm.setActionCommand("pv::GetListFiltered"); confirm.addActionListener(this.listener); this.add(confirm, settings); @@ -119,7 +113,7 @@ public class ProfView extends BFrame { settings.setAnchor(GridBagConstraints.EAST); JButton searchTLetters = new JButton("Rechercher"); searchTLetters.addActionListener(this.listener); - searchTLetters.setActionCommand("fi::SearchStudentPer3Letters"); + searchTLetters.setActionCommand("pv::SearchStudentPer3Letters"); this.add(searchTLetters, settings); this.openBFrame();