From 7e475648ed23b7060e7a35a6b2c9ad02410baa9a Mon Sep 17 00:00:00 2001
From: "pro.boooooo" <pro.boudjemline@gmail.com>
Date: Tue, 15 Nov 2022 18:28:51 +0100
Subject: [PATCH] $

---
 out/production/FI_PRJ/Test/BDatabase.class  | Bin 5166 -> 5166 bytes
 out/production/FI_PRJ/Test/ProfView$1.class | Bin 871 -> 871 bytes
 out/production/FI_PRJ/Test/ProfView$2.class | Bin 840 -> 840 bytes
 out/production/FI_PRJ/Test/ProfView$3.class | Bin 840 -> 840 bytes
 out/production/FI_PRJ/Test/ProfView$4.class | Bin 840 -> 840 bytes
 out/production/FI_PRJ/Test/ProfView.class   | Bin 6986 -> 7555 bytes
 src/Test/BDatabase.java                     |   2 +
 src/Test/ProfView.java                      | 126 +++++++++++---------
 src/Test/TestTexteMNP.java                  |   5 +-
 9 files changed, 73 insertions(+), 60 deletions(-)

diff --git a/out/production/FI_PRJ/Test/BDatabase.class b/out/production/FI_PRJ/Test/BDatabase.class
index b073693e4e5c3e41f3cf296a51e7e4eac37e0c2d..3fe9b7a5e8d9d68cd2d8f3a8cbded9ab468c149e 100644
GIT binary patch
delta 253
zcmWNLO-lk{6osD`T4aGXGaxQXnbMdNDy@w%hC&$@6iF7@2PIiSY1^Q$wcB~2MS&}6
z=McK8Wq+ZiEh73MT@IXkxt!;6e8+d*j9|uQfN_SHV1zhf5{%-=B`Mn!lT3?dC@{-9
zX*QT+lN7tm>$Tv!on??EBIJb4vmkSkWn5Os3R7gY7Y{wDt!)C7G1*~EP=`HvQ<3OC
zB@Q_fopDTq6K<&T%qg$b@Hyv$3qHBziz|Mp^DC)8u6x5qLK(Nx`A+)Y6Xk&zk2-H2
esHSe2uJUwW{6$ABSG9FnyrVs<sJi;wD*XfIbTT*q

delta 253
zcmWNLJxfAy7{z~oXh;L=-V5QNnW=S^d<j~rTTxnILE%-gP%09IUguut*60sG4Gj$~
z!9{SY(XY^0gG3*sXZfAO^BfMxvpu_G1m+?PFpi%nBTO(#j1ZIJk|dZCXOm)@b<%8-
zV~Y&iWT`QuHv%8g1qN{lvP7I^W<}>&l}nyQ3KUuE#)ltO$;C$*lL}#~QdyI#9f|JZ
zQfH3_ZQ(ilTyVfMhrH3mqs6CudK~e^F?~+><&;0px<f`n8JDv8O7>ne#tji}^@`b0
eclyP2)V=-|KIx$4s8?MTzUv38s5<(`a{mFXUNOi3

diff --git a/out/production/FI_PRJ/Test/ProfView$1.class b/out/production/FI_PRJ/Test/ProfView$1.class
index 4aaa0ec9d36d16b40b47e1384e47e22ada7aed48..ba2ad8aeffbbbdb90943d9222e534b033fb0163a 100644
GIT binary patch
delta 27
jcmaFP_MC0QRwl;8$=jI1Ig=R#8B!QT8B!;UF$V$wf!qh4

delta 27
jcmaFP_MC0QRwl-<$=jI1IU^VZ86p`(8KNeOF$V$wf8qyn

diff --git a/out/production/FI_PRJ/Test/ProfView$2.class b/out/production/FI_PRJ/Test/ProfView$2.class
index 09dc91ff32b1ced3cd94718e330eb722d4ee093b..ac2020c2d6fc918789f57505e74e1c2b49239b25 100644
GIT binary patch
delta 19
bcmX@Xc7kogWG2QLlcz9+GtQd)hA9RBOX3G}

delta 19
bcmX@Xc7kogWG2Sm$y1oZ8T%){VTu6&OEL#t

diff --git a/out/production/FI_PRJ/Test/ProfView$3.class b/out/production/FI_PRJ/Test/ProfView$3.class
index c1b11a0b707d565df9deed1e1b482c0cfccc90ae..0b8673243ac942590f838655abb6a2e325539bb4 100644
GIT binary patch
delta 19
bcmX@Xc7kogWG2Qllcz9+GoG9LhA9RBPa+4~

delta 19
bcmX@Xc7kogWG2Q#lcz9+Gai}zhA9RBPJ#!=

diff --git a/out/production/FI_PRJ/Test/ProfView$4.class b/out/production/FI_PRJ/Test/ProfView$4.class
index f996b4f25faf92de6b4df0b8eb79f3ab27c26027..5ab601c93e1f808c08cd63e76f61c9560062a3c6 100644
GIT binary patch
delta 20
ccmX@Xc7kogBqk<Cfyq;t!Wo4ozhR0207g#+WB>pF

delta 20
ccmX@Xc7kogBqk<?f0L&$g)=fte!~<408k?bKL7v#

diff --git a/out/production/FI_PRJ/Test/ProfView.class b/out/production/FI_PRJ/Test/ProfView.class
index 3cc714e516f2f2e08e0d91d06782944b2153fd0a..e1af3c78768fad233087435d57eef2d716017863 100644
GIT binary patch
delta 2604
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

delta 2140
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
D2AQUa

diff --git a/src/Test/BDatabase.java b/src/Test/BDatabase.java
index 30cb75b..3bb6b0b 100644
--- a/src/Test/BDatabase.java
+++ b/src/Test/BDatabase.java
@@ -14,6 +14,8 @@ import java.util.Arrays;
 import java.util.Iterator;
 import org.mariadb.jdbc.*;
 
+import javax.crypto.spec.PSource;
+
 /**
  * <p>Methodes pour les interaction avec une base de donnees</p>
  *
diff --git a/src/Test/ProfView.java b/src/Test/ProfView.java
index 0fcec3f..3e0d1b5 100644
--- a/src/Test/ProfView.java
+++ b/src/Test/ProfView.java
@@ -7,6 +7,7 @@ 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;
@@ -15,6 +16,7 @@ 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 implements ActionListener {
@@ -199,7 +201,6 @@ public class ProfView extends BFrame implements ActionListener {
                 data_final[x] = data[x];
             }
 
-
             JTable liste = new JTable(data_final, titre) {
                 public boolean editCellAt(int row, int column, java.util.EventObject e) {
                     return false;
@@ -214,66 +215,75 @@ public class ProfView extends BFrame implements ActionListener {
 
             frame.openBFrame();
         } else if(command == "fi::SearchStudentPer3Letters") {
-            /**
-             * Faire l'interface du filtrage.
-             * */
-            char[] beg = this.text.getText().toCharArray();
-            ArrayList<Etudiant> listFiltered = new ArrayList<>();
-            char[] cur;
+            if(this.text.getText().length() < 3 || this.text.getText() == null) {
+                JOptionPane.showMessageDialog(
+                        this,
+                        "Veuillez ecrire au moins 3 lettres",
+                        "Erreur.",
+                        JOptionPane.ERROR_MESSAGE
+                );
+            } else {
+                char[] beg = this.text.getText().toCharArray();
 
-            for(int i = 0; i <= this.e.size()-1; i++) {
-                cur = this.e.get(i).getNom().toCharArray();
-                if(cur[0] == beg[0] && cur[1] == beg[1] && cur[2] == beg[2]) {
-                    listFiltered.add(new EtudiantNP(
-                            this.e.get(i).getNom(),
-                            this.e.get(i).getPrenom(),
-                            this.e.get(i).getGroupe()
-                    ));
+                BFrame frame = new BFrame(
+                        "Liste d'eleves d'ou les noms commence par " + beg[0] + beg[1] + beg[2],
+                        1,
+                        1,
+                        500,
+                        500,
+                        "GridLayout",
+                        1,
+                        1,
+                        2
+                );
+
+                ArrayList<String> filtreEleveNom = db.fetchAll("SELECT nom FROM fi_eleves WHERE nom LIKE '" + beg[0] + beg[1] + beg[2] + "%'");
+                ArrayList<String> filtreElevePrenom = db.fetchAll("SELECT prenom FROM fi_eleves WHERE nom LIKE '" + beg[0] + beg[1] + beg[2] + "%'");
+                ArrayList<String> filtreEleveGroupe = db.fetchAll("SELECT groupe FROM fi_eleves WHERE nom LIKE '" + beg[0] + beg[1] + beg[2] + "%'");
+
+                System.out.println(filtreEleveGroupe.size() + filtreElevePrenom.size() + filtreEleveGroupe.size());
+
+                if(filtreEleveGroupe.size() == 0 || filtreEleveNom.size() == 0 || filtreElevePrenom.size() == 0) {
+                    JOptionPane.showMessageDialog(
+                            this,
+                            "Eleve introuvable !",
+                            "Erreur.",
+                            JOptionPane.ERROR_MESSAGE
+                    );
+
+                    frame.closeBFrame();
+                } else {
+                    String[] titre = {
+                            "Nom",
+                            "Prenom",
+                            "Groupe"
+                    };
+
+                    String[][] data = new String[filtreEleveNom.size()][2];
+
+                    for(int i = 0; i <= filtreEleveNom.size()-1; i++){
+                        data[i] = new String[]{
+                                filtreEleveNom.get(i),
+                                filtreElevePrenom.get(i),
+                                String.valueOf(filtreEleveGroupe.get(i))
+                        };
+                    }
+
+                    JTable liste = new JTable(data, titre) {
+                        public boolean editCellAt(int row, int column, java.util.EventObject e) {
+                            return false;
+                        }
+                    };
+
+                    liste.getTableHeader().setReorderingAllowed(false);
+                    liste.setFillsViewportHeight(true);
+
+                    JScrollPane scroll = new JScrollPane(liste);
+                    frame.getContentPane().add(scroll);
+
+                    frame.openBFrame();
                 }
             }
-
-            BFrame frame = new BFrame(
-                    "Liste d'eleves d'ou les noms commence par " + beg[0] + beg[1] + beg[2],
-                    1,
-                    1,
-                    500,
-                    500,
-                    "GridLayout",
-                    1,
-                    1,
-                    2
-            );
-
-            String[] titre = {
-                    "Nom",
-                    "Prenom",
-                    "Groupe"
-            };
-
-            String[][] data = new String[listFiltered.size()][2];
-
-            for(int i = 0; i <= listFiltered.size()-1; i++){
-                data[i] = new String[]{
-                        this.e.get(i).getNom(),
-                        this.e.get(i).getPrenom(),
-                        String.valueOf(this.e.get(i).getGroupe())
-                };
-            }
-
-            JTable liste = new JTable(data, titre) {
-                public boolean editCellAt(int row, int column, java.util.EventObject e) {
-                    return false;
-                }
-            };
-
-            liste.getTableHeader().setReorderingAllowed(false);
-            liste.setFillsViewportHeight(true);
-
-            JScrollPane scroll = new JScrollPane(liste);
-            frame.getContentPane().add(scroll);
-
-            frame.openBFrame();
-            frame.refreshBFrame();
         }
     }
 }
diff --git a/src/Test/TestTexteMNP.java b/src/Test/TestTexteMNP.java
index 44b4f46..3a98028 100644
--- a/src/Test/TestTexteMNP.java
+++ b/src/Test/TestTexteMNP.java
@@ -28,8 +28,6 @@ public class TestTexteMNP {
                                 Integer.parseInt(studGroupe.get(i), 10)
                         )
                 );
-
-                //System.out.println(listEtu.get(i).monPrint());
             } else {
                 System.out.println("[!] Erreur lors du chargement de la liste des etudiants.");
                 System.exit(-1);
@@ -65,6 +63,9 @@ public class TestTexteMNP {
 
         System.out.println("[+] Liste des groupes chargees.");
 
+        /**
+         * Redirection vers ProfView (vue professeur)
+         * */
         new ProfView(listEtu, listGroupe, bd);
     }
 }