From f3495d28d6701bc8fe141139cd5b578d616e772c Mon Sep 17 00:00:00 2001
From: schrom01 <schrom01@students.zhaw.ch>
Date: Sun, 1 May 2022 23:35:25 +0200
Subject: [PATCH] fixed functionality Places Formular

---
 .../projekt2/turnierverwaltung/Place.java     | 13 +++++++-
 .../turnierverwaltung/Tournament.java         |  1 +
 .../PlacesFormularController.java             | 18 -----------
 .../placesAddFormular/PlacesFormular.fxml     | 31 +++++--------------
 4 files changed, 20 insertions(+), 43 deletions(-)

diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Place.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Place.java
index 04df070..f2e35bd 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Place.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Place.java
@@ -1,6 +1,8 @@
 package ch.zhaw.projekt2.turnierverwaltung;
 
-public class Place {
+import java.io.Serializable;
+
+public class Place implements Serializable {
     private final String NAME_MATCHING_REGEX = "[a-zA-Z0-9]{1,20}";
     private String name;
 
@@ -18,4 +20,13 @@ public class Place {
     public void setName(String name) {
         this.name = name;
     }
+
+    @Override
+    public String toString(){
+        return name;
+    }
+
+    public boolean equals(Place place){
+        return name.equals(place.getName());
+    }
 }
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java
index 36ae2e8..a40585a 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java
@@ -27,6 +27,7 @@ public class Tournament implements Serializable {
         setName(name);
         setType(type);
         participants = new ArrayList<>();
+        places = new ArrayList<>();
     }
 
     public void addParticipant(Participant newParticipant) throws ParticipantExistsException {
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/placesAddFormular/PlacesFormularController.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/placesAddFormular/PlacesFormularController.java
index e5c9ac4..c5534e5 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/placesAddFormular/PlacesFormularController.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/placesAddFormular/PlacesFormularController.java
@@ -18,21 +18,9 @@ public class PlacesFormularController 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;
 
@@ -58,12 +46,6 @@ public class PlacesFormularController extends FXController {
     @FXML
     private TextField placeNameTextField;
 
-    @FXML
-    private Label phoneNumberLabel;
-
-    @FXML
-    private TextField phoneNumberTextField;
-
     @FXML
     private Button saveBtn;
 
diff --git a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/placesAddFormular/PlacesFormular.fxml b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/placesAddFormular/PlacesFormular.fxml
index 4e3bfc5..c000eae 100644
--- a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/placesAddFormular/PlacesFormular.fxml
+++ b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/placesAddFormular/PlacesFormular.fxml
@@ -1,18 +1,11 @@
 <?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.placesAddFormular.PlacesFormularController">
+<?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.placesAddFormular.PlacesFormularController">
    <children>
       <VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
          <children>
@@ -55,7 +48,7 @@
       </Separator>
       <VBox fx:id="changeBtn" alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
          <children>
-            <Label fx:id="newplaceFormularTitle" text="Teilnehmer ändern/erstellen">
+            <Label fx:id="newplaceFormularTitle" text="Ort ändern/erstellen">
                <font>
                   <Font name="System Bold" size="21.0" />
                </font>
@@ -86,16 +79,6 @@
                         <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" />