diff --git a/src/main/java/fr/univ_amu/iut/Donnees.java b/src/main/java/fr/univ_amu/iut/Donnees.java index a7d7bd9..0eb6e0a 100644 --- a/src/main/java/fr/univ_amu/iut/Donnees.java +++ b/src/main/java/fr/univ_amu/iut/Donnees.java @@ -9,10 +9,19 @@ import fr.univ_amu.iut.model.Usage; public class Donnees { private static Academie academieSelectionee = null; + private static Thematique thematiqueSelectionee = null; private static Discipline disciplineSelectionee = null; + private static Usage usageSelectione = null; private static List usagesObtenus; + public static Usage getUsageSelectione() { + return usageSelectione; + } + public static void setUsageSelectione(Usage usageSelectione) { + Donnees.usageSelectione = usageSelectione; + } + public static List getUsagesObtenus() { return usagesObtenus; } diff --git a/src/main/java/fr/univ_amu/iut/detailResultats/detail.fxml b/src/main/java/fr/univ_amu/iut/detailResultats/detail.fxml new file mode 100644 index 0000000..b101dc7 --- /dev/null +++ b/src/main/java/fr/univ_amu/iut/detailResultats/detail.fxml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + 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 660c6ff..950de5b 100644 --- a/src/main/java/fr/univ_amu/iut/fResultat/Controller.java +++ b/src/main/java/fr/univ_amu/iut/fResultat/Controller.java @@ -3,12 +3,20 @@ package fr.univ_amu.iut.fResultat; import javafx.collections.FXCollections; import javafx.collections.ObservableList; +import javafx.event.Event; import javafx.fxml.FXML; +import javafx.fxml.FXMLLoader; import javafx.fxml.Initializable; +import javafx.scene.control.Tab; +import javafx.scene.control.TabPane; import javafx.scene.control.TableColumn; import javafx.scene.control.TableView; import javafx.scene.control.cell.PropertyValueFactory; +import javafx.scene.input.MouseEvent; +import javafx.event.EventHandler; + +import java.io.IOException; import java.net.URL; import java.util.ArrayList; import java.util.List; @@ -33,6 +41,12 @@ public class Controller implements Initializable{ @FXML private TableColumn description; + @FXML + private TableColumn fauxBoutons; + + @FXML + private TabPane onglets; + @Override public void initialize(URL url, ResourceBundle resourceBundle) { @@ -42,13 +56,29 @@ public class Controller implements Initializable{ entries.add(new TableEntry(usage)); } ObservableList tableEntries = FXCollections.observableArrayList(entries); - table.setItems(tableEntries); + nom.setCellValueFactory(new PropertyValueFactory("nom")); discipline.setCellValueFactory(new PropertyValueFactory("discipline")); description.setCellValueFactory(new PropertyValueFactory("description")); niveau.setCellValueFactory(new PropertyValueFactory("niveau")); + + EventHandler selection = event ->{ + Donnees.setUsageSelectione(table.getSelectionModel().getSelectedItem().getUsage()); + Tab onglet; + try { + onglet = new Tab(Donnees.getUsageSelectione().getNom(),FXMLLoader.load(getClass().getResource("/fr/univ_amu/iut/detailResultats/detail.fxml"))); + onglets.getTabs().add(onglet); + } catch (IOException e) { + e.printStackTrace(); + } + + + + }; + table.setOnMouseClicked(selection); + table.setItems(tableEntries); } } diff --git a/src/main/java/fr/univ_amu/iut/fResultat/FResultat.fxml b/src/main/java/fr/univ_amu/iut/fResultat/FResultat.fxml index 3739b4e..536f4ec 100644 --- a/src/main/java/fr/univ_amu/iut/fResultat/FResultat.fxml +++ b/src/main/java/fr/univ_amu/iut/fResultat/FResultat.fxml @@ -1,18 +1,29 @@ + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/fr/univ_amu/iut/fResultat/TableEntry.java b/src/main/java/fr/univ_amu/iut/fResultat/TableEntry.java index aec118e..38c0179 100644 --- a/src/main/java/fr/univ_amu/iut/fResultat/TableEntry.java +++ b/src/main/java/fr/univ_amu/iut/fResultat/TableEntry.java @@ -6,6 +6,7 @@ import fr.univ_amu.iut.model.Usage; public class TableEntry { + private Usage usage; private String nom; private String discipline; private String thematique; @@ -13,6 +14,7 @@ public class TableEntry { private String niveau; public TableEntry(Usage usage) { + this.usage = usage; nom = usage.getNom(); thematique = usage.getThematique().getNom(); discipline = usage.getDiscipline().getNom(); @@ -21,6 +23,10 @@ public class TableEntry { niveau = usage.getNiveau().getNom(); } + public Usage getUsage(){ + return usage; + } + public String getNom() { return nom; } 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 3edad66..a28e7eb 100644 --- a/src/main/java/fr/univ_amu/iut/fp/Controller.java +++ b/src/main/java/fr/univ_amu/iut/fp/Controller.java @@ -19,6 +19,7 @@ import javafx.fxml.Initializable; import javafx.geometry.Insets; import javafx.scene.Scene; import javafx.scene.control.Button; +import javafx.scene.control.TabPane; import javafx.scene.control.TextField; import javafx.scene.input.MouseEvent; import javafx.scene.layout.*; @@ -216,6 +217,7 @@ public class Controller implements Initializable { }; rechercheTextuelle.setOnAction(handleRechercheTextuelle); + TabPane tab; EventHandler handleRechercheCrieters = event ->{ Donnees.setUsagesObtenus(daoUsage.findByCriterias(Donnees.getThematiqueSelectionee(),Donnees.getDisciplineSelectionee(),Donnees.getAcademieSelectionee()));