diff --git a/src/main/java/fr/univ_amu/iut/Main.java b/src/main/java/fr/univ_amu/iut/Main.java index c36b1f5..b341b38 100644 --- a/src/main/java/fr/univ_amu/iut/Main.java +++ b/src/main/java/fr/univ_amu/iut/Main.java @@ -3,19 +3,13 @@ package fr.univ_amu.iut; import java.io.IOException; import fr.univ_amu.iut.screenController.ScreenController; -import fr.univ_amu.iut.view.map.AcademiePath; -import fr.univ_amu.iut.view.map.France; -import fr.univ_amu.iut.view.map.FranceBuilder; import javafx.application.Application; import javafx.fxml.FXMLLoader; import javafx.scene.Scene; import javafx.scene.layout.Pane; - -import javafx.scene.paint.Color; import javafx.stage.Stage; public class Main extends Application { - France france; private Scene scene = new Scene(new Pane()); private ScreenController gestionnaireDePages = new ScreenController(scene); @@ -33,7 +27,8 @@ public class Main extends Application { stage.show(); } - public static void main(String[] args) { + public static void main(String[] args) throws InterruptedException { + Thread.sleep(5000); launch(args); } } diff --git a/src/main/java/fr/univ_amu/iut/fResultat/Controller.java b/src/main/java/fr/univ_amu/iut/fResultat/Controller.java index 36eec91..660c6ff 100644 --- a/src/main/java/fr/univ_amu/iut/fResultat/Controller.java +++ b/src/main/java/fr/univ_amu/iut/fResultat/Controller.java @@ -46,7 +46,7 @@ public class Controller implements Initializable{ nom.setCellValueFactory(new PropertyValueFactory("nom")); discipline.setCellValueFactory(new PropertyValueFactory("discipline")); - description.setCellValueFactory(new PropertyValueFactory("type")); + description.setCellValueFactory(new PropertyValueFactory("description")); niveau.setCellValueFactory(new PropertyValueFactory("niveau")); } diff --git a/src/main/java/fr/univ_amu/iut/fp/Controller.java b/src/main/java/fr/univ_amu/iut/fp/Controller.java index 63e6a69..d7e7818 100644 --- a/src/main/java/fr/univ_amu/iut/fp/Controller.java +++ b/src/main/java/fr/univ_amu/iut/fp/Controller.java @@ -177,7 +177,8 @@ public class Controller implements Initializable { placeButtonDiscipline(); EventHandler handler = event ->{ //TODO Recherche en fonctions des objets selectionnés - Donnees.setUsagesObtenus(daoUsage.findAll()); + + Donnees.setUsagesObtenus(daoUsage.findByCriterias(Donnees.getThematiqueSelectionee(),Donnees.getDisciplineSelectionee(),Donnees.getAcademieSelectionee())); Stage resultats = new Stage(); try { diff --git a/src/main/java/fr/univ_amu/iut/fp/fp.fxml b/src/main/java/fr/univ_amu/iut/fp/fp.fxml index 2cd7895..908c2e5 100644 --- a/src/main/java/fr/univ_amu/iut/fp/fp.fxml +++ b/src/main/java/fr/univ_amu/iut/fp/fp.fxml @@ -1,19 +1,23 @@ - - - + + + + + + - + - + - + +