DopplerEffekt/VPR-Projekt-JavaFX
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://git.bib.de/DopplerEffekt/VPR-Projekt-JavaFX

Browse Source 
# Conflicts:
#	src/main/java/com/example/vpr_javafx/Data.java
#	src/main/java/com/example/vpr_javafx/HelloController.java
#	target/classes/com/example/vpr_javafx/Data.class
#	target/classes/com/example/vpr_javafx/HelloController.class
#	target/classes/com/example/vpr_javafx/MenuOverview-view.fxml
#	user.txt
This commit is contained in:
Kevin Pfannenstiel 2023-02-01 12:21:32 +01:00
commit f664299fae
4 changed files with 80 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/example/vpr_javafx/HelloApplication.java
View File

@ -20,7 +20,5 @@ public class HelloApplication extends Application {
controller.writeAllergene();
}
public static void main(String[] args) {
launch();
}
public static void main(String[] args) {launch();}
}

86
src/main/resources/com/example/vpr_javafx/Registration-view.fxml
View File

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.geometry.*?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<?import javafx.scene.text.*?>
<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">
<AnchorPane prefHeight="400.0" prefWidth="600.0" style="-fx-background-color: #F0C8BD;" xmlns="http://javafx.com/javafx/11.0.2" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.example.vpr_javafx.HelloController">
<children>
<GridPane layoutX="50.0" layoutY="62.0" prefHeight="275.0" prefWidth="500.0">
<GridPane layoutX="50.0" layoutY="62.0" prefHeight="275.0" prefWidth="500.0" style="-fx-background-color: #F0C8BD;">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" maxWidth="153.0" minWidth="10.0" prefWidth="85.0" />
<ColumnConstraints hgrow="SOMETIMES" maxWidth="261.0" minWidth="10.0" prefWidth="200.0" />
@ -23,22 +23,70 @@
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<Label text="Name" />
<Label text="Handynummer" GridPane.rowIndex="1" />
<Label prefWidth="95.0" text="Passwort: " GridPane.rowIndex="2" />
<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" />
<Label text="Name:" textFill="#746fa6">
<font>
<Font name="Century Gothic Bold" size="12.0" />
</font></Label>
<Label text="Handynummer:" textFill="#746fa6" GridPane.rowIndex="1">
<font>
<Font name="Century Gothic Bold" size="12.0" />
</font></Label>
<Label prefWidth="95.0" text="Passwort: " textFill="#746fa6" GridPane.rowIndex="2">
<font>
<Font name="Century Gothic Bold" size="12.0" />
</font></Label>
<Label text="Kind:" textFill="#746fa6" GridPane.rowIndex="5">
<font>
<Font name="Century Gothic Bold" size="12.0" />
</font></Label>
<Label text="Straße:" textFill="#746fa6" GridPane.rowIndex="3">
<font>
<Font name="Century Gothic Bold" size="12.0" />
</font></Label>
<Label text="Ort:" textFill="#746fa6" GridPane.rowIndex="4">
<font>
<Font name="Century Gothic Bold" size="12.0" />
</font></Label>
<Button mnemonicParsing="false" onAction="#OnRegistrationButton" prefHeight="26.0" prefWidth="90.0" style="-fx-background-color: #CBC7F0; -fx-border-color: #746FA6;" text="Abschicken" textFill="WHITE" translateX="100.0" GridPane.columnIndex="1" GridPane.rowIndex="7">
<font>
<Font name="Century Gothic" size="12.0" />
</font></Button>
<PasswordField fx:id="pfPassword" promptText="Passwort" GridPane.columnIndex="1" GridPane.rowIndex="2">
<font>
<Font name="Century Gothic" size="12.0" />
</font></PasswordField>
<TextField fx:id="tfName" promptText="Voller Name" GridPane.columnIndex="1">
<font>
<Font name="Century Gothic" size="12.0" />
</font></TextField>
<TextField fx:id="tfPhone" promptText="Handynummer" GridPane.columnIndex="1" GridPane.rowIndex="1">
<font>
<Font name="Century Gothic" size="12.0" />
</font></TextField>
<TextField fx:id="tfChild" promptText="Kind" GridPane.columnIndex="1" GridPane.rowIndex="5">
<font>
<Font name="Century Gothic" size="12.0" />
</font></TextField>
<TextField GridPane.columnIndex="1" GridPane.rowIndex="4">
<font>
<Font name="Century Gothic" size="12.0" />
</font></TextField>
<TextField fx:id="tfStreet" prefWidth="254.0" promptText="Straße" GridPane.columnIndex="1" GridPane.rowIndex="3">
<font>
<Font name="Century Gothic" size="12.0" />
</font></TextField>
<TextField fx:id="tfHouseNumber" prefWidth="123.0" promptText="Hausnummer" GridPane.columnIndex="2" GridPane.rowIndex="3">
<font>
<Font name="Century Gothic" size="12.0" />
</font></TextField>
<TextField fx:id="tfPostalCode" promptText="Postleitzahl" GridPane.columnIndex="1" GridPane.rowIndex="4">
<font>
<Font name="Century Gothic" size="12.0" />
</font></TextField>
<TextField fx:id="tfCity" promptText="Ort" GridPane.columnIndex="2" GridPane.rowIndex="4">
<font>
<Font name="Century Gothic" size="12.0" />
</font></TextField>
</children>
</GridPane>

12
target/classes/com/example/vpr_javafx/ChangeOrder-view.fxml Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" 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>
<Button fx:id="btDeleteSelection" layoutX="457.0" layoutY="264.0" mnemonicParsing="false" text="Löschen" />
<Button fx:id="btToMenu" onAction="#ToMenu" layoutX="461.0" layoutY="305.0" mnemonicParsing="false" visible="false" text="Zurück" />
<ListView fx:id="listViewDelete" layoutX="200.0" layoutY="89.0" prefHeight="200.0" prefWidth="200.0" />
</children>
</AnchorPane>

BIN
target/classes/com/example/vpr_javafx/HelloApplication.class
View File

Binary file not shown.