ZHAW-IT21b_WIN
/
team02-AngryNerds-projekt2-turnierverwaltung
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Develope game branch #33

Merged
schrom01 merged 23 commits from develope_Game_branch into main 2022-05-12 13:44:47 +02:00
Conversation 0 Commits 23 Files Changed 17 +561 -89
17 changed files with 561 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FXController.java
View File

@ -7,40 +7,65 @@ public abstract class FXController {
FactoryDecorator factoryDecorator;
FileIO fileIO;
Pane pane;
IsObserver listener;
public FXController(){
listener = new IsObserver() {
@Override
public void update() {
loadContent();
}
};
}
public void setup(TournamentDecorator tournamentDecorator, FileIO fileIO, FactoryDecorator factoryDecorator, Pane pane){
this.tournamentDecorator = tournamentDecorator;
this.fileIO = fileIO;
this.factoryDecorator = factoryDecorator;
this.pane = pane;
tournamentDecorator.addListener(new IsObserver() {
@Override
public void update() {
loadContent();
}
});
factoryDecorator.addListener(new IsObserver() {
@Override
public void update() {
loadContent();
}
});
addListener();
}
public abstract void loadContent();
protected void setTournamentDecorator(TournamentDecorator tournamentDecorator) {
this.tournamentDecorator = tournamentDecorator;
}
public void addListener(){
tournamentDecorator.addListener(listener);
factoryDecorator.addListener(listener);
}
protected void removeListener(){
tournamentDecorator.removeListener(listener);
factoryDecorator.removeListener(listener);
}
protected TournamentDecorator getTournamentDecorator() {
return tournamentDecorator;
}
protected void setFactoryDecorator(FactoryDecorator factoryDecorator) {
this.factoryDecorator = factoryDecorator;
}
protected FactoryDecorator getFactoryDecorator() {
return factoryDecorator;
}
protected void setFileIO(FileIO fileIO) {
this.fileIO = fileIO;
}
protected FileIO getFileIO() {
return fileIO;
}
protected void setPane(Pane pane) {
this.pane = pane;
}
protected Pane getPane() {
return pane;
}

19
app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Factory.java
View File

@ -1,8 +1,11 @@
package ch.zhaw.projekt2.turnierverwaltung;
import ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView.GameController;
import ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView.GameDecorator;
import ch.zhaw.projekt2.turnierverwaltung.main.tournamentList.TournamentListController;
import javafx.fxml.FXMLLoader;
import javafx.scene.layout.BorderPane;
import javafx.scene.layout.VBox;
import java.io.IOException;
import java.net.URL;
@ -10,6 +13,7 @@ import java.net.URL;
public class Factory {
private TournamentDecorator tournamentDecorator;
private FileIO fileIO;
//TODO save views instead of recreate them.
public Factory(FileIO fileIO, TournamentDecorator tournamentDecorator){
this.fileIO = fileIO;
@ -54,6 +58,20 @@ public class Factory {
setCenterOfBorderPane(pane, getClass().getResource("gameScheduleView/GameSchedule.fxml"), factoryDecorator);
}
public GameController loadGameView(VBox box, GameDecorator gameDecorator, FactoryDecorator factoryDecorator) {
try {
FXMLLoader loader = new FXMLLoader(getClass().getResource("gameScheduleView/Game.fxml"));
box.getChildren().add(loader.load());
GameController controller = loader.getController();
controller.setup(tournamentDecorator, fileIO, factoryDecorator, box, gameDecorator);
return controller;
} catch (IOException e) {
e.printStackTrace();
//TODO LOGGER
}
return null;
}
private FXController setCenterOfBorderPane(BorderPane pane, URL location, FactoryDecorator factoryDecorator) {
FXController controller = null;
try {
@ -61,7 +79,6 @@ public class Factory {
pane.setCenter(loader.load());
controller = loader.getController();
controller.setup(tournamentDecorator, fileIO, factoryDecorator, pane);
controller.loadContent();
} catch (IOException e) {
e.printStackTrace();
//TODO handle and logging?

98
app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java
View File

@ -1,7 +1,14 @@
package ch.zhaw.projekt2.turnierverwaltung;
import ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView.GameController;
import ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView.GameDecorator;
import javafx.geometry.Pos;
import javafx.scene.Node;
import javafx.scene.layout.BorderPane;
import javafx.scene.layout.HBox;
import javafx.scene.layout.Pane;
import javafx.scene.layout.VBox;
import javafx.scene.shape.Line;
import java.io.IOException;
import java.util.ArrayList;
@ -44,8 +51,7 @@ public class FactoryDecorator implements IsObservable{
public void openTournament(FileIO.TournamentFile tournamentFile){
try {
factory.setTournament(fileIO.loadTournament(tournamentFile));
factory.loadGameScheduler((BorderPane) pane, this);
informListener();
openScheduleView();
} catch (IOException e) {
e.printStackTrace();
} catch (ClassNotFoundException e) {
@ -53,18 +59,106 @@ public class FactoryDecorator implements IsObservable{
} //TODO handle and logging
}
public void openTournamentList() {
factory.loadTournamentList((BorderPane) pane, this);
informListener();
}
public void openParticipantFormular() {
factory.loadParticipantFormular((BorderPane) pane, this);
informListener();
}
public void openPlacesFormular() {
factory.loadPlacesFormular((BorderPane) pane, this);
informListener();
}
public void openScheduleView() {
factory.loadGameScheduler((BorderPane) pane, this);
informListener();
}
public void loadGameList(HBox hBoxCenter, TournamentDecorator tournamentDecorator, boolean treeView) {
hBoxCenter.getChildren().clear();
List<List<Game>> gameList = tournamentDecorator.getTournament().getGameList();
List<GameDecorator> gameDecoratorsList = new ArrayList<>();
double gameBoxHeight = 0;
double spacingFactor = 0;
for (int i = 0; i < gameList.size(); i++) {
List<GameDecorator> newGameDecoratorsList = new ArrayList<>();
VBox vBox = new VBox();
if(treeView){
vBox.setAlignment(Pos.CENTER);
vBox.setSpacing(gameBoxHeight * spacingFactor);
} else {
vBox.setAlignment(Pos.TOP_CENTER);
}
spacingFactor = spacingFactor * 2 + 1;
for (int j = 0; j < gameList.get(i).size(); j++) {
GameDecorator gameDecorator = new GameDecorator(gameList.get(i).get(j));
newGameDecoratorsList.add(gameDecorator);
GameController gameController = openGameView(vBox,gameDecorator);
if(i>0){
gameController.addListener(gameDecoratorsList.get(j*2));
gameController.addListener(gameDecoratorsList.get(j*2+1));
} else if(gameBoxHeight == 0) {
gameBoxHeight = gameController.getGameBoxHeigth();
}
gameDecorator.addListener(new IsObserver() {
@Override
public void update() {
tournamentDecorator.saveTournament();
}
});
gameController.loadContent();
}
hBoxCenter.getChildren().add(vBox);
if(treeView){
if(i+1 < gameList.size())
hBoxCenter.getChildren().add(drawLines(vBox, gameBoxHeight, 30));
}
gameDecoratorsList = newGameDecoratorsList;
}
}
public VBox drawLines(VBox gameVBox, double gameBoxHeight, double lineLength){
VBox completeLineVBox = new VBox();
completeLineVBox.setAlignment(Pos.CENTER_LEFT);
double lineSpacing = gameVBox.getSpacing() + gameBoxHeight - 1;
completeLineVBox.setSpacing(lineSpacing);
for(int i = 0; i < gameVBox.getChildren().size(); i+=2){
HBox lineBox = new HBox();
lineBox.setAlignment(Pos.CENTER);
//add Lines from left Game to center
VBox vBox = new VBox();
vBox.setSpacing(lineSpacing);
vBox.getChildren().add(new Line(0,0,lineLength,0));
vBox.getChildren().add(new Line(0,0,lineLength,0));
lineBox.getChildren().add(vBox);
//add vertical line
lineBox.getChildren().add(new Line(0, 0, 0, lineSpacing));
//add line to right game
lineBox.getChildren().add(new Line(0, 0, lineLength, 0));
completeLineVBox.getChildren().add(lineBox);
}
return completeLineVBox;
}
public GameController openGameView(VBox vBox, GameDecorator gameDecorator) {
return factory.loadGameView(vBox ,gameDecorator, this);
}
public void informListener() {
for(IsObserver observer : listener) {
observer.update();

4
app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FileIO.java
View File

@ -81,7 +81,7 @@ public class FileIO {
* @throws IOException File not readable
* @throws FileNotFoundException File not found
*/
public Tournament loadTournament(File tournamentFile) throws IOException, ClassNotFoundException, FileNotFoundException {
public synchronized Tournament loadTournament(File tournamentFile) throws IOException, ClassNotFoundException, FileNotFoundException {
if (tournamentFile == null) {
logger.warning("Given tournament file is empty");
throw new IllegalArgumentException("Tournament File is null");
@ -125,7 +125,7 @@ public class FileIO {
* @throws IOException File not readable
* @throws FileNotFoundException File not found
*/
public void saveTournament(Tournament tournament) throws IOException, FileNotFoundException {
public synchronized void saveTournament(Tournament tournament) throws IOException, FileNotFoundException {
if (tournament == null) {
logger.warning("Given tournament file is empty");
throw new IllegalArgumentException("Null tournament received");

46
app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Game.java
View File

@ -3,9 +3,21 @@ package ch.zhaw.projekt2.turnierverwaltung;
import java.io.Serializable;
public class Game implements Serializable {
private Participant participant1, Participant2;
private Participant participant1, participant2;
private int points1, points2;
private Place place;
private Game previousGame1, previousGame2;
public Game(Participant participant1, Participant participant2) {
this.participant1 = participant1;
this.participant2 = participant2;
}
public Game(Game previousGame1, Game previousGame2){
this.previousGame1 = previousGame1;
this.previousGame2 = previousGame2;
}
public Place getLocation() {
return place;
@ -39,11 +51,35 @@ public class Game implements Serializable {
this.participant1 = participant1;
}
public Participant getParticipant2() {
return Participant2;
public void setParticipant2(Participant participant2) {
this.participant2 = participant2;
}
public void setParticipant2(Participant participant2) {
Participant2 = participant2;
public Participant getParticipant2() {
return participant2;
}
public void setPlace(Place place) {
this.place = place;
}
public Place getPlace() {
return place;
}
public Participant getWinner(){
if(points1 > points2){
return participant1;
} else if(points2 > points1){
return participant2;
} else {
return null;
}
}
public void refreshParticipants(){
participant1 = previousGame1.getWinner();
participant2 = previousGame2.getWinner();
}
}

67
app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java
View File

@ -5,17 +5,14 @@ import javafx.collections.ObservableList;
import java.io.File;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import java.util.*;
public class Tournament implements Serializable {
private String name;
private Type type;
private List<Participant> participants;
private List<Place> places;
private List<List<Game>> gameList;
public Tournament(String name, Type type) throws InvalidNameException, InvalidTypeException {
@ -29,6 +26,7 @@ public class Tournament implements Serializable {
setType(type);
participants = new ArrayList<>();
places = new ArrayList<>();
gameList = new ArrayList<>();
}
public void addParticipant(Participant newParticipant) throws ParticipantExistsException {
@ -67,6 +65,52 @@ public class Tournament implements Serializable {
return placesObservable;
}
/*
creates a complete new GameSchedule
*/
public void createGameSchedule() throws NumberOfParticipantInvalidException {
gameList = new ArrayList<>();
if (type == Type.KO) {
if (numberOfParticipantValid()) {
calcGameSchedule();
//TODO Logging
} else {
throw new NumberOfParticipantInvalidException("Can not Create Game Schedule for KO Modus");
//TODO Logging
}
} else {
//TODO for Type Group
}
}
private boolean numberOfParticipantValid() {
double res = Math.log(participants.size()) / Math.log(2);
return (res * 10) % 10 == 0 && participants.size() >=4;
}
private void calcGameSchedule() {
Collections.shuffle(participants);
for (int i = 0; i < (Math.log(participants.size()) / Math.log(2)); i++) {
List<Game> gameRound = new ArrayList<>();
if (i == 0) {
for (int j = 0; j < participants.size() - 1; j += 2) {
gameRound.add(new Game(participants.get(j), participants.get(j+1)));
}
} else {
for (int j = 0; j < (gameList.get(i-1).size()/2); j++) {
gameRound.add(new Game(gameList.get(i-1).get(j*2),gameList.get(i-1).get(j*2+1)));
}
}
gameList.add(gameRound);
}
}
public String getName() {
return name;
}
@ -83,6 +127,10 @@ public class Tournament implements Serializable {
this.type = type;
}
public List<List<Game>> getGameList() {
return gameList;
}
public enum Type {
KO("KO-System"), GROUPS("Gruppenspiele");
@ -159,5 +207,14 @@ public class Tournament implements Serializable {
}
public class NumberOfParticipantInvalidException extends Exception {
public NumberOfParticipantInvalidException() {
super();
}
public NumberOfParticipantInvalidException(String msg) {
super(msg);
}
}
}

33
app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/TournamentDecorator.java
View File

@ -4,11 +4,14 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
public class TournamentDecorator implements IsObservable{
private Tournament tournament;
private FileIO fileIO;
private List<IsObserver> listener = new ArrayList<>();
private ExecutorService executorService;
public TournamentDecorator(FileIO fileIO){
setFileIO(fileIO);
@ -16,10 +19,12 @@ public class TournamentDecorator implements IsObservable{
@Override
public void update() {
if(tournament != null){
saveTournament();
}
}
});
executorService = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
}
public void setFileIO(FileIO fileIO) {
@ -44,14 +49,13 @@ public class TournamentDecorator implements IsObservable{
listener.remove(observer);
}
public void saveTournament(){
try {
fileIO.saveTournament(tournament);
} catch (IOException e) {
e.printStackTrace(); //TODO handle and logging
}
executorService.execute(new saveTask());
}
public void createTournament(String name, Tournament.Type type){
if(fileIO.tournamentExists(name)){
System.out.println("Tournament with same name exists already.");
@ -79,6 +83,11 @@ public class TournamentDecorator implements IsObservable{
}
}
public void createNewGameSchedule() throws Tournament.NumberOfParticipantInvalidException {
tournament.createGameSchedule();
informListener();
}
public void savePlayer(String firstName, String name, String phoneNumber, String dateOfBirth){
try {
tournament.addParticipant(new Player(firstName, name, phoneNumber, dateOfBirth));
@ -121,9 +130,23 @@ public class TournamentDecorator implements IsObservable{
}
}
public void informListener() {
for(IsObserver observer : listener) {
observer.update();
}
}
private class saveTask implements Runnable {
@Override
public void run() {
try {
fileIO.saveTournament(tournament);
} catch (IOException e) {
e.printStackTrace(); //TODO handle and logging
}
}
}
}

4
app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.java
View File

@ -25,13 +25,13 @@ public class MainWindow extends Application {
BorderPane pane = factory.loadMainWindow();
factoryDecorator = new FactoryDecorator(fileIO, factory, pane);
factory.loadTournamentList(pane, factoryDecorator);
factoryDecorator.openTournamentList();
Scene scene = new Scene(pane);
primaryStage.setScene(scene);
primaryStage.setMaximized(true);
primaryStage.setResizable(false);
primaryStage.setResizable(true);
primaryStage.setFullScreen(false);
primaryStage.show();
}

70
app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameController.java
View File

@ -1,16 +1,80 @@
package ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView;
import ch.zhaw.projekt2.turnierverwaltung.FXController;
import ch.zhaw.projekt2.turnierverwaltung.*;
import javafx.beans.value.ObservableValue;
import javafx.event.Event;
import javafx.fxml.FXML;
import javafx.scene.control.ChoiceBox;
import javafx.scene.control.Label;
import javafx.scene.control.TextField;
import javafx.scene.layout.Pane;
import javafx.scene.layout.VBox;
public class GameController extends FXController{
private GameDecorator gameDecorator;
@FXML
private ChoiceBox<?> placesChoiceBox;
private VBox mainVBox;
@FXML
private Label participantNameOne;
@FXML
private Label participantNameTwo;
@FXML
private ChoiceBox<Place> placesChoiceBox;
@FXML
private TextField pointsTeamOne;
@FXML
private TextField pointsTeamTwo;
@FXML
void saveGameResult(Event event) {
gameDecorator.saveGameResult(pointsTeamOne.getText(), pointsTeamTwo.getText());
}
private void saveGamePlace(Place newPlace) {
gameDecorator.saveGamePlace(newPlace);
}
public double getGameBoxHeigth(){
return mainVBox.getPrefHeight();
}
@Override
public void loadContent() {
participantNameOne.setText(gameDecorator.getParticipantOne());
participantNameTwo.setText(gameDecorator.getParticipantTwo());
pointsTeamOne.setText(String.valueOf(gameDecorator.getPoints1()));
pointsTeamTwo.setText(String.valueOf(gameDecorator.getPoints2()));
placesChoiceBox.setItems(getTournamentDecorator().getTournament().getPlaces());
placesChoiceBox.setValue(gameDecorator.getPlace());
}
public void refreshParticipants(){
gameDecorator.refreshParticipants();
}
public void addListener(GameDecorator gameDecorator){
gameDecorator.addListener(new IsObserver() {
@Override
public void update() {
refreshParticipants();
loadContent();
}
});
}
public void setup(TournamentDecorator tournamentDecorator, FileIO fileIO, FactoryDecorator factoryDecorator, Pane pane, GameDecorator gameDecorator) {
setTournamentDecorator(tournamentDecorator);
this.gameDecorator = gameDecorator;
placesChoiceBox.getSelectionModel().selectedItemProperty().addListener((ObservableValue<? extends Place> observable, Place oldValue, Place newValue) -> saveGamePlace(newValue));
}
}
}

82
app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameDecorator.java Normal file
View File

@ -0,0 +1,82 @@
package ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView;
import ch.zhaw.projekt2.turnierverwaltung.*;
import java.util.ArrayList;
import java.util.List;
public class GameDecorator implements IsObservable{
private Game game;
private List<IsObserver> listener = new ArrayList<>();
public GameDecorator (Game game) {
this.game = game;
}
@Override
public void addListener(IsObserver observer) {
listener.add(observer);
}
@Override
public void removeListener(IsObserver observer) {
listener.remove(observer);
}
public void saveGameResult(String points1, String points2){
if(points1.length() > 0){
game.setPoints1(Integer.parseInt(points1));
} else {
game.setPoints1(0);
}
if(points2.length() > 0) {
game.setPoints2(Integer.parseInt(points2));
} else {
game.setPoints2(0);
}
informListener();
}
public void saveGamePlace(Place place){
game.setPlace(place);
informListener();
}
public String getPoints1() {
return String.valueOf(game.getPoints1());
}
public String getPoints2() {
return String.valueOf(game.getPoints2());
}
public String getParticipantOne() {
if (game.getParticipant1() != null) {
return game.getParticipant1().toString();
}
return "1";
}
public String getParticipantTwo() {
if (game.getParticipant2() != null) {
return game.getParticipant2().toString();
}
return "2";
}
public void refreshParticipants(){
game.refreshParticipants();
informListener();
}
public Place getPlace() {
return game.getPlace();
}
public void informListener() {
for(IsObserver observer : listener) {
observer.update();
}
}
}

47
app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameScheduleController.java
View File

@ -1,24 +1,69 @@
package ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView;
import ch.zhaw.projekt2.turnierverwaltung.FXController;
import ch.zhaw.projekt2.turnierverwaltung.Tournament;
import javafx.event.ActionEvent;
import javafx.fxml.FXML;
import javafx.scene.control.Button;
import javafx.scene.control.CheckBox;
import javafx.scene.layout.HBox;
public class GameScheduleController extends FXController {
@FXML
private Button createScheduleBtn;
@FXML
private Button editLocBtn;
@FXML
private Button editParticipantBtn;
@FXML
private Button closeTournamentBtn;
@FXML
private HBox hBoxCenter;
@FXML
private CheckBox treeView;
@FXML
void createNewSchedule(ActionEvent event) {
try {
getTournamentDecorator().createNewGameSchedule();
} catch (Tournament.NumberOfParticipantInvalidException e) {
//TODO Method in FactoryDecorater to show msg
e.printStackTrace();
}
}
@FXML
void openPlacesFormular(ActionEvent event) {
removeListener();
getFactoryDecorator().openPlacesFormular();
}
@FXML
void openParticipantFormular(ActionEvent event) {
removeListener();
getFactoryDecorator().openParticipantFormular();
}
@FXML
void closeTournament(ActionEvent event) {
removeListener();
getFactoryDecorator().openTournamentList();
}
@FXML
void changeView(ActionEvent event) {
loadContent();
}
@Override
public void loadContent() {
getFactoryDecorator().loadGameList(hBoxCenter, getTournamentDecorator(), treeView.isSelected());
}
}

1
app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/participantAddFormular/ParticipantFormularController.java
View File

@ -89,6 +89,7 @@ public class ParticipantFormularController extends FXController {
@FXML
void close(ActionEvent event) {
removeListener();
getFactoryDecorator().openScheduleView();
}

1
app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/placesAddFormular/PlacesFormularController.java
View File

@ -68,6 +68,7 @@ public class PlacesFormularController extends FXController {
@FXML
void close(ActionEvent event) {
removeListener();
getFactoryDecorator().openScheduleView();
}

2
app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/AlertDelete.java
View File

@ -4,8 +4,6 @@ import javafx.scene.control.Alert;
import javafx.scene.control.ButtonBar;
import javafx.scene.control.ButtonType;
import java.io.IOException;
public class AlertDelete extends Alert {
ButtonType yesButton = new ButtonType("Ja", ButtonBar.ButtonData.YES);
ButtonType noButton = new ButtonType("Nein", ButtonBar.ButtonData.NO);

1
app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/TournamentListController.java
View File

@ -61,6 +61,7 @@ public class TournamentListController extends FXController {
@FXML
void openTournament(ActionEvent event) {
removeListener();
FileIO.TournamentFile tournamentFile = tournamentListView.getSelectionModel().getSelectedItems().get(0);
getFactoryDecorator().openTournament(tournamentFile);
}

37
app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/Game.fxml
View File

@ -7,29 +7,37 @@
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.VBox?>
<VBox alignment="CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="150.0" prefWidth="200.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="GameContoller">
<VBox alignment="CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="90.0" prefWidth="450.0" style="-fx-border-color: black; -fx-border-insets: 2; -fx-border-width: 3;" xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView.GameController">
<children>
<VBox fx:id="mainVBox" alignment="CENTER" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="90.0">
<children>
<Label fx:id="teamNameOne" text="Team One" />
<HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
<children>
<Label text="Points">
<Label fx:id="participantNameOne" style="-fx-font-weight: bold;" text="Participant One">
<HBox.margin>
<Insets right="20.0" />
</HBox.margin>
</Label>
<TextField fx:id="pointsTeamOne" prefHeight="25.0" prefWidth="50.0" />
</children>
</HBox>
<Label fx:id="teamNameTwo" text="Team Two" />
<HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
<children>
<Label text="Points">
<TextField fx:id="pointsTeamOne" alignment="CENTER" onKeyTyped="#saveGameResult" prefHeight="25.0" prefWidth="50.0">
<HBox.margin>
<Insets right="20.0" />
</HBox.margin>
</TextField>
<Label text=":">
<HBox.margin>
<Insets right="20.0" />
</HBox.margin>
</Label>
<TextField fx:id="pointsTeamTwo" alignment="CENTER" onKeyTyped="#saveGameResult" prefHeight="25.0" prefWidth="50.0">
<HBox.margin>
<Insets right="20.0" />
</HBox.margin>
</TextField>
<Label fx:id="participantNameTwo" style="-fx-font-weight: bold;" text="Participant Two">
<HBox.margin>
<Insets right="20.0" />
</HBox.margin>
</Label>
<TextField fx:id="pointsTeamTwo" prefHeight="25.0" prefWidth="50.0" />
</children>
</HBox>
<HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
@ -41,6 +49,11 @@
</Label>
<ChoiceBox fx:id="placesChoiceBox" prefWidth="150.0" />
</children>
<VBox.margin>
<Insets top="10.0" />
</VBox.margin>
</HBox>
</children>
</VBox>
</children>
</VBox>

35
app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/GameSchedule.fxml
View File

@ -1,26 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.geometry.*?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView.GameScheduleController">
<BorderPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/11.0.2" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView.GameScheduleController">
<top>
<HBox alignment="CENTER_RIGHT" prefHeight="100.0" prefWidth="200.0" BorderPane.alignment="CENTER">
<HBox alignment="TOP_RIGHT" prefHeight="100.0" prefWidth="200.0" BorderPane.alignment="CENTER">
<children>
<Button mnemonicParsing="false" onAction="#openParticipantFormular" text="Teilnehmer bearbeiten">
<CheckBox fx:id="treeView" mnemonicParsing="false" onAction="#changeView" selected="true" text="Baumansicht" />
<Button fx:id="createScheduleBtn" mnemonicParsing="false" onAction="#createNewSchedule" text="Create New Game Schedule">
<HBox.margin>
<Insets right="20.0" />
</HBox.margin>
</Button>
<Button mnemonicParsing="false" onAction="#openPlacesFormular" text="Orte bearbeiten">
<Button fx:id="editParticipantBtn" mnemonicParsing="false" onAction="#openParticipantFormular" text="Teilnehmer bearbeiten">
<HBox.margin>
<Insets right="40.0" />
<Insets right="20.0" />
</HBox.margin>
</Button>
<Button fx:id="editLocBtn" mnemonicParsing="false" onAction="#openPlacesFormular" text="Orte bearbeiten">
<HBox.margin>
<Insets right="20.0" />
</HBox.margin>
</Button>
<Button fx:id="closeTournamentBtn" layoutX="470.0" layoutY="10.0" mnemonicParsing="false" onAction="#closeTournament" text="Close Tournament">
<HBox.margin>
<Insets right="20.0" />
</HBox.margin></Button>
</children>
</HBox>
</top>
<center>
<ScrollPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER">
<content>
<HBox fx:id="hBoxCenter" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="324.0" prefWidth="600.0" />
</content>
</ScrollPane>
</center>
</BorderPane>