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

cleanup

Browse Source
This commit is contained in:
Thomas Rubini 2022-06-07 22:48:17 +02:00
parent 8f3046de29
commit 9c59af3953
No known key found for this signature in database
GPG Key ID: C7D287C8C1CAC373
2 changed files with 14 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/fr/univ_amu/iut/AppMain.java
View File

@ -22,19 +22,19 @@ public class AppMain extends Application {
testMode = res!=null&&res.equals("true"); testMode = res!=null&&res.equals("true");
ScreenController.addScreen("Acceuil",FXMLLoader.load(getClass().getResource("/fr/univ_amu/iut/fp/fp.fxml"))); ScreenController.addScreen("Accueil",FXMLLoader.load(getClass().getResource("/fr/univ_amu/iut/fp/fp.fxml")));
//TODO Ajouter les pages d'admin pour l'ajout des usages //TODO Ajouter les pages d'admin pour l'ajout des usages
//ScreenController.addScreen("admin1",pane); //ScreenController.addScreen("admin1",pane);
//ScreenController.addScreen("admin2",pane); //ScreenController.addScreen("admin2",pane);
ScreenController.activate("Acceuil"); ScreenController.activate("Accueil");
stage.setTitle("Carte des académie"); stage.setTitle("Carte des académie");
stage.setScene(scene); stage.setScene(scene);
stage.show(); stage.show();
} }
public static void main(String[] args) throws InterruptedException { public static void main(String[] args) {
launch(args); launch(args);
} }
} }

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

@ -2,6 +2,7 @@ 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.DAO;
import fr.univ_amu.iut.dao.DAODiscipline; import fr.univ_amu.iut.dao.DAODiscipline;
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;
@ -80,7 +81,7 @@ public class Controller implements Initializable {
} }
private Button initButton(Object obj,int x,int y){ private Button initButton(Object obj,int x,int y){
String nom = ""; String nom;
EventHandler<ActionEvent> actionHandler; EventHandler<ActionEvent> actionHandler;
EventHandler<MouseEvent> onPressHandler; EventHandler<MouseEvent> onPressHandler;
@ -99,15 +100,11 @@ public class Controller implements Initializable {
if (obj instanceof Discipline) { if (obj instanceof Discipline) {
Discipline disciplineActuelle = (Discipline) obj; Discipline disciplineActuelle = (Discipline) obj;
nom = disciplineActuelle.getNom(); nom = disciplineActuelle.getNom();
actionHandler = event -> { actionHandler = event -> Donnees.setDisciplineSelectionee(disciplineActuelle);
Donnees.setDisciplineSelectionee(disciplineActuelle);
};
} else { } else {
Thematique thematiqueActuelle = (Thematique) obj; Thematique thematiqueActuelle = (Thematique) obj;
nom = thematiqueActuelle.getNom(); nom = thematiqueActuelle.getNom();
actionHandler = event -> { actionHandler = event -> Donnees.setThematiqueSelectionee(thematiqueActuelle);
Donnees.setThematiqueSelectionee(thematiqueActuelle);
};
} }
@ -157,31 +154,15 @@ public class Controller implements Initializable {
return bt; return bt;
} }
private Void placeButtonDiscipline() { private void placeButtons(List<?> list, AnchorPane anchorPane) {
List<Discipline> disciplines = daoDiscipline.findAll(); anchorPane.setMinHeight(list.size() * 65);
discipline.setMinHeight(disciplines.size() * 65); for (int i = 0; i < list.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)); anchorPane.getChildren().add(initButton(list.get(i), 38, i / 2 * 130));
} else { } else {
discipline.getChildren().add(initButton(disciplines.get(i), 332, i / 2 * 130)); anchorPane.getChildren().add(initButton(list.get(i), 332, i / 2 * 130));
} }
} }
return null;
}
private Void placeButtonThematique() {
List<Thematique> thematiques = daoThematique.findAll();
thematique.setMinHeight(thematiques.size() * 65);
for (int i = 0; i < thematiques.size(); ++i) {
if (i % 2 == 0) {
thematique.getChildren().add(initButton(thematiques.get(i), 38, i / 2 * 130));
} else {
thematique.getChildren().add(initButton(thematiques.get(i), 332, i / 2 * 130));
}
}
return null;
} }
@Override @Override
@ -195,13 +176,9 @@ public class Controller implements Initializable {
daoThematique = daoFactory.createDAOThematique(); daoThematique = daoFactory.createDAOThematique();
daoUsage = daoFactory.createDAOUsage(); daoUsage = daoFactory.createDAOUsage();
// a chaque fois placeButtons(daoThematique.findAll(), thematique);
placeButtons(daoDiscipline.findAll(), discipline);
List<Discipline> d = daoDiscipline.findAll();
List<Thematique> t = daoThematique.findAll();
placeButtonThematique();
placeButtonDiscipline();
EventHandler<ActionEvent> handleRechercheTextuelle = event ->{ EventHandler<ActionEvent> handleRechercheTextuelle = event ->{
Donnees.setUsagesObtenus(daoUsage.findByNamePart(barreDeRecherche.getText())); Donnees.setUsagesObtenus(daoUsage.findByNamePart(barreDeRecherche.getText()));