Merge branch 'main' into FileIO

app/build.gradle

@@ -9,6 +9,12 @@
 plugins {
     // Apply the application plugin to add support for building a CLI application in Java.
     id 'application'
+    id 'org.openjfx.javafxplugin' version '0.0.12'
+}
+
+javafx {
+    version = '17.0.1'
+    modules = [ 'javafx.controls', 'javafx.fxml' ]
 }
 
 repositories {
@@ -22,6 +28,8 @@ dependencies {
 
     // This dependency is used by the application.
     implementation 'com.google.guava:guava:30.1.1-jre'
+
+
 }
 
 application {

app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/App.java

@@ -3,18 +3,11 @@
  */
 package ch.zhaw.projekt2.turnierverwaltung;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
+import ch.zhaw.projekt2.turnierverwaltung.main.MainWindow;
+import javafx.application.Application;
 
 public class App {
-    public String getGreeting() {
-        return "Hello World!";
-    }
-
     public static void main(String[] args) {
-        System.out.println(new App().getGreeting());
-
-        FileIO io = new FileIO(System.getProperty("user.dir") + "/tournierverwaltung_angrynerds");
+        Application.launch(MainWindow.class,args);
     }
 }

app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FXController.java

@@ -0,0 +1,47 @@
+package ch.zhaw.projekt2.turnierverwaltung;
+
+import javafx.scene.layout.Pane;
+
+public abstract class FXController {
+    TournamentDecorator tournamentDecorator;
+    FactoryDecorator factoryDecorator;
+    FileIO fileIO;
+    Pane pane;
+
+    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();
+            }
+        });
+    }
+
+    public abstract void loadContent();
+
+    protected TournamentDecorator getTournamentDecorator() {
+        return tournamentDecorator;
+    }
+
+    protected FactoryDecorator getFactoryDecorator() {
+        return factoryDecorator;
+    }
+
+    protected FileIO getFileIO() {
+        return fileIO;
+    }
+
+    protected Pane getPane() {
+        return pane;
+    }
+}

app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Factory.java

@@ -0,0 +1,75 @@
+package ch.zhaw.projekt2.turnierverwaltung;
+
+import ch.zhaw.projekt2.turnierverwaltung.main.tournamentList.TournamentListController;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.layout.BorderPane;
+
+import java.io.IOException;
+import java.net.URL;
+
+public class Factory {
+    private TournamentDecorator tournamentDecorator;
+    private FileIO fileIO;
+
+    public Factory(FileIO fileIO, TournamentDecorator tournamentDecorator){
+        this.fileIO = fileIO;
+        this.tournamentDecorator = tournamentDecorator;
+    }
+
+    public TournamentDecorator getTournamentDecorator() {
+        return tournamentDecorator;
+    }
+
+    public void setTournament(Tournament tournament) {
+        this.tournamentDecorator.setTournament(tournament);
+    }
+
+    public BorderPane loadMainWindow(){
+        FXMLLoader loader = new FXMLLoader(getClass().getResource("mainWindow.fxml"));
+        try {
+            return loader.load();
+        } catch (IOException e) {
+            e.printStackTrace();
+            //TODO handle and logging
+        }
+        return null;
+    }
+
+    public void loadTournamentList(BorderPane pane, FactoryDecorator factoryDecorator){
+        tournamentDecorator.setTournament(null);
+        TournamentListController controller = (TournamentListController) setCenterOfBorderPane(pane, getClass().getResource("tournamentList/tournamentList.fxml"), factoryDecorator);
+    }
+
+    //Can be used to Open new Scene in same Stage.
+    //This way possible to later give object to Controller
+    public void loadParticipantFormular(BorderPane pane, FactoryDecorator factoryDecorator) {
+        setCenterOfBorderPane(pane, getClass().getResource("participantAddFormular/participantFormular.fxml"), factoryDecorator);
+    }
+
+    public void loadPlacesFormular(BorderPane pane, FactoryDecorator factoryDecorator) {
+        setCenterOfBorderPane(pane, getClass().getResource("placesAddFormular/PlacesFormular.fxml"), factoryDecorator);
+    }
+
+    public void loadGameScheduler(BorderPane pane, FactoryDecorator factoryDecorator) {
+        setCenterOfBorderPane(pane, getClass().getResource("gameScheduleView/GameSchedule.fxml"), factoryDecorator);
+    }
+
+    private FXController setCenterOfBorderPane(BorderPane pane, URL location, FactoryDecorator factoryDecorator) {
+        FXController controller = null;
+        try {
+            FXMLLoader loader = new FXMLLoader(location);
+            pane.setCenter(loader.load());
+            controller = loader.getController();
+            controller.setup(tournamentDecorator, fileIO, factoryDecorator, pane);
+            controller.loadContent();
+        } catch (IOException e) {
+            e.printStackTrace();
+            //TODO handle and logging?
+        }
+        return controller;
+    }
+
+
+
+
+}

app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java

@@ -0,0 +1,69 @@
+package ch.zhaw.projekt2.turnierverwaltung;
+
+import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.Pane;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class FactoryDecorator implements IsObservable{
+    private Factory factory;
+    private FileIO fileIO;
+    private Pane pane;
+    private List<IsObserver> listener = new ArrayList<>();
+
+    public FactoryDecorator(FileIO fileIO, Factory factory, Pane pane){
+        setFactory(factory);
+        setFileIO(fileIO);
+        setPane(pane);
+    }
+
+    public void setFileIO(FileIO fileIO) {
+        this.fileIO = fileIO;
+    }
+
+    public void setFactory(Factory factory) {
+        this.factory = factory;
+    }
+
+    public void setPane(Pane pane) {
+        this.pane = pane;
+    }
+
+    @Override
+    public void addListener(IsObserver observer) {
+        listener.add(observer);
+    }
+
+    @Override
+    public void removeListener(IsObserver observer) {
+        listener.remove(observer);
+    }
+
+    public void openTournament(FileIO.TournamentFile tournamentFile){
+        try {
+            factory.setTournament(fileIO.loadTournament(tournamentFile));
+            factory.loadGameScheduler((BorderPane) pane, this);
+            informListener();
+        } catch (IOException e) {
+            e.printStackTrace();
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        } //TODO handle and logging
+    }
+
+    public void openParticipantFormular() {
+        factory.loadParticipantFormular((BorderPane) pane, this);
+    }
+
+    public void openPlacesFormular() {
+        factory.loadPlacesFormular((BorderPane) pane, this);
+    }
+
+    public void informListener() {
+        for(IsObserver observer : listener) {
+            observer.update();
+        }
+    }
+}

app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FileIO.java

@@ -1,7 +1,12 @@
 package ch.zhaw.projekt2.turnierverwaltung;
 
 
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+
 import java.io.*;
+import java.net.URI;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.logging.Logger;
@@ -43,9 +48,22 @@ public class FileIO {
      *
      * @return List with all containing save Files
      */
-    public List<File> getList() {
+    public ObservableList<TournamentFile> getList() {
         logger.fine("Creating a List out of all Files in the save directory and returning it");
-        return Arrays.asList(saves.listFiles());
+        ObservableList<TournamentFile> tournamentFiles = FXCollections.observableArrayList();
+        for(File tournament : saves.listFiles()){
+            tournamentFiles.add(new TournamentFile(tournament.toURI()));
+        }
+        return tournamentFiles;
+    }
+
+    public boolean tournamentExists(String name){
+        for(TournamentFile file : getList()) {
+            if(file.toString().toLowerCase().equals(name.toLowerCase())){
+                return true;
+            }
+        }
+        return false;
     }
 
     /**
@@ -154,6 +172,17 @@ public class FileIO {
             logger.warning("Failed to delete requested File");
             throw new FileNotFoundException("File deletion unsuccessful");
         }
+  
+    public class TournamentFile extends File{
+
+        public TournamentFile(URI uri) {
+            super(uri);
+        }
+
+        public String toString(){
+            return getName().split("\\.")[0];
+        }
+
     }
 
 }

app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Game.java

@@ -1,6 +1,8 @@
 package ch.zhaw.projekt2.turnierverwaltung;
 
-public class Game {
+import java.io.Serializable;
+
+public class Game implements Serializable {
     private Participant participant1, Participant2;
     private int points1, points2;
     private Location location;

app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/InvalidNameException.java

@@ -0,0 +1,12 @@
+package ch.zhaw.projekt2.turnierverwaltung;
+
+public class InvalidNameException extends Exception {
+    public InvalidNameException() {
+        super();
+    }
+
+    public InvalidNameException(String errorMessage) {
+        super(errorMessage);
+    }
+
+}

app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/IsObservable.java

@@ -0,0 +1,19 @@
+package ch.zhaw.projekt2.turnierverwaltung;
+
+/**
+ * Most basic interface for observing an object
+ * @author bles
+ *
+ */
+public interface IsObservable {
+    /**
+     * Add an observer that listens for updates
+     * @param observer
+     */
+    void addListener(IsObserver observer);
+    /**
+     * Remove an observer from the list
+     * @param observer
+     */
+    void removeListener(IsObserver observer);
+}

app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/IsObserver.java

@@ -0,0 +1,14 @@
+package ch.zhaw.projekt2.turnierverwaltung;
+
+/**
+ * Most basic interface for beeing an observer
+ * @author bles
+ *
+ */
+public interface IsObserver {
+    /**
+     * This method is always called when an observed object
+     * changes
+     */
+    void update();
+}

app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Participant.java

@@ -1,6 +1,9 @@
 package ch.zhaw.projekt2.turnierverwaltung;
 
-public interface Participant {
+import java.io.Serializable;
+
+public interface Participant extends Serializable {
     String getName();
     void setName(String name);
+    boolean equals(Participant participant);
 }

app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Person.java

@@ -1,11 +1,23 @@
 package ch.zhaw.projekt2.turnierverwaltung;
 
-public class Person {
+import java.io.Serializable;
+
+public class Person implements Serializable {
+    private final String NAME_MATCHING_REGEX = "[a-zA-Z]{1,20}";
+    private final String PHONE_MATCHING_REGEX = "[\\+0-9]+";
+
     private String name;
     private String firstName;
     private String phoneNumber;
 
-    public Person(String firstName, String name, String phoneNumber){
+    public Person(String firstName, String name, String phoneNumber) throws InvalidNameException, InvalidPhoneNumberException {
+        if(!firstName.matches(NAME_MATCHING_REGEX)){
+            throw new InvalidNameException("The First name is Invalid.");
+        } else if(!name.matches(NAME_MATCHING_REGEX)){
+            throw new InvalidNameException("The Last name is Invalid");
+        } else if(!phoneNumber.matches(PHONE_MATCHING_REGEX)){
+            throw new InvalidPhoneNumberException("The entered Phone Number is invalid.");
+        }
         setFirstName(firstName);
         setName(name);
         setPhoneNumber(phoneNumber);
@@ -34,4 +46,21 @@ public class Person {
     public void setPhoneNumber(String phoneNumber) {
         this.phoneNumber = phoneNumber;
     }
+
+    public class InvalidPhoneNumberException extends Exception {
+        public InvalidPhoneNumberException() {
+            super();
+        }
+
+        public InvalidPhoneNumberException(String errorMessage) {
+            super(errorMessage);
+        }
+
+    }
+
+    @Override
+    public String toString(){
+        return firstName + " " + name;
+    }
+
 }

app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Player.java

@@ -1,21 +1,40 @@
 package ch.zhaw.projekt2.turnierverwaltung;
 
-import java.util.Date;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 
 public class Player extends Person implements Participant{
 
-    private Date dateOfBirth;
+    private LocalDate dateOfBirth;
 
-    public Player(String firstName, String name, String phoneNumber, Date dateOfBirth){
+    public Player(String firstName, String name, String phoneNumber, String dateOfBirth) throws InvalidNameException, InvalidPhoneNumberException {
         super(firstName, name, phoneNumber);
         setDateOfBirth(dateOfBirth);
     }
 
-    public Date getDateOfBirth() {
+    public LocalDate getDateOfBirth() {
         return dateOfBirth;
     }
 
-    public void setDateOfBirth(Date dateOfBirth) {
-        this.dateOfBirth = dateOfBirth;
+    public String getFormatedDateOfBirth(){
+        try{
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd.MM.yyyy");
+            return dateOfBirth.format(formatter);
+        } catch (Exception e) {
+           //todo handle and logging
+            return "";
+        }
+    }
+
+    public void setDateOfBirth(String dateOfBirth) {
+        String[] date = dateOfBirth.split("\\.");
+        this.dateOfBirth = LocalDate.of(Integer.valueOf(date[2]), Integer.valueOf(date[1]), Integer.valueOf(date[0]));
+    }
+
+    @Override
+    public boolean equals(Participant participant) {
+        return getClass().equals(participant.getClass()) && toString().toLowerCase().equals(participant.toString().toLowerCase());
     }
 }

app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Team.java

@@ -27,6 +27,11 @@ public class Team implements Participant {
         this.name = name;
     }
 
+    @Override
+    public boolean equals(Participant participant) {
+        return getClass().equals(participant.getClass()) && toString().toLowerCase().equals(participant.toString().toLowerCase());
+    }
+
     public Person getContactPerson() {
         return contactPerson;
     }
@@ -34,4 +39,9 @@ public class Team implements Participant {
     public void setContactPerson(Person contactPerson) {
         this.contactPerson = contactPerson;
     }
+
+    @Override
+    public String toString(){
+        return name;
+    }
 }

app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java

@@ -1,12 +1,53 @@
 package ch.zhaw.projekt2.turnierverwaltung;
 
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+
+import java.io.File;
 import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 public class Tournament implements Serializable {
     private String name;
+    private Type type;
+    private List<Participant> participants;
+
+
+
+    public Tournament(String name, Type type) throws InvalidNameException, InvalidTypeException {
+        if(!name.matches("[\\w]{1,20}")){
+            throw new InvalidNameException("Invalid Name entered"); //TODO handle en logging.
+        } else if(!Arrays.asList(Type.values()).contains(type)){
+            throw new InvalidTypeException("Invalid Type selected"); //TODO handle en logging.
+        }
 
-    public Tournament(String name){
         setName(name);
+        setType(type);
+        participants = new ArrayList<>();
+    }
+
+    public void addParticipant(Participant newParticipant) throws ParticipantExistsException {
+        for(Participant participant : participants){
+            if(participant.equals(newParticipant)){
+                participants.remove(participant);
+            }
+        }
+        participants.add(newParticipant);
+    }
+
+    public void removeParticipant(Participant participant) throws ParticipantNotExistsException {
+        if(!participants.contains(participant)){
+            throw new ParticipantNotExistsException("The given Participant is not part of this Tournament");
+        }
+        participants.remove(participant);
+    }
+
+    public ObservableList<Participant> getParticipants() {
+        ObservableList<Participant> participantsObservable = FXCollections.observableArrayList();
+        participantsObservable.addAll(participants);
+        return participantsObservable;
     }
 
     public String getName() {
@@ -16,4 +57,68 @@ public class Tournament implements Serializable {
     public void setName(String name) {
         this.name = name;
     }
+
+    public Type getType() {
+        return type;
+    }
+
+    public void setType(Type type) {
+        this.type = type;
+    }
+
+    public enum Type {
+        KO("KO-System"), GROUPS("Gruppenspiele");
+
+        private String name;
+
+        private Type(String name) {
+            this.name = name;
+        }
+
+        @Override
+        public String toString() {
+            return name;
+        }
+
+        public static ObservableList<Type> getObservableList(){
+            ObservableList<Type> items = FXCollections.observableArrayList();
+            items.addAll(values());
+            return items;
+        }
+    }
+
+    public class InvalidTypeException extends Exception {
+        public InvalidTypeException() {
+            super();
+        }
+
+        public InvalidTypeException(String errorMessage) {
+            super(errorMessage);
+        }
+
+    }
+
+    public class ParticipantExistsException extends Exception {
+        public ParticipantExistsException() {
+            super();
+        }
+
+        public ParticipantExistsException(String errorMessage) {
+            super(errorMessage);
+        }
+
+    }
+
+    public class ParticipantNotExistsException extends Exception {
+        public ParticipantNotExistsException() {
+            super();
+        }
+
+        public ParticipantNotExistsException(String errorMessage) {
+            super(errorMessage);
+        }
+
+    }
+
+
 }

app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/TournamentDecorator.java

@@ -0,0 +1,109 @@
+package ch.zhaw.projekt2.turnierverwaltung;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class TournamentDecorator implements IsObservable{
+    private Tournament tournament;
+    private FileIO fileIO;
+    private List<IsObserver> listener = new ArrayList<>();
+
+    public TournamentDecorator(FileIO fileIO){
+        setFileIO(fileIO);
+        addListener(new IsObserver() {
+            @Override
+            public void update() {
+                if(tournament != null){
+                    saveTournament();
+                }
+            }
+        });
+    }
+
+    public void setFileIO(FileIO fileIO) {
+        this.fileIO = fileIO;
+    }
+
+    public void setTournament(Tournament tournament) {
+        this.tournament = tournament;
+    }
+
+    public Tournament getTournament() {
+        return tournament;
+    }
+
+    @Override
+    public void addListener(IsObserver observer) {
+        listener.add(observer);
+    }
+
+    @Override
+    public void removeListener(IsObserver observer) {
+        listener.remove(observer);
+    }
+
+    public void saveTournament(){
+        try {
+            fileIO.saveTournament(tournament);
+        } catch (IOException e) {
+            e.printStackTrace(); //TODO handle and logging
+        }
+    }
+
+    public void createTournament(String name, Tournament.Type type){
+        if(fileIO.tournamentExists(name)){
+            System.out.println("Tournament with same name exists already.");
+            return; //TODO handle and logging
+        }
+        try {
+            Tournament tournament = new Tournament(name, type);
+            fileIO.saveTournament(tournament);
+            informListener();
+        } catch (InvalidNameException e) {
+            e.printStackTrace(); //TODO handle and logging
+        } catch (Tournament.InvalidTypeException e) {
+            e.printStackTrace(); //TODO handle and logging
+        } catch (IOException e) {
+            e.printStackTrace(); //TODO handle and logging
+        }
+    }
+
+    public void deleteTournament(FileIO.TournamentFile tournamentFile){
+        try {
+            fileIO.deleteTournament(tournamentFile);
+            informListener();
+        } catch (IOException e) {
+            e.printStackTrace();  //TODO handle and logging
+        }
+    }
+
+    public void savePlayer(String firstName, String name, String phoneNumber, String dateOfBirth){
+        try {
+            tournament.addParticipant(new Player(firstName, name, phoneNumber, dateOfBirth));
+            informListener();
+        } catch (Tournament.ParticipantExistsException e) {
+            e.printStackTrace(); //TODO handle and logging
+        } catch (InvalidNameException e) {
+            e.printStackTrace(); //TODO handle and logging
+        } catch (Person.InvalidPhoneNumberException e) {
+            e.printStackTrace(); //TODO handle and logging
+        }
+    }
+
+    public void deleteParticipant(Participant participant){
+        try {
+            tournament.removeParticipant(participant);
+            informListener();
+        } catch (Tournament.ParticipantNotExistsException e) {
+            e.printStackTrace(); //TODO handle and logging
+        }
+    }
+
+    public void informListener() {
+        for(IsObserver observer : listener) {
+            observer.update();
+        }
+    }
+}

app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.java

@@ -0,0 +1,40 @@
+package ch.zhaw.projekt2.turnierverwaltung.main;
+
+import ch.zhaw.projekt2.turnierverwaltung.Factory;
+import ch.zhaw.projekt2.turnierverwaltung.FactoryDecorator;
+import ch.zhaw.projekt2.turnierverwaltung.FileIO;
+import ch.zhaw.projekt2.turnierverwaltung.TournamentDecorator;
+import javafx.application.Application;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Scene;
+import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.Pane;
+import javafx.stage.Stage;
+
+import java.awt.*;
+import java.io.IOException;
+
+public class MainWindow extends Application {
+    private FileIO fileIO = new FileIO(System.getProperty("user.dir") + "/tournierverwaltung_angrynerds");
+    private TournamentDecorator tournamentDecorator = new TournamentDecorator(fileIO);
+    private Factory factory = new Factory(fileIO, tournamentDecorator); //TODO make it private!
+    private FactoryDecorator factoryDecorator;
+
+    @Override
+    public void start(Stage primaryStage) throws Exception {
+
+        BorderPane pane = factory.loadMainWindow();
+        factoryDecorator = new FactoryDecorator(fileIO, factory, pane);
+        factory.loadTournamentList(pane, factoryDecorator);
+
+
+        Scene scene = new Scene(pane);
+        primaryStage.setScene(scene);
+        primaryStage.setMaximized(true);
+        primaryStage.setResizable(false);
+        primaryStage.setFullScreen(false);
+        primaryStage.show();
+    }
+
+
+}

app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindowController.java

@@ -0,0 +1,23 @@
+package ch.zhaw.projekt2.turnierverwaltung.main;
+
+import ch.zhaw.projekt2.turnierverwaltung.FXController;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+
+public class MainWindowController extends FXController {
+
+    @FXML
+    void changeLangToGerman(ActionEvent event) {
+
+    }
+
+    @FXML
+    void closeApplication(ActionEvent event) {
+
+    }
+
+    @Override
+    public void loadContent() {
+
+    }
+}

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

@@ -0,0 +1,16 @@
+package ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView;
+
+import ch.zhaw.projekt2.turnierverwaltung.FXController;
+import javafx.fxml.FXML;
+import javafx.scene.control.ChoiceBox;
+
+public class GameController extends FXController {
+
+    @FXML
+    private ChoiceBox<?> placesChoiceBox;
+
+    @Override
+    public void loadContent() {
+
+    }
+}

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

@@ -0,0 +1,24 @@
+package ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView;
+
+import ch.zhaw.projekt2.turnierverwaltung.FXController;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+
+public class GameScheduleController extends FXController {
+
+    @FXML
+    void openPlacesFormular(ActionEvent event) {
+        getFactoryDecorator().openPlacesFormular();
+    }
+
+    @FXML
+    void openParticipantFormular(ActionEvent event) {
+        getFactoryDecorator().openParticipantFormular();
+    }
+
+    @Override
+    public void loadContent() {
+
+    }
+}
+

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

@@ -0,0 +1,106 @@
+package ch.zhaw.projekt2.turnierverwaltung.main.participantAddFormular;
+
+import ch.zhaw.projekt2.turnierverwaltung.FXController;
+import ch.zhaw.projekt2.turnierverwaltung.Participant;
+import ch.zhaw.projekt2.turnierverwaltung.Player;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.ListView;
+import javafx.scene.control.TextField;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.VBox;
+
+public class ParticipantFormularController extends FXController {
+
+    @FXML
+    private Button addBtn;
+
+    @FXML
+    private Label birthDateLabel;
+
+    @FXML
+    private TextField birthDateTextField;
+
+    @FXML
+    private VBox changeBtn;
+
+    @FXML
+    private Label firstNameLabel;
+
+    @FXML
+    private TextField firstNameTextField;
+
+    @FXML
+    private GridPane grid;
+
+    @FXML
+    private Label newParticipantFormularTitle;
+
+    @FXML
+    private Button closeBtn;
+
+    @FXML
+    private Button deleteBtn;
+
+
+    @FXML
+    private Label participantListTitle;
+
+    @FXML
+    private ListView<Participant> participantListView;
+
+    @FXML
+    private Label participantNameLabel;
+
+    @FXML
+    private TextField participantNameTextField;
+
+    @FXML
+    private Label phoneNumberLabel;
+
+    @FXML
+    private TextField phoneNumberTextField;
+
+    @FXML
+    private Button saveBtn;
+
+    @FXML
+    void changedSelection(MouseEvent event){
+        Player participant = (Player) participantListView.getSelectionModel().getSelectedItems().get(0);
+        participantNameTextField.setText(participant.getName());
+        firstNameTextField.setText(participant.getFirstName());
+        phoneNumberTextField.setText(participant.getPhoneNumber());
+        birthDateTextField.setText(participant.getFormatedDateOfBirth());
+    }
+
+    @FXML
+    void changeParticipant(MouseEvent event) {
+
+    }
+
+    @FXML
+    void saveParticipant(ActionEvent event) {
+        getTournamentDecorator().savePlayer(firstNameTextField.getText(), participantNameTextField.getText(), phoneNumberTextField.getText(), birthDateTextField.getText());
+    }
+
+
+    @FXML
+    void delete(ActionEvent event) {
+        System.out.println("delete");
+        Participant participant = participantListView.getSelectionModel().getSelectedItems().get(0);
+        getTournamentDecorator().deleteParticipant(participant);
+    }
+
+    @FXML
+    void close(ActionEvent event) {
+
+    }
+
+    @Override
+    public void loadContent() {
+        participantListView.setItems(getTournamentDecorator().getTournament().getParticipants());
+    }
+}

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

@@ -0,0 +1,66 @@
+package ch.zhaw.projekt2.turnierverwaltung.main.placesAddFormular;
+
+import ch.zhaw.projekt2.turnierverwaltung.FXController;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.ListView;
+import javafx.scene.control.TextField;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.layout.GridPane;
+
+public class PlacesFormularController extends FXController {
+
+    @FXML
+    private Label AddListTitle;
+
+    @FXML
+    private Button closeBtn;
+
+    @FXML
+    private Button deleteBtn;
+
+    @FXML
+    private GridPane grid;
+
+    @FXML
+    private ListView<?> locationListView;
+
+    @FXML
+    private Label locationNameLabel;
+
+    @FXML
+    private TextField locationNameTextField;
+
+    @FXML
+    private Label newLocationFormularTitle;
+
+    @FXML
+    private Button saveBtn;
+
+    @FXML
+    void changedSelection(MouseEvent event) {
+
+    }
+
+    @FXML
+    void closeFormular(ActionEvent event) {
+
+    }
+
+    @FXML
+    void deleteSelectedPlace(ActionEvent event) {
+
+    }
+
+    @FXML
+    void saveLocation(ActionEvent event) {
+
+    }
+
+    @Override
+    public void loadContent() {
+
+    }
+}

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

@@ -0,0 +1,34 @@
+package ch.zhaw.projekt2.turnierverwaltung.main.tournamentList;
+
+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);
+    Boolean result;
+
+    public AlertDelete(String name){
+        super(Alert.AlertType.WARNING);
+        setTitle("Entfernen");
+        setHeaderText("Turnier entfernen?");
+        setContentText("Sind Sie sicher, dass sie das Turnier " + name + " entfernen wollen?\n" +
+                "Nach diesem Vorgang kann es nicht wiederhergestellt werden.");
+        getButtonTypes().setAll(yesButton, noButton);
+    }
+
+    public boolean showAndGetResult() {
+        result = false;
+        showAndWait().ifPresent(type -> {
+            if (type == yesButton) {
+                result = true;
+            }
+        });
+        return result;
+    }
+
+
+}

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

@@ -0,0 +1,83 @@
+package ch.zhaw.projekt2.turnierverwaltung.main.tournamentList;
+
+import ch.zhaw.projekt2.turnierverwaltung.FXController;
+import ch.zhaw.projekt2.turnierverwaltung.FileIO;
+import ch.zhaw.projekt2.turnierverwaltung.Tournament;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.control.*;
+import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.GridPane;
+
+import java.io.File;
+import java.io.IOException;
+
+public class TournamentListController extends FXController {
+
+    @FXML
+    public void initialize(){
+        modusChoiceBox.setItems(Tournament.Type.getObservableList());
+    }
+
+    @FXML
+    private Button createBtn;
+
+    @FXML
+    private GridPane grid;
+
+    @FXML
+    private ChoiceBox<Tournament.Type> modusChoiceBox;
+
+    @FXML
+    private Label newTournamentFormularTitle;
+
+    @FXML
+    private Button openBtn;
+
+    @FXML
+    private Button deleteBtn;
+
+    @FXML
+    private Label tournamentListTitle;
+
+    @FXML
+    private ListView<FileIO.TournamentFile> tournamentListView;
+
+    @FXML
+    private Label tournamentModLabel;
+
+    @FXML
+    private Label tournamentNameLabel;
+
+    @FXML
+    private TextField tournamentNameField;
+
+    @FXML
+    void createTournament(ActionEvent event) {
+        getTournamentDecorator().createTournament(tournamentNameField.getText(), modusChoiceBox.getValue());
+    }
+
+    @FXML
+    void openTournament(ActionEvent event) {
+        FileIO.TournamentFile tournamentFile = tournamentListView.getSelectionModel().getSelectedItems().get(0);
+        getFactoryDecorator().openTournament(tournamentFile);
+    }
+
+    @FXML
+    void deleteTournament(ActionEvent event) {
+        FileIO.TournamentFile tournamentFile = tournamentListView.getSelectionModel().getSelectedItems().get(0);
+        AlertDelete alert = new AlertDelete(tournamentFile.toString());
+        if(alert.showAndGetResult()){
+           getTournamentDecorator().deleteTournament(tournamentFile);
+        }
+    }
+
+    @Override
+    public void loadContent() {
+        tournamentListView.setItems(getFileIO().getList());
+        tournamentNameField.clear();
+    }
+}
+

app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/MainWindow.fxml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.Menu?>
+<?import javafx.scene.control.MenuBar?>
+<?import javafx.scene.control.MenuItem?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
+
+<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.MainWindowController">
+   <top>
+      <VBox alignment="TOP_CENTER" prefHeight="86.0" prefWidth="600.0" BorderPane.alignment="CENTER">
+         <children>
+            <MenuBar>
+               <menus>
+                  <Menu mnemonicParsing="false" text="Start">
+                     <items>
+                        <Menu mnemonicParsing="false" text="Sprache">
+                           <items>
+                              <MenuItem mnemonicParsing="false" onAction="#changeLangToGerman" text="Deutsch" />
+                           </items>
+                        </Menu>
+                        <MenuItem mnemonicParsing="false" onAction="#closeApplication" text="Close" />
+                     </items>
+                  </Menu>
+               </menus>
+            </MenuBar>
+            <Label text="Turnier Manager">
+               <font>
+                  <Font name="System Bold" size="40.0" />
+               </font>
+            </Label>
+         </children>
+      </VBox>
+   </top>
+</BorderPane>

app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/Style.css

@@ -0,0 +1,10 @@
+#mainContainer {
+    -fx-min-height: 100%;
+    -fx-min-width: 100%;
+    -fx-background-color: #f8f8f8;
+
+}
+
+/*
+Formular Right Side
+ */

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

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.ChoiceBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TextField?>
+<?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">
+   <children>
+      <Label fx:id="teamNameOne" text="Team One" />
+      <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
+         <children>
+            <Label text="Points">
+               <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">
+               <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">
+         <children>
+            <Label text="Ort">
+               <HBox.margin>
+                  <Insets right="20.0" />
+               </HBox.margin>
+            </Label>
+            <ChoiceBox fx:id="placesChoiceBox" prefWidth="150.0" />
+         </children>
+      </HBox>
+   </children>
+</VBox>

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

@@ -0,0 +1,26 @@
+<?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?>
+
+
+<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">
+   <top>
+      <HBox alignment="CENTER_RIGHT" prefHeight="100.0" prefWidth="200.0" BorderPane.alignment="CENTER">
+         <children>
+            <Button mnemonicParsing="false" onAction="#openParticipantFormular" text="Teilnehmer bearbeiten">
+               <HBox.margin>
+                  <Insets right="20.0" />
+               </HBox.margin>
+            </Button>
+            <Button mnemonicParsing="false" onAction="#openPlacesFormular" text="Orte bearbeiten">
+               <HBox.margin>
+                  <Insets right="40.0" />
+               </HBox.margin>
+            </Button>
+         </children>
+      </HBox>
+   </top>
+</BorderPane>

app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/participantAddFormular/participantFormular.fxml

@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.ListView?>
+<?import javafx.scene.control.Separator?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.RowConstraints?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
+
+<HBox alignment="CENTER" VBox.vgrow="ALWAYS" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/17" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.participantAddFormular.ParticipantFormularController">
+   <children>
+      <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
+         <children>
+            <Label fx:id="participantListTitle" text="Hinzugefügt">
+               <font>
+                  <Font name="System Bold" size="21.0" />
+               </font>
+               <VBox.margin>
+                  <Insets bottom="20.0" />
+               </VBox.margin>
+            </Label>
+            <ListView fx:id="participantListView" onMouseClicked="#changedSelection" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
+               <VBox.margin>
+                  <Insets />
+               </VBox.margin>
+            </ListView>
+            <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
+               <children>
+                  <Button fx:id="closeBtn" mnemonicParsing="false" onAction="#close" text="Schliessen">
+                     <HBox.margin>
+                        <Insets right="40.0" />
+                     </HBox.margin>
+                  </Button>
+                  <Button fx:id="deleteBtn" mnemonicParsing="false" onAction="#delete" text="Löschen">
+                     <HBox.margin>
+                        <Insets right="40.0" />
+                     </HBox.margin>
+                  </Button>
+               </children>
+            </HBox>
+         </children>
+         <HBox.margin>
+            <Insets left="40.0" />
+         </HBox.margin>
+      </VBox>
+      <Separator orientation="VERTICAL" prefHeight="200.0">
+         <HBox.margin>
+            <Insets left="10.0" right="10.0" />
+         </HBox.margin>
+      </Separator>
+      <VBox fx:id="changeBtn" alignment="TOP_CENTER" onDragDetected="#changeParticipant" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
+         <children>
+            <Label fx:id="newParticipantFormularTitle" text="Teilnehmer ändern/erstellen">
+               <font>
+                  <Font name="System Bold" size="21.0" />
+               </font>
+               <VBox.margin>
+                  <Insets bottom="40.0" />
+               </VBox.margin>
+            </Label>
+            <Separator prefWidth="200.0" />
+            <GridPane fx:id="grid" prefHeight="200.0">
+               <columnConstraints>
+                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+               </columnConstraints>
+               <rowConstraints>
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+               </rowConstraints>
+               <children>
+                  <Label fx:id="participantNameLabel" styleClass="lableGrid" text="Name">
+                     <GridPane.margin>
+                        <Insets />
+                     </GridPane.margin>
+                  </Label>
+                  <TextField fx:id="participantNameTextField" styleClass="inputGrid" GridPane.columnIndex="1">
+                     <GridPane.margin>
+                        <Insets />
+                     </GridPane.margin>
+                  </TextField>
+                  <Label fx:id="firstNameLabel" styleClass="lableGrid" text="Vorname" GridPane.rowIndex="1">
+                     <GridPane.margin>
+                        <Insets />
+                     </GridPane.margin>
+                  </Label>
+                  <TextField fx:id="firstNameTextField" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+                  <TextField fx:id="phoneNumberTextField" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+                  <TextField fx:id="birthDateTextField" GridPane.columnIndex="1" GridPane.rowIndex="3" />
+                  <Label fx:id="phoneNumberLabel" text="Telefonnummer" GridPane.rowIndex="2" />
+                  <Label fx:id="birthDateLabel" text="Geb. Datum" GridPane.rowIndex="3" />
+               </children>
+            </GridPane>
+            <Separator prefWidth="200.0" />
+            <Button fx:id="saveBtn" alignment="TOP_LEFT" mnemonicParsing="false" onAction="#saveParticipant" text="Speichern" VBox.vgrow="ALWAYS">
+               <VBox.margin>
+                  <Insets bottom="10.0" top="30.0" />
+               </VBox.margin>
+            </Button>
+         </children>
+         <HBox.margin>
+            <Insets right="40.0" />
+         </HBox.margin>
+      </VBox>
+   </children>
+</HBox>

app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/placesAddFormular/PlacesFormular.fxml

@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.ListView?>
+<?import javafx.scene.control.Separator?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.RowConstraints?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
+
+<HBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="404.0" prefWidth="635.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.placesAddFormular.PlacesFormularController">
+   <children>
+      <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0">
+         <children>
+            <Label fx:id="AddListTitle" text="Hinzugefügt">
+               <font>
+                  <Font name="System Bold" size="21.0" />
+               </font>
+               <VBox.margin>
+                  <Insets bottom="20.0" />
+               </VBox.margin>
+            </Label>
+            <ListView fx:id="locationListView" onMouseClicked="#changedSelection" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
+               <VBox.margin>
+                  <Insets left="10.0" right="10.0" />
+               </VBox.margin>
+               <opaqueInsets>
+                  <Insets />
+               </opaqueInsets>
+            </ListView>
+            <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
+               <children>
+                  <Button fx:id="closeBtn" mnemonicParsing="false" onAction="#closeFormular" text="Schliessen">
+                     <HBox.margin>
+                        <Insets right="40.0" />
+                     </HBox.margin>
+                  </Button>
+                  <Button fx:id="deleteBtn" mnemonicParsing="false" onAction="#deleteSelectedPlace" text="Löschen" />
+               </children>
+            </HBox>
+         </children>
+      </VBox>
+      <Separator orientation="VERTICAL" prefHeight="200.0" />
+      <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0">
+         <children>
+            <Label fx:id="newLocationFormularTitle" text="Austragungsort bearbeiten/erstellen">
+               <font>
+                  <Font name="System Bold" size="21.0" />
+               </font>
+               <VBox.margin>
+                  <Insets bottom="40.0" />
+               </VBox.margin>
+            </Label>
+            <Separator prefWidth="200.0" />
+            <GridPane fx:id="grid" prefHeight="200.0">
+               <columnConstraints>
+                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+               </columnConstraints>
+               <rowConstraints>
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+               </rowConstraints>
+               <children>
+                  <Label fx:id="locationNameLabel" styleClass="lableGrid" text="Austragungsort">
+                     <GridPane.margin>
+                        <Insets />
+                     </GridPane.margin>
+                  </Label>
+                  <TextField fx:id="locationNameTextField" styleClass="inputGrid" GridPane.columnIndex="1">
+                     <GridPane.margin>
+                        <Insets />
+                     </GridPane.margin>
+                  </TextField>
+               </children>
+            </GridPane>
+            <Separator prefWidth="200.0" />
+            <Button fx:id="saveBtn" alignment="TOP_LEFT" mnemonicParsing="false" onAction="#saveLocation" text="Speichern" VBox.vgrow="ALWAYS">
+               <VBox.margin>
+                  <Insets bottom="10.0" top="30.0" />
+               </VBox.margin>
+            </Button>
+         </children>
+      </VBox>
+   </children>
+</HBox>

app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentList.fxml

@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.*?>
+
+<HBox alignment="CENTER" VBox.vgrow="ALWAYS" xmlns="http://javafx.com/javafx/11.0.2" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.tournamentList.TournamentListController">
+    <children>
+        <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
+            <children>
+                <Label fx:id="tournamentListTitle" text="Bestehende Turniere">
+                    <font>
+                        <Font name="System Bold" size="21.0" />
+                    </font>
+                    <VBox.margin>
+                        <Insets bottom="20.0" />
+                    </VBox.margin>
+                </Label>
+                <ListView fx:id="tournamentListView" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
+                    <VBox.margin>
+                        <Insets />
+                    </VBox.margin>
+                </ListView>
+            <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
+               <VBox.margin>
+                  <Insets bottom="20.0" top="40.0" />
+               </VBox.margin>
+               <children>
+                      <Button fx:id="openBtn" mnemonicParsing="false" onAction="#openTournament" text="Öffnen">
+                     <HBox.margin>
+                        <Insets right="40.0" />
+                     </HBox.margin></Button>
+                  <Button fx:id="deleteBtn" layoutX="138.0" layoutY="28.0" mnemonicParsing="false" onAction="#deleteTournament" text="Löschen">
+                     <HBox.margin>
+                        <Insets />
+                     </HBox.margin></Button>
+               </children>
+            </HBox>
+            </children>
+            <HBox.margin>
+                <Insets left="40.0" />
+            </HBox.margin>
+        </VBox>
+        <Separator orientation="VERTICAL" prefHeight="200.0">
+            <HBox.margin>
+                <Insets left="10.0" right="10.0" />
+            </HBox.margin>
+        </Separator>
+        <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
+            <children>
+                <Label fx:id="newTournamentFormularTitle" text="Neues Turnier erstellen">
+                    <font>
+                        <Font name="System Bold" size="21.0" />
+                    </font>
+                    <VBox.margin>
+                        <Insets bottom="40.0" />
+                    </VBox.margin></Label>
+                <Separator prefWidth="200.0" />
+                <GridPane fx:id="grid" prefHeight="200.0">
+                    <columnConstraints>
+                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                    </columnConstraints>
+                    <rowConstraints>
+                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                    </rowConstraints>
+                    <children>
+                        <Label fx:id="tournamentNameLabel" styleClass="lableGrid" text="Turnier Name:">
+                            <GridPane.margin>
+                                <Insets />
+                            </GridPane.margin>
+                        </Label>
+                        <TextField fx:id="tournamentNameField" styleClass="inputGrid" GridPane.columnIndex="1">
+                            <GridPane.margin>
+                                <Insets />
+                            </GridPane.margin>
+                        </TextField>
+                        <Label fx:id="tournamentModLabel" styleClass="lableGrid" text="Turnier Modus:" GridPane.rowIndex="1">
+                            <GridPane.margin>
+                                <Insets />
+                            </GridPane.margin>
+                        </Label>
+                        <ChoiceBox fx:id="modusChoiceBox" prefWidth="150.0" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+                    </children>
+                </GridPane>
+                <Separator prefWidth="200.0" />
+                <Button fx:id="createBtn" alignment="TOP_LEFT" mnemonicParsing="false" onAction="#createTournament" text="Erstellen" VBox.vgrow="ALWAYS">
+                    <VBox.margin>
+                        <Insets bottom="20.0" top="40.0" />
+                    </VBox.margin></Button>
+            </children>
+            <HBox.margin>
+                <Insets right="40.0" />
+            </HBox.margin>
+        </VBox>
+    </children>
+
+
+</HBox>

app/src/test/java/ch/zhaw/projekt2/turnierverwaltung/AppTest.java

@@ -1,14 +0,0 @@
-/*
- * This Java source file was generated by the Gradle 'init' task.
- */
-package ch.zhaw.projekt2.turnierverwaltung;
-
-import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
-
-class AppTest {
-    @Test void appHasAGreeting() {
-        App classUnderTest = new App();
-        assertNotNull(classUnderTest.getGreeting(), "app should have a greeting");
-    }
-}

app/src/test/java/ch/zhaw/projekt2/turnierverwaltung/FileIOTest.java

@@ -60,7 +60,7 @@ class FileIOTest {
 
         @Test
         void getList() {
-            List<File> tournaments = io.getList();
+            List<FileIO.TournamentFile> tournaments = io.getList();
             assertEquals("empty.txt", tournaments.get(0).getName());
             assertEquals("test1.txt", tournaments.get(1).getName());
         }
@@ -108,15 +108,14 @@ class FileIOTest {
         }
 
         @Test
-        void saveTournament() throws IOException {
-            Tournament tournament = new Tournament("test1");
+        void saveTournament() throws IOException, InvalidNameException, Tournament.InvalidTypeException {
+            Tournament tournament = null;
+            tournament = new Tournament("test1", Tournament.Type.KO);
             io.saveTournament(tournament);
             File file = new File(mainDir + "/saves/test1.txt");
-            if(file.exists()){
-                file.delete();
-            } else {
-                fail();
-            }
+            assertTrue(file.exists());
+            assertTrue(file.delete());
+            assertFalse(file.exists());
         }
 
         @Test