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:
#	target/classes/com/example/vpr_javafx/Registration-view.fxml
This commit is contained in:
Kevin Maier 2023-01-30 19:59:08 +01:00
commit c5b249e096
7 changed files with 68 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/example/vpr_javafx/Data.java
View File

@ -262,7 +262,7 @@ public class Data {
* The method validates the user input * The method validates the user input
* *
* @return boolean inputValid * @return boolean inputValid
* @author Kevin Maier * @author Kevin Maier, Kevin Pfannenstiel
*/ */
public boolean validateData(TextField tfPhone, PasswordField pfPassword) public boolean validateData(TextField tfPhone, PasswordField pfPassword)
{ {

2
src/main/java/com/example/vpr_javafx/HelloController.java
View File

@ -138,7 +138,7 @@ public class HelloController {
imageUrl=veganUrl; imageUrl=veganUrl;
} }
Image image = new Image("C:/Unterricht/VPR_Projekt/target/classes/com/example/vpr_javafx/" + imageUrl); Image image = new Image("C:/VPR_Projekt_Java/target/classes/com/example/vpr_javafx/" + imageUrl);
switch (i) { switch (i) {
case 0: case 0:

2
src/main/java/com/example/vpr_javafx/Menu.java
View File

@ -71,6 +71,7 @@ public class Menu {
/** /**
* The method toString() returns fomated dishdata * The method toString() returns fomated dishdata
*
* @return a String with dish, sideDish, list of ingredients and the typ of the menu * @return a String with dish, sideDish, list of ingredients and the typ of the menu
* @author Madeleine Vigier * @author Madeleine Vigier
*/ */
@ -81,3 +82,4 @@ public class Menu {
+ type + '\n' + type + '\n'
+ ingredients; + ingredients;
} }
}

30
src/main/resources/com/example/vpr_javafx/MenuOverview-view.fxml
View File

@ -1,18 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?import javafx.geometry.Insets?> <?import javafx.geometry.*?>
<?import javafx.scene.control.Button?> <?import javafx.scene.control.*?>
<?import javafx.scene.control.Label?> <?import javafx.scene.image.*?>
<?import javafx.scene.control.PasswordField?> <?import javafx.scene.layout.*?>
<?import javafx.scene.control.TextField?> <?import javafx.scene.shape.*?>
<?import javafx.scene.control.ToolBar?> <?import javafx.scene.text.*?>
<?import javafx.scene.image.Image?>
<?import javafx.scene.image.ImageView?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.shape.Line?>
<?import javafx.scene.text.Font?>
<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="742.0" prefWidth="980.0" style="-fx-background-color: #f0C8bd;" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.example.vpr_javafx.HelloController"> <AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="742.0" prefWidth="980.0" style="-fx-background-color: #f0C8bd;" xmlns="http://javafx.com/javafx/11.0.14-internal" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.example.vpr_javafx.HelloController">
<Label layoutX="76.0" layoutY="176.0" text="Montag" textFill="#6f7baf"> <Label layoutX="76.0" layoutY="176.0" text="Montag" textFill="#6f7baf">
<font> <font>
<Font name="Century Gothic Bold" size="13.0" /> <Font name="Century Gothic Bold" size="13.0" />
@ -204,4 +199,15 @@
</font> </font>
</Label> </Label>
<Label fx:id="allergene" layoutX="780.0" layoutY="362.0" prefHeight="183.0" prefWidth="192.0" /> <Label fx:id="allergene" layoutX="780.0" layoutY="362.0" prefHeight="183.0" prefWidth="192.0" />
<ImageView fx:id="imgImage1" fitHeight="30.0" fitWidth="35.0" layoutX="110.0" layoutY="154.0" pickOnBounds="true" preserveRatio="true"/>
<ImageView fx:id="imgImage2" fitHeight="30.0" fitWidth="35.0" layoutX="110.0" layoutY="189.0" pickOnBounds="true" preserveRatio="true" />
<ImageView fx:id="imgImage3" fitHeight="30.0" fitWidth="35.0" layoutX="110.0" layoutY="277.0" pickOnBounds="true" preserveRatio="true" />
<ImageView fx:id="imgImage4" fitHeight="30.0" fitWidth="35.0" layoutX="110.0" layoutY="312.0" pickOnBounds="true" preserveRatio="true" />
<ImageView fx:id="imgImage5" fitHeight="30.0" fitWidth="35.0" layoutX="110.0" layoutY="400.0" pickOnBounds="true" preserveRatio="true" />
<ImageView fx:id="imgImage6" fitHeight="30.0" fitWidth="35.0" layoutX="110.0" layoutY="435.0" pickOnBounds="true" preserveRatio="true" />
<ImageView fx:id="imgImage7" fitHeight="30.0" fitWidth="35.0" layoutX="110.0" layoutY="523.0" pickOnBounds="true" preserveRatio="true" />
<ImageView fx:id="imgImage8" fitHeight="30.0" fitWidth="35.0" layoutX="110.0" layoutY="556.0" pickOnBounds="true" preserveRatio="true" />
<ImageView fx:id="imgImage9" fitHeight="30.0" fitWidth="35.0" layoutX="110.0" layoutY="643.0" pickOnBounds="true" preserveRatio="true" />
<ImageView fx:id="imgImage10" fitHeight="30.0" fitWidth="35.0" layoutX="110.0" layoutY="677.0" pickOnBounds="true" preserveRatio="true" />
<CheckBox layoutX="358.0" layoutY="154.0" mnemonicParsing="false" />
</AnchorPane> </AnchorPane>

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

Binary file not shown.

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

Binary file not shown.

71
target/classes/com/example/vpr_javafx/MenuOverview-view.fxml
View File

@ -8,7 +8,7 @@
<?import javafx.scene.text.*?> <?import javafx.scene.text.*?>
<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="742.0" prefWidth="980.0" style="-fx-background-color: #f0C8bd;" xmlns="http://javafx.com/javafx/11.0.14-internal" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.example.vpr_javafx.HelloController"> <AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="742.0" prefWidth="980.0" style="-fx-background-color: #f0C8bd;" xmlns="http://javafx.com/javafx/11.0.14-internal" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.example.vpr_javafx.HelloController">
<Label layoutX="60.0" layoutY="176.0" text="Montag" textFill="#6f7baf"> <Label layoutX="76.0" layoutY="176.0" text="Montag" textFill="#6f7baf">
<font> <font>
<Font name="Century Gothic Bold" size="13.0" /> <Font name="Century Gothic Bold" size="13.0" />
</font> </font>
@ -16,7 +16,7 @@
<Insets /> <Insets />
</opaqueInsets> </opaqueInsets>
</Label> </Label>
<Label layoutX="54.0" layoutY="298.0" text="Dienstag" textFill="#6f7baf"> <Label layoutX="74.0" layoutY="299.0" text="Dienstag" textFill="#6f7baf">
<font> <font>
<Font name="Century Gothic Bold" size="13.0" /> <Font name="Century Gothic Bold" size="13.0" />
</font> </font>
@ -24,7 +24,7 @@
<Insets /> <Insets />
</opaqueInsets> </opaqueInsets>
</Label> </Label>
<Label layoutX="52.0" layoutY="421.0" text="Mittwoch" textFill="#6f7baf"> <Label layoutX="72.0" layoutY="422.0" text="Mittwoch" textFill="#6f7baf">
<font> <font>
<Font name="Century Gothic Bold" size="13.0" /> <Font name="Century Gothic Bold" size="13.0" />
</font> </font>
@ -32,7 +32,7 @@
<Insets /> <Insets />
</opaqueInsets> </opaqueInsets>
</Label> </Label>
<Label layoutX="37.0" layoutY="545.0" text="Donnerstag" textFill="#6f7baf"> <Label layoutX="63.0" layoutY="543.0" text="Donnerstag" textFill="#6f7baf">
<font> <font>
<Font name="Century Gothic Bold" size="13.0" /> <Font name="Century Gothic Bold" size="13.0" />
</font> </font>
@ -40,7 +40,7 @@
<Insets /> <Insets />
</opaqueInsets> </opaqueInsets>
</Label> </Label>
<Label layoutX="63.0" layoutY="665.0" text="Freitag" textFill="#6f7baf"> <Label layoutX="79.0" layoutY="664.0" text="Freitag" textFill="#6f7baf">
<font> <font>
<Font name="Century Gothic Bold" size="13.0" /> <Font name="Century Gothic Bold" size="13.0" />
</font> </font>
@ -72,93 +72,93 @@
<Button mnemonicParsing="false" onAction="#OnSignInButton" style="-fx-background-color: #c7d0f0;" text="anmelden" textFill="WHITE" /> <Button mnemonicParsing="false" onAction="#OnSignInButton" style="-fx-background-color: #c7d0f0;" text="anmelden" textFill="WHITE" />
</items> </items>
</ToolBar> </ToolBar>
<Line endX="100.0" layoutX="245.0" layoutY="310.0" startX="-128.0" stroke="#746fa6" strokeWidth="3.0" /> <Line endX="100.0" layoutX="245.0" layoutY="310.0" startX="-100.0" stroke="#746fa6" strokeWidth="3.0" />
<Line endX="100.0" layoutX="245.0" layoutY="187.0" startX="-128.0" stroke="#746fa6" strokeWidth="3.0" /> <Line endX="100.0" layoutX="245.0" layoutY="187.0" startX="-100.0" stroke="#746fa6" strokeWidth="3.0" />
<Line endX="100.0" layoutX="245.0" layoutY="433.0" startX="-128.0" stroke="#746fa6" strokeWidth="3.0" /> <Line endX="100.0" layoutX="245.0" layoutY="433.0" startX="-100.0" stroke="#746fa6" strokeWidth="3.0" />
<Line endX="100.0" layoutX="245.0" layoutY="554.0" startX="-128.0" stroke="#746fa6" strokeWidth="3.0" /> <Line endX="100.0" layoutX="245.0" layoutY="554.0" startX="-100.0" stroke="#746fa6" strokeWidth="3.0" />
<Line endX="100.0" layoutX="245.0" layoutY="675.0" startX="-128.0" stroke="#746fa6" strokeWidth="3.0" /> <Line endX="100.0" layoutX="245.0" layoutY="675.0" startX="-100.0" stroke="#746fa6" strokeWidth="3.0" />
<Line endX="100.0" layoutX="581.0" layoutY="187.0" startX="-128.0" stroke="#746fa6" strokeWidth="3.0" /> <Line endX="100.0" layoutX="581.0" layoutY="187.0" startX="-100.0" stroke="#746fa6" strokeWidth="3.0" />
<Line endX="100.0" layoutX="581.0" layoutY="310.0" startX="-128.0" stroke="#746fa6" strokeWidth="3.0" /> <Line endX="100.0" layoutX="581.0" layoutY="310.0" startX="-100.0" stroke="#746fa6" strokeWidth="3.0" />
<Line endX="100.0" layoutX="581.0" layoutY="433.0" startX="-128.0" stroke="#746fa6" strokeWidth="3.0" /> <Line endX="100.0" layoutX="581.0" layoutY="433.0" startX="-100.0" stroke="#746fa6" strokeWidth="3.0" />
<Line endX="100.0" layoutX="581.0" layoutY="554.0" startX="-128.0" stroke="#746fa6" strokeWidth="3.0" /> <Line endX="100.0" layoutX="581.0" layoutY="554.0" startX="-100.0" stroke="#746fa6" strokeWidth="3.0" />
<Line endX="100.0" layoutX="581.0" layoutY="675.0" startX="-128.0" stroke="#746fa6" strokeWidth="3.0" /> <Line endX="100.0" layoutX="581.0" layoutY="675.0" startX="-100.0" stroke="#746fa6" strokeWidth="3.0" />
<Label fx:id="lMonH1" layoutX="148.0" layoutY="134.0" prefHeight="50.0" prefWidth="198.0" textFill="#6f7baf"> <Label fx:id="lMonH1" layoutX="148.0" layoutY="140.0" prefHeight="44.0" prefWidth="198.0" textFill="#6f7baf">
<font> <font>
<Font name="Century Gothic Bold" size="13.0" /> <Font name="Century Gothic Bold" size="13.0" />
</font></Label> </font></Label>
<Label fx:id="lMonH2" layoutX="148.0" layoutY="186.0" prefHeight="50.0" prefWidth="198.0" textFill="#6f7baf"> <Label fx:id="lMonH2" layoutX="148.0" layoutY="186.0" prefHeight="44.0" prefWidth="198.0" textFill="#6f7baf">
<font> <font>
<Font name="Century Gothic Bold" size="13.0" /> <Font name="Century Gothic Bold" size="13.0" />
</font></Label> </font></Label>
<Label fx:id="lTueH1" layoutX="148.0" layoutY="259.0" prefHeight="50.0" prefWidth="198.0" text="" textFill="#6f7baf"> <Label fx:id="lTueH1" layoutX="148.0" layoutY="265.0" prefHeight="44.0" prefWidth="198.0" text="" textFill="#6f7baf">
<font> <font>
<Font name="Century Gothic Bold" size="13.0" /> <Font name="Century Gothic Bold" size="13.0" />
</font></Label> </font></Label>
<Label fx:id="lTueH2" layoutX="148.0" layoutY="309.0" prefHeight="50.0" prefWidth="198.0" text="" textFill="#6f7baf"> <Label fx:id="lTueH2" layoutX="148.0" layoutY="309.0" prefHeight="44.0" prefWidth="198.0" text="" textFill="#6f7baf">
<font> <font>
<Font name="Century Gothic Bold" size="13.0" /> <Font name="Century Gothic Bold" size="13.0" />
</font></Label> </font></Label>
<Label fx:id="lWednH1" layoutX="148.0" layoutY="382.0" prefHeight="50.0" prefWidth="198.0" text="" textFill="#6f7baf"> <Label fx:id="lWednH1" layoutX="148.0" layoutY="388.0" prefHeight="44.0" prefWidth="198.0" text="" textFill="#6f7baf">
<font> <font>
<Font name="Century Gothic Bold" size="13.0" /> <Font name="Century Gothic Bold" size="13.0" />
</font></Label> </font></Label>
<Label fx:id="lWednH2" layoutX="148.0" layoutY="432.0" prefHeight="50.0" prefWidth="198.0" text="" textFill="#6f7baf"> <Label fx:id="lWednH2" layoutX="148.0" layoutY="432.0" prefHeight="44.0" prefWidth="198.0" text="" textFill="#6f7baf">
<font> <font>
<Font name="Century Gothic Bold" size="13.0" /> <Font name="Century Gothic Bold" size="13.0" />
</font></Label> </font></Label>
<Label fx:id="lThurH1" layoutX="148.0" layoutY="503.0" prefHeight="50.0" prefWidth="198.0" text="" textFill="#6f7baf"> <Label fx:id="lThurH1" layoutX="148.0" layoutY="509.0" prefHeight="44.0" prefWidth="198.0" text="" textFill="#6f7baf">
<font> <font>
<Font name="Century Gothic Bold" size="13.0" /> <Font name="Century Gothic Bold" size="13.0" />
</font></Label> </font></Label>
<Label fx:id="lThurH2" layoutX="148.0" layoutY="553.0" prefHeight="50.0" prefWidth="198.0" text="" textFill="#6f7baf"> <Label fx:id="lThurH2" layoutX="148.0" layoutY="553.0" prefHeight="44.0" prefWidth="198.0" text="" textFill="#6f7baf">
<font> <font>
<Font name="Century Gothic Bold" size="13.0" /> <Font name="Century Gothic Bold" size="13.0" />
</font></Label> </font></Label>
<Label fx:id="lFriH1" layoutX="148.0" layoutY="623.0" prefHeight="50.0" prefWidth="198.0" text="" textFill="#6f7baf"> <Label fx:id="lFriH1" layoutX="148.0" layoutY="629.0" prefHeight="44.0" prefWidth="198.0" text="" textFill="#6f7baf">
<font> <font>
<Font name="Century Gothic Bold" size="13.0" /> <Font name="Century Gothic Bold" size="13.0" />
</font></Label> </font></Label>
<Label fx:id="lFriH2" layoutX="148.0" layoutY="674.0" prefHeight="50.0" prefWidth="198.0" text="" textFill="#6f7baf"> <Label fx:id="lFriH2" layoutX="148.0" layoutY="674.0" prefHeight="44.0" prefWidth="198.0" text="" textFill="#6f7baf">
<font> <font>
<Font name="Century Gothic Bold" size="13.0" /> <Font name="Century Gothic Bold" size="13.0" />
</font></Label> </font></Label>
<Label fx:id="lMonD1" layoutX="482.0" layoutY="136.0" prefHeight="50.0" prefWidth="203.0" text="" textFill="#6f7baf"> <Label fx:id="lMonD1" layoutX="482.0" layoutY="142.0" prefHeight="44.0" prefWidth="203.0" text="" textFill="#6f7baf">
<font> <font>
<Font name="Century Gothic Bold" size="13.0" /> <Font name="Century Gothic Bold" size="13.0" />
</font></Label> </font></Label>
<Label fx:id="lMonD2" layoutX="482.0" layoutY="186.0" prefHeight="50.0" prefWidth="203.0" text="" textFill="#6f7baf"> <Label fx:id="lMonD2" layoutX="482.0" layoutY="186.0" prefHeight="44.0" prefWidth="203.0" text="" textFill="#6f7baf">
<font> <font>
<Font name="Century Gothic Bold" size="13.0" /> <Font name="Century Gothic Bold" size="13.0" />
</font></Label> </font></Label>
<Label fx:id="lTueD1" layoutX="482.0" layoutY="259.0" prefHeight="50.0" prefWidth="203.0" text="" textFill="#6f7baf"> <Label fx:id="lTueD1" layoutX="482.0" layoutY="265.0" prefHeight="44.0" prefWidth="203.0" text="" textFill="#6f7baf">
<font> <font>
<Font name="Century Gothic Bold" size="13.0" /> <Font name="Century Gothic Bold" size="13.0" />
</font></Label> </font></Label>
<Label fx:id="lTueD2" layoutX="482.0" layoutY="309.0" prefHeight="50.0" prefWidth="203.0" text="" textFill="#6f7baf"> <Label fx:id="lTueD2" layoutX="482.0" layoutY="309.0" prefHeight="44.0" prefWidth="203.0" text="" textFill="#6f7baf">
<font> <font>
<Font name="Century Gothic Bold" size="13.0" /> <Font name="Century Gothic Bold" size="13.0" />
</font></Label> </font></Label>
<Label fx:id="lWednD1" layoutX="482.0" layoutY="382.0" prefHeight="50.0" prefWidth="203.0" text="" textFill="#6f7baf"> <Label fx:id="lWednD1" layoutX="482.0" layoutY="388.0" prefHeight="44.0" prefWidth="203.0" text="" textFill="#6f7baf">
<font> <font>
<Font name="Century Gothic Bold" size="13.0" /> <Font name="Century Gothic Bold" size="13.0" />
</font></Label> </font></Label>
<Label fx:id="lWednD2" layoutX="482.0" layoutY="432.0" prefHeight="50.0" prefWidth="203.0" text="" textFill="#6f7baf"> <Label fx:id="lWednD2" layoutX="482.0" layoutY="432.0" prefHeight="44.0" prefWidth="203.0" text="" textFill="#6f7baf">
<font> <font>
<Font name="Century Gothic Bold" size="13.0" /> <Font name="Century Gothic Bold" size="13.0" />
</font></Label> </font></Label>
<Label fx:id="lThurD1" layoutX="482.0" layoutY="503.0" prefHeight="50.0" prefWidth="203.0" text="" textFill="#6f7baf"> <Label fx:id="lThurD1" layoutX="482.0" layoutY="509.0" prefHeight="44.0" prefWidth="203.0" text="" textFill="#6f7baf">
<font> <font>
<Font name="Century Gothic Bold" size="13.0" /> <Font name="Century Gothic Bold" size="13.0" />
</font></Label> </font></Label>
<Label fx:id="lThurD2" layoutX="482.0" layoutY="553.0" prefHeight="50.0" prefWidth="203.0" text="" textFill="#6f7baf"> <Label fx:id="lThurD2" layoutX="482.0" layoutY="553.0" prefHeight="44.0" prefWidth="203.0" text="" textFill="#6f7baf">
<font> <font>
<Font name="Century Gothic Bold" size="13.0" /> <Font name="Century Gothic Bold" size="13.0" />
</font></Label> </font></Label>
<Label fx:id="lFriD1" layoutX="482.0" layoutY="624.0" prefHeight="50.0" prefWidth="203.0" text="" textFill="#6f7baf"> <Label fx:id="lFriD1" layoutX="482.0" layoutY="630.0" prefHeight="44.0" prefWidth="203.0" text="" textFill="#6f7baf">
<font> <font>
<Font name="Century Gothic Bold" size="13.0" /> <Font name="Century Gothic Bold" size="13.0" />
</font></Label> </font></Label>
<Label fx:id="lFriD2" layoutX="482.0" layoutY="674.0" prefHeight="50.0" prefWidth="203.0" text="" textFill="#6f7baf"> <Label fx:id="lFriD2" layoutX="482.0" layoutY="674.0" prefHeight="44.0" prefWidth="203.0" text="" textFill="#6f7baf">
<font> <font>
<Font name="Century Gothic Bold" size="13.0" /> <Font name="Century Gothic Bold" size="13.0" />
</font></Label> </font></Label>
@ -209,4 +209,5 @@
<ImageView fx:id="imgImage8" fitHeight="30.0" fitWidth="35.0" layoutX="110.0" layoutY="556.0" pickOnBounds="true" preserveRatio="true" /> <ImageView fx:id="imgImage8" fitHeight="30.0" fitWidth="35.0" layoutX="110.0" layoutY="556.0" pickOnBounds="true" preserveRatio="true" />
<ImageView fx:id="imgImage9" fitHeight="30.0" fitWidth="35.0" layoutX="110.0" layoutY="643.0" pickOnBounds="true" preserveRatio="true" /> <ImageView fx:id="imgImage9" fitHeight="30.0" fitWidth="35.0" layoutX="110.0" layoutY="643.0" pickOnBounds="true" preserveRatio="true" />
<ImageView fx:id="imgImage10" fitHeight="30.0" fitWidth="35.0" layoutX="110.0" layoutY="677.0" pickOnBounds="true" preserveRatio="true" /> <ImageView fx:id="imgImage10" fitHeight="30.0" fitWidth="35.0" layoutX="110.0" layoutY="677.0" pickOnBounds="true" preserveRatio="true" />
<CheckBox layoutX="358.0" layoutY="154.0" mnemonicParsing="false" />
</AnchorPane> </AnchorPane>