diff --git a/src/main/java/fr/univ_amu/iut/FranceMain.java b/src/main/java/fr/univ_amu/iut/Main.java similarity index 67% rename from src/main/java/fr/univ_amu/iut/FranceMain.java rename to src/main/java/fr/univ_amu/iut/Main.java index 5c7c13c..0f7ac07 100644 --- a/src/main/java/fr/univ_amu/iut/FranceMain.java +++ b/src/main/java/fr/univ_amu/iut/Main.java @@ -1,18 +1,23 @@ 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.geometry.Insets; import javafx.scene.Scene; import javafx.scene.layout.Background; import javafx.scene.layout.BackgroundFill; import javafx.scene.layout.CornerRadii; +import javafx.scene.layout.Pane; import javafx.scene.layout.StackPane; import javafx.stage.Stage; -public class FranceMain extends Application { +public class Main extends Application { France france; @Override @@ -33,10 +38,12 @@ public class FranceMain extends Application { } @Override - public void start(Stage stage) { - StackPane pane = new StackPane(france); - pane.setBackground(new Background(new BackgroundFill(france.getBackgroundColor(), CornerRadii.EMPTY, Insets.EMPTY))); - Scene scene = new Scene(pane); + public void start(Stage stage) throws IOException { + Scene scene = new Scene(new Pane()); + ScreenController gestionnaireDePages = new ScreenController(scene); + gestionnaireDePages.addScreen("Acceuil",FXMLLoader.load(getClass().getResource("/fr/univ_amu/iut/fp/fp.fxml"))); + gestionnaireDePages.addScreen("Resultats",FXMLLoader.load(getClass().getResource("/fr/univ_amu/iut/fResultat/FResultat.fxml")));; + gestionnaireDePages.activate("Resultats"); stage.setTitle("Carte des académie"); stage.setScene(scene); stage.show(); 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 651d918..a166582 100644 --- a/src/main/java/fr/univ_amu/iut/fResultat/Controller.java +++ b/src/main/java/fr/univ_amu/iut/fResultat/Controller.java @@ -44,7 +44,6 @@ public class Controller implements Initializable{ Disciplines.setCellValueFactory(new PropertyValueFactory("Disciplines")); Types.setCellValueFactory(new PropertyValueFactory("Types")); Niveaux.setCellValueFactory(new PropertyValueFactory("Niveaux")); - Table.setItems(list); 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 624865b..e0c809e 100644 --- a/src/main/java/fr/univ_amu/iut/fp/Controller.java +++ b/src/main/java/fr/univ_amu/iut/fp/Controller.java @@ -98,7 +98,6 @@ public class Controller implements Initializable { thematique.getChildren().add(initButton(thematiques.get(i).getNom(),332,i/2*130)); } } - return null; } @@ -116,9 +115,6 @@ public class Controller implements Initializable { List l = daoRessource.findAll(); List t = daoThematique.findAll(); - System.out.println(l); - - placeButtonThematique(); placeButtonRessource(); // matiere.getChildren().add(initButton(t.get(0).getNom(),38,30)); diff --git a/src/main/java/fr/univ_amu/iut/screenController/ScreenController.java b/src/main/java/fr/univ_amu/iut/screenController/ScreenController.java new file mode 100644 index 0000000..5f65158 --- /dev/null +++ b/src/main/java/fr/univ_amu/iut/screenController/ScreenController.java @@ -0,0 +1,23 @@ +package fr.univ_amu.iut.screenController; + +import java.util.HashMap; + +import javafx.scene.*; +import javafx.scene.layout.Pane; + +public class ScreenController { + private HashMap screenMap = new HashMap<>(); + private Scene main; + + public ScreenController(Scene main) { + this.main = main; + } + + public void addScreen(String name, Pane pane){ + screenMap.put(name, pane); + } + + public void activate(String name){ + main.setRoot( screenMap.get(name) ); + } +}