From 9aa49d7dfe445122edcf3e72c8e621493d21b8be Mon Sep 17 00:00:00 2001
From: pbg2h21ama <kevin.maier@edu.bib.de>
Date: Tue, 31 Jan 2023 18:36:32 +0100
Subject: [PATCH] =?UTF-8?q?Registrierung=20erg=C3=A4nzt=20und=20Kommentar?=
 =?UTF-8?q?=20hinzugef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../example/vpr_javafx/HelloController.java   | 22 +++++++++++-
 .../example/vpr_javafx/Registration-view.fxml | 36 ++++++++++++-------
 2 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/example/vpr_javafx/HelloController.java b/src/main/java/com/example/vpr_javafx/HelloController.java
index 20ec7bb..f4e89cc 100644
--- a/src/main/java/com/example/vpr_javafx/HelloController.java
+++ b/src/main/java/com/example/vpr_javafx/HelloController.java
@@ -94,6 +94,14 @@ public class HelloController {
     public TextField tfName;
     @FXML
     public TextField tfChild;
+    @FXML
+    public TextField tfStreet;
+    @FXML
+    public TextField tfHouseNumber;
+    @FXML
+    public TextField tfPostalCode;
+    @FXML
+    public TextField tfCity;
 
     @FXML
     private PasswordField pfPassword;
@@ -279,6 +287,12 @@ public class HelloController {
                 + "8: Konservierungsstoff");
     }
 
+    /**
+     * ToRegistration() ruft die Registration-View auf, sobald man auf den Registrierungs-Button klickt
+     * @param event
+     * @throws IOException
+     * @author Kevin Maier
+     */
     @FXML
     protected void ToRegistration(ActionEvent event) throws IOException
     {
@@ -289,6 +303,12 @@ public class HelloController {
         stage.show();
     }
 
+    /**
+     * OnRegistrationButton() lässt einen neuen Nutzer anlegen
+     * @param event
+     * @throws IOException
+     * @author Kevin Maier
+     */
     @FXML
     protected void OnRegistrationButton(ActionEvent event) throws IOException
     {
@@ -302,7 +322,7 @@ public class HelloController {
         else if (validData.validateData(tfPhone, pfPassword, this))
         {
             try (FileWriter writer = new FileWriter("user.txt")){
-                writer.write(tfName.getText() + ";" + tfPhone.getText() + ";" + tfChild.getText() + ";" + pfPassword.getText());
+                writer.write(tfName.getText() + ";" + tfStreet.getText() + " " + tfHouseNumber.getText() + "," + tfPostalCode + " " + tfCity.getText() + ";" + tfPhone.getText() + ";" + tfChild.getText() + ";" + pfPassword.getText());
                 writer.flush();
             }
             catch (IOException e)
diff --git a/src/main/resources/com/example/vpr_javafx/Registration-view.fxml b/src/main/resources/com/example/vpr_javafx/Registration-view.fxml
index 7a41d50..537e19a 100644
--- a/src/main/resources/com/example/vpr_javafx/Registration-view.fxml
+++ b/src/main/resources/com/example/vpr_javafx/Registration-view.fxml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import javafx.geometry.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 
 <AnchorPane prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/11.0.14-internal" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.example.vpr_javafx.HelloController">
     <children>
-        <GridPane layoutX="100.0" layoutY="75.0" prefHeight="250.0" prefWidth="400.0">
+        <GridPane layoutX="50.0" layoutY="62.0" prefHeight="275.0" prefWidth="500.0">
             <columnConstraints>
-                <ColumnConstraints hgrow="SOMETIMES" maxWidth="153.0" minWidth="10.0" prefWidth="89.8" />
-                <ColumnConstraints hgrow="SOMETIMES" maxWidth="261.0" minWidth="10.0" prefWidth="226.2" />
+                <ColumnConstraints hgrow="SOMETIMES" maxWidth="153.0" minWidth="10.0" prefWidth="85.0" />
+                <ColumnConstraints hgrow="SOMETIMES" maxWidth="261.0" minWidth="10.0" prefWidth="200.0" />
+            <ColumnConstraints hgrow="SOMETIMES" maxWidth="261.0" minWidth="10.0" prefWidth="200.0" />
             </columnConstraints>
             <rowConstraints>
                 <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
@@ -17,18 +19,28 @@
                 <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 minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
             </rowConstraints>
             <children>
-                <Label text="Voller Name: " />
-                <Label text="Handynummer: " GridPane.rowIndex="1" />
+                <Label text="Name" />
+                <Label text="Handynummer" GridPane.rowIndex="1" />
                 <Label prefWidth="95.0" text="Passwort: " GridPane.rowIndex="2" />
-                <Label text="Kind: " GridPane.rowIndex="3" />
-                <Button mnemonicParsing="false" onAction="#OnRegistrationButton" prefHeight="26.0" prefWidth="90.0" text="Abschicken" translateX="100.0" GridPane.columnIndex="1" GridPane.rowIndex="5" />
-                <PasswordField fx:id="pfPassword" GridPane.columnIndex="1" GridPane.rowIndex="2" />
-                <TextField fx:id="tfName" GridPane.columnIndex="1" />
-                <TextField fx:id="tfPhone" GridPane.columnIndex="1" GridPane.rowIndex="1" />
-                <TextField fx:id="tfChild" GridPane.columnIndex="1" GridPane.rowIndex="3" />
+                <Label text="Kind:" GridPane.rowIndex="5" />
+                <Label text="Straße" GridPane.rowIndex="3" />
+                <Label text="Ort" GridPane.rowIndex="4" />
+                <Button mnemonicParsing="false" onAction="#OnRegistrationButton" prefHeight="26.0" prefWidth="90.0" text="Abschicken" translateX="100.0" GridPane.columnIndex="1" GridPane.rowIndex="7" />
+                <PasswordField fx:id="pfPassword" promptText="Passwort" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+                <TextField fx:id="tfName" promptText="Voller Name" GridPane.columnIndex="1" />
+                <TextField fx:id="tfPhone" promptText="Handynummer" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+                <TextField fx:id="tfChild" promptText="Kind" GridPane.columnIndex="1" GridPane.rowIndex="5" />
+                <TextField GridPane.columnIndex="1" GridPane.rowIndex="4" />
+                <TextField fx:id="tfStreet" prefWidth="254.0" promptText="Straße" GridPane.columnIndex="1" GridPane.rowIndex="3" />
+                <TextField fx:id="tfHouseNumber" prefWidth="123.0" promptText="Hausnummer" GridPane.columnIndex="2" GridPane.rowIndex="3"/>
+                <TextField fx:id="tfPostalCode" promptText="Postleitzahl" GridPane.columnIndex="1" GridPane.rowIndex="4" />
+                <TextField fx:id="tfCity" promptText="Ort" GridPane.columnIndex="2" GridPane.rowIndex="4" />
+
             </children>
         </GridPane>
     </children>
-</AnchorPane>
\ No newline at end of file
+</AnchorPane>