diff --git a/src/main/java/fr/univ_amu/iut/Donnees.java b/src/main/java/fr/univ_amu/iut/Donnees.java
index 473b306..a7d7bd9 100644
--- a/src/main/java/fr/univ_amu/iut/Donnees.java
+++ b/src/main/java/fr/univ_amu/iut/Donnees.java
@@ -10,7 +10,7 @@ import fr.univ_amu.iut.model.Usage;
 public class Donnees {
     private static Academie academieSelectionee = null;
     private static Thematique thematiqueSelectionee = null;
-    private static Discipline disciplineSelectionee = Discipline.Toutes;
+    private static Discipline disciplineSelectionee = null;
     private static List<Usage> usagesObtenus;
 
     public static List<Usage> getUsagesObtenus() {
@@ -36,7 +36,7 @@ public class Donnees {
         if(thematiqueSelectionee == Donnees.thematiqueSelectionee){
             thematiqueSelectionee = null;
         }
-        System.out.println("Thematique selectionée : %s".formatted((thematiqueSelectionee == null)? "Aucune Thematique" : thematiqueSelectionee.getNom()));
+        System.out.println("Thematique selectionée : %s".formatted(thematiqueSelectionee));
         Donnees.thematiqueSelectionee = thematiqueSelectionee;
     }
     public static Discipline getDisciplineSelectionee() {
@@ -44,9 +44,9 @@ public class Donnees {
     }
     public static void setDisciplineSelectionee(Discipline disciplineSelectionee) {
         if(disciplineSelectionee == Donnees.disciplineSelectionee){
-            disciplineSelectionee = Discipline.Toutes;
+            disciplineSelectionee = null;
         }
-        System.out.println("Discipline Selectionee : %s".formatted(disciplineSelectionee.getNom()));
+        System.out.println("Discipline Selectionee : %s".formatted(disciplineSelectionee));
         Donnees.disciplineSelectionee = disciplineSelectionee;
     }
 
diff --git a/src/main/java/fr/univ_amu/iut/model/Discipline.java b/src/main/java/fr/univ_amu/iut/model/Discipline.java
index 1d9c6a1..3d67aea 100644
--- a/src/main/java/fr/univ_amu/iut/model/Discipline.java
+++ b/src/main/java/fr/univ_amu/iut/model/Discipline.java
@@ -15,9 +15,7 @@ public class Discipline implements Serializable {
 
     private static final List<Discipline> INSTANCES = new ArrayList<>();
 
-    
-    public static Discipline Toutes = new Discipline("Toutes disciplines");
-    
+
     public static Discipline HistoireGeographie = new Discipline("Histoire-géographie");
     
     public static Discipline PhysiqueChimie = new Discipline("Physique-chimie");
diff --git a/src/main/java/fr/univ_amu/iut/test/DAOUsageTest.java b/src/main/java/fr/univ_amu/iut/test/DAOUsageTest.java
index e5267a2..f456276 100644
--- a/src/main/java/fr/univ_amu/iut/test/DAOUsageTest.java
+++ b/src/main/java/fr/univ_amu/iut/test/DAOUsageTest.java
@@ -21,10 +21,11 @@ public class DAOUsageTest implements DAOUsage{
     @Override
     public List<Usage> findAll() {
         List<Usage> usages = new ArrayList<>();
-        for( int i = 0; i < 69 ; i++){
+        for( int i = 0; i < 42 ; i++){
             Usage tmp = new Usage();
             tmp.setNom(String.valueOf(i));
             tmp.setDiscipline(Discipline.Technologie);
+            tmp.setThematique(Thematique.CreationNumerique);
             tmp.setNiveau(Niveau.Tous);
             tmp.setDescription("je suis un commentaire tres long mais surtout tres utile, je sert a tester l'interface graphique et la mettre au bout de ses limtes");
             usages.add(tmp);
@@ -52,8 +53,15 @@ public class DAOUsageTest implements DAOUsage{
 
     @Override
     public List<Usage> findByCriterias(Thematique thematique, Discipline discipline, Academie academie) {
-        // TODO Auto-generated method stub
-        return null;
+        List<Usage> list = new ArrayList<>();
+        for(Usage usage : findAll()){
+            if((thematique==null||thematique==usage.getThematique())&&
+                    (discipline==null||discipline==usage.getDiscipline())&&
+                    (academie==null||academie==usage.getAcademie())){
+                list.add(usage);
+            }
+        }
+        return list;
     }
 
     @Override