diff --git a/out/production/FIProjetIHM2022/Test/AdminView.class b/out/production/FIProjetIHM2022/Test/AdminView.class index a0d635f..dcbd159 100644 Binary files a/out/production/FIProjetIHM2022/Test/AdminView.class and b/out/production/FIProjetIHM2022/Test/AdminView.class differ diff --git a/out/production/FIProjetIHM2022/Test/Controller$1.class b/out/production/FIProjetIHM2022/Test/Controller$1.class index c24ce4e..f017eb7 100644 Binary files a/out/production/FIProjetIHM2022/Test/Controller$1.class 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 index 0aea74e..fade4b9 100644 Binary files a/out/production/FIProjetIHM2022/Test/Controller.class 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 index f5455e1..7603b24 100644 Binary files a/out/production/FIProjetIHM2022/Test/ProfView$1.class 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 index b47facd..41b14cd 100644 Binary files a/out/production/FIProjetIHM2022/Test/ProfView.class and b/out/production/FIProjetIHM2022/Test/ProfView.class differ diff --git a/src/Test/AdminView.java b/src/Test/AdminView.java index 3460e0b..879b517 100644 --- a/src/Test/AdminView.java +++ b/src/Test/AdminView.java @@ -4,6 +4,7 @@ import API.Etudiant; import API.Groupe; import java.util.ArrayList; import javax.swing.JButton; +import javax.swing.JLabel; public class AdminView extends BFrame { private final ArrayList e; @@ -32,10 +33,19 @@ public class AdminView extends BFrame { settings.setPositionX(0); settings.setPositionY(0); - JButton moveStud = new JButton("Deplacer un etudiant"); - moveStud.addActionListener(this.listener); - moveStud.setActionCommand("av::MoveStudent"); - this.add(moveStud, settings); + JButton moveStudGrup = new JButton("Changer le groupe d'un etudiant"); + moveStudGrup.addActionListener(this.listener); + moveStudGrup.setActionCommand("av::MoveStudGrup"); + this.add(moveStudGrup, settings); + + settings.setPositionY(1); + this.add(new JLabel(" "), settings); + + settings.setPositionY(2); + JButton addStudGrup = new JButton("Ajouter un etudiant dans un groupe"); + addStudGrup.addActionListener(this.listener); + addStudGrup.setActionCommand("av::AddStudGrup"); + this.add(addStudGrup, settings); this.openBFrame(); this.refreshBFrame(); diff --git a/src/Test/Controller.java b/src/Test/Controller.java index 50d0064..4cae8a9 100644 --- a/src/Test/Controller.java +++ b/src/Test/Controller.java @@ -172,8 +172,40 @@ public class Controller implements ActionListener { } } - else if(Objects.equals(command, "av::MoveStudent")) { + else if(Objects.equals(command, "av::MoveStudGrup")) { + BFrame frame = new BFrame( + "Deplacer un etudiant", + 1, + 1, + 500, + 500, + "GridLayout", + 1, + 1, + 2 + ); + String[][] data = new String[this.e.size()][3]; + + Object[] titre = { + (String) "Nom", + (String) "Prenom", + (String) "Groupe", + (String) "Action" + }; + + for(int i = 0; i <= this.e.size()-1; i++) { + Object[] info = { + (String) this.e.get(i).getNom(), + (String) this.e.get(i).getPrenom(), + (String) String.valueOf(this.e.get(i).getGroupe()), + (String) "Deplacer" + }; + + data[i] = info; + } + + Display(frame, data, titre); } } @@ -183,7 +215,7 @@ public class Controller implements ActionListener { * @param data Les donnees des colonnes du tableau * @param titre Les titres des colonnes * */ - private void Display(BFrame frame, String[][] data, String[] titre) { + private void Display(BFrame frame, Object[][] data, Object[] titre) { JTable liste = new JTable(data, titre) { public boolean editCellAt(int row, int column, java.util.EventObject e) { return false;