DjalimSimaila/SAE201-DevApp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #19 from IUTInfoAix-R202-2022/buttons

Browse Source 
Fix des couleurs pour les boutons
This commit is contained in:
Thomas R 2022-06-07 18:49:56 +02:00 committed by GitHub
commit 1a64de5a70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 58 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/main/java/fr/univ_amu/iut/fp/Controller.java
View File

@ -3,7 +3,6 @@ package fr.univ_amu.iut.fp;
import fr.univ_amu.iut.AppMain; import fr.univ_amu.iut.AppMain;
import fr.univ_amu.iut.Donnees; import fr.univ_amu.iut.Donnees;
import fr.univ_amu.iut.dao.DAODiscipline; import fr.univ_amu.iut.dao.DAODiscipline;
import fr.univ_amu.iut.dao.DAORessource;
import fr.univ_amu.iut.dao.DAOThematique; import fr.univ_amu.iut.dao.DAOThematique;
import fr.univ_amu.iut.dao.DAOUsage; import fr.univ_amu.iut.dao.DAOUsage;
import fr.univ_amu.iut.dao.factory.DAOFactory; import fr.univ_amu.iut.dao.factory.DAOFactory;
@ -11,7 +10,6 @@ import fr.univ_amu.iut.dao.factory.DAOFactoryProducer;
import fr.univ_amu.iut.dao.factory.DAOType; import fr.univ_amu.iut.dao.factory.DAOType;
import fr.univ_amu.iut.model.Discipline; import fr.univ_amu.iut.model.Discipline;
import fr.univ_amu.iut.model.Thematique; import fr.univ_amu.iut.model.Thematique;
import fr.univ_amu.iut.screenController.ScreenController;
import fr.univ_amu.iut.view.map.AcademiePath; import fr.univ_amu.iut.view.map.AcademiePath;
import fr.univ_amu.iut.view.map.France; import fr.univ_amu.iut.view.map.France;
import fr.univ_amu.iut.view.map.FranceBuilder; import fr.univ_amu.iut.view.map.FranceBuilder;
@ -43,8 +41,6 @@ public class Controller implements Initializable {
DAOThematique daoThematique; DAOThematique daoThematique;
DAOUsage daoUsage; DAOUsage daoUsage;
Stage lastResultSceneOpened;
@FXML @FXML
private Pane stackPaneFrance; private Pane stackPaneFrance;
@ -96,30 +92,50 @@ public class Controller implements Initializable {
bt.setBackground(btNormalBackground); bt.setBackground(btNormalBackground);
}; };
if (obj instanceof Discipline) {
Discipline disciplineActuelle = (Discipline) obj;
nom = disciplineActuelle.getNom();
actionHandler = event -> {
Donnees.setDisciplineSelectionee(disciplineActuelle);
};
} else {
Thematique thematiqueActuelle = (Thematique) obj;
nom = thematiqueActuelle.getNom();
actionHandler = event -> {
Donnees.setThematiqueSelectionee(thematiqueActuelle);
};
}
onPressHandler = event -> { onPressHandler = event -> {
Button bt = (Button) event.getSource(); Button bt = (Button) event.getSource();
if (bt.getBackground().equals(btNormalSelected)) { if (bt.getBackground().equals(btNormalSelected)) {
bt.setBackground(btNormalHover); bt.setBackground(btNormalHover);
bt.setOnMouseEntered(onEnterHandler); bt.setOnMouseEntered(onEnterHandler);
bt.setOnMouseExited(onExitHandler); bt.setOnMouseExited(onExitHandler);
} else {
if (obj instanceof Discipline) {
for (int i = 0; i < discipline.getChildren().size(); ++i) {
Button btLoop = (Button) discipline.getChildren().get(i);
btLoop.setBackground(btNormalBackground);
btLoop.setOnMouseEntered(onEnterHandler);
btLoop.setOnMouseExited(onExitHandler);
}
} else {
for (int i = 0; i < thematique.getChildren().size(); ++i) {
Button btLoop = (Button) thematique.getChildren().get(i);
btLoop.setBackground(btNormalBackground);
btLoop.setOnMouseEntered(onEnterHandler);
btLoop.setOnMouseExited(onExitHandler);
}
} }
else{
bt.setBackground(btNormalSelected);
bt.setOnMouseEntered(null); bt.setOnMouseEntered(null);
bt.setOnMouseExited(null); bt.setOnMouseExited(null);
bt.setBackground(btNormalSelected);
} }
}; };
if ( obj instanceof Discipline ){
Discipline disciplineActuelle = (Discipline) obj;
nom = disciplineActuelle.getNom();
actionHandler = event -> {Donnees.setDisciplineSelectionee(disciplineActuelle);};
}
else{
Thematique thematiqueActuelle = (Thematique) obj;
nom = thematiqueActuelle.getNom();
actionHandler = event -> {Donnees.setThematiqueSelectionee(thematiqueActuelle);};
}
Button bt = new Button(nom); Button bt = new Button(nom);
bt.setMnemonicParsing(false); bt.setMnemonicParsing(false);
@ -144,8 +160,7 @@ public class Controller implements Initializable {
for (int i = 0; i < disciplines.size(); ++i) { for (int i = 0; i < disciplines.size(); ++i) {
if (i % 2 == 0) { if (i % 2 == 0) {
discipline.getChildren().add(initButton(disciplines.get(i), 38, i / 2 * 130)); discipline.getChildren().add(initButton(disciplines.get(i), 38, i / 2 * 130));
} } else {
else {
discipline.getChildren().add(initButton(disciplines.get(i), 332, i / 2 * 130)); discipline.getChildren().add(initButton(disciplines.get(i), 332, i / 2 * 130));
} }
} }
@ -159,8 +174,7 @@ public class Controller implements Initializable {
for (int i = 0; i < thematiques.size(); ++i) { for (int i = 0; i < thematiques.size(); ++i) {
if (i % 2 == 0) { if (i % 2 == 0) {
thematique.getChildren().add(initButton(thematiques.get(i), 38, i / 2 * 130)); thematique.getChildren().add(initButton(thematiques.get(i), 38, i / 2 * 130));
} } else {
else {
thematique.getChildren().add(initButton(thematiques.get(i), 332, i / 2 * 130)); thematique.getChildren().add(initButton(thematiques.get(i), 332, i / 2 * 130));
} }
} }
@ -207,7 +221,6 @@ public class Controller implements Initializable {
try { try {
resultats.setScene(new Scene(FXMLLoader.load(getClass().getResource("/fr/univ_amu/iut/fResultat/FResultat.fxml")))); resultats.setScene(new Scene(FXMLLoader.load(getClass().getResource("/fr/univ_amu/iut/fResultat/FResultat.fxml"))));
resultats.show(); resultats.show();
lastResultSceneOpened = resultats;
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }