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

anpassungen

Browse Source
This commit is contained in:
Ma
2023-01-31 14:27:24 +01:00
parent 8e985224f4
commit cacd6423a0
11 changed files with 179 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,8 +1,6 @@
package com.example.vpr_javafx;
import javafx.fxml.FXML;
import javafx.scene.control.Alert;
import javafx.scene.control.Label;
import javafx.scene.control.PasswordField;
import javafx.scene.control.TextField;
@@ -27,15 +25,40 @@ import java.util.regex.Pattern;
*/
public class Data {
private String pathRead;
@FXML
private TextField tfPhone;
@FXML
private PasswordField pfPassword;
public Data(String pathRead) {
this.pathRead = pathRead;
}
/**
* @author Kevin Pfannenstiel
* @return
*/
public HashMap<String, String> readLoginData()
{
try {
List<String> lines = Files.readAllLines(Paths.get(pathRead));
HashMap<String, String> user = new HashMap<>();
for (int i = 0; i < lines.size(); i++)
{
String[] parts = lines.get(i).split(";");
String phoneNumber = parts[3];
String password = parts[5];
user.put(phoneNumber, password);
}
return user;
} catch (IOException e) {
e.printStackTrace();
return new HashMap<>();
}
}
/**
* readUser() is a method to split user.txt into lines and save them in an arraylist
*
@@ -271,8 +294,7 @@ public class Data {
boolean phoneNumberValid = false;
boolean passwordValid = false;
LoginDatei file = new LoginDatei("user.txt");
HashMap<String, String> users = file.readFile();
HashMap<String, String> users = readLoginData();
String phoneNumber = tfPhone.getText();
String password = pfPassword.getText();

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

@@ -113,6 +113,7 @@ public class HelloController {
@FXML
protected void FillLabels() {
try {
List<String> menu = Files.readAllLines(Paths.get("menue.txt"));
@@ -128,85 +129,85 @@ public class HelloController {
String dayMenu = dish+"\n"+sideDish+"\n"+"("+allergenic+")";
if(typ.equals("Fleisch")) {
imageUrl=meatUrl;
}
if(typ.equals("Vegetarisch")) {
imageUrl=veggieImageUrl;
}
if(typ.equals("Vegan")) {
imageUrl=veganUrl;
}
Image image = new Image("C:/Unterricht/VPR_Projekt/target/classes/com/example/vpr_javafx/" + imageUrl);
// if(typ.equals("Fleisch")) {
// imageUrl=meatUrl;
// }
// if(typ.equals("Vegetarisch")) {
// imageUrl=veggieImageUrl;
// }
// if(typ.equals("Vegan")) {
// imageUrl=veganUrl;
// }
//
// Image image = new Image("C:/Unterricht/VPR_Projekt/target/classes/com/example/vpr_javafx/" + imageUrl);
switch (i) {
case 0:
lMonH1.setText(dayMenu);
imgImage1.setImage(image);
// imgImage1.setImage(image);
break;
case 1:
lMonD1.setText(dayMenu);
break;
case 2:
lMonH2.setText(dayMenu);
imgImage2.setImage(image);
// imgImage2.setImage(image);
break;
case 3:
lMonD2.setText(dayMenu);
break;
case 4:
lTueH1.setText(dayMenu);
imgImage3.setImage(image);
// imgImage3.setImage(image);
break;
case 5:
lTueD1.setText(dayMenu);
break;
case 6:
lTueH2.setText(dayMenu);
imgImage4.setImage(image);
// imgImage4.setImage(image);
break;
case 7:
lTueD2.setText(dayMenu);
break;
case 8:
lWednH1.setText(dayMenu);
imgImage5.setImage(image);
// imgImage5.setImage(image);
break;
case 9:
lWednD1.setText(dayMenu);
break;
case 10:
lWednH2.setText(dayMenu);
imgImage6.setImage(image);
// imgImage6.setImage(image);
break;
case 11:
lWednD2.setText(dayMenu);
break;
case 12:
lThurH1.setText(dayMenu);
imgImage7.setImage(image);
// imgImage7.setImage(image);
break;
case 13:
lThurD1.setText(dayMenu);
break;
case 14:
lThurH2.setText(dayMenu);
imgImage8.setImage(image);
// imgImage8.setImage(image);
break;
case 15:
lThurD2.setText(dayMenu);
break;
case 16:
lFriH1.setText(dayMenu);
imgImage9.setImage(image);
// imgImage9.setImage(image);
break;
case 17:
lFriD1.setText(dayMenu);
break;
case 18:
lFriH2.setText(dayMenu);
imgImage10.setImage(image);
// imgImage10.setImage(image);
break;
case 19:
lFriD2.setText(dayMenu);

84
src/main/java/com/example/vpr_javafx/LoginDatei.java
View File

@@ -1,42 +1,42 @@
package com.example.vpr_javafx;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.HashMap;
import java.util.List;
public class LoginDatei
{
private final String dateiname;
public LoginDatei(String dateiname)
{
this.dateiname = dateiname;
}
public HashMap<String, String> readFile()
{
try {
List<String> lines = Files.readAllLines(Paths.get(dateiname));
HashMap<String, String> user = new HashMap<>();
for (int i = 0; i < lines.size(); i++)
{
String[] parts = lines.get(i).split(";");
String phoneNumber = parts[3];
String password = parts[5];
user.put(phoneNumber, password);
}
return user;
} catch (IOException e) {
e.printStackTrace();
return new HashMap<>();
}
}
}
//package com.example.vpr_javafx;
//
//import java.io.IOException;
//import java.nio.file.Files;
//import java.nio.file.Paths;
//import java.util.HashMap;
//import java.util.List;
//
//public class LoginDatei
//{
// private final String dateiname;
//
// public LoginDatei(String dateiname)
// {
// this.dateiname = dateiname;
// }
//
// public HashMap<String, String> readFile()
// {
// try {
// List<String> lines = Files.readAllLines(Paths.get(dateiname));
//
// HashMap<String, String> user = new HashMap<>();
//
// for (int i = 0; i < lines.size(); i++)
// {
// String[] parts = lines.get(i).split(";");
//
// String phoneNumber = parts[3];
// String password = parts[5];
//
// user.put(phoneNumber, password);
// }
//
// return user;
//
// } catch (IOException e) {
// e.printStackTrace();
// return new HashMap<>();
// }
// }
//}

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
*
* @return a String with dish, sideDish, list of ingredients and the typ of the menu
* @author Madeleine Vigier
*/
@@ -81,3 +82,4 @@ public class Menu {
+ type + '\n'
+ ingredients;
}
}

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

@@ -13,7 +13,7 @@
<?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">
<Label layoutX="76.0" layoutY="176.0" text="Montag" textFill="#6f7baf">
<Label fx:id="monday" layoutX="76.0" layoutY="176.0" textFill="#6f7baf">
<font>
<Font name="Century Gothic Bold" size="13.0" />
</font>
@@ -21,7 +21,7 @@
<Insets />
</opaqueInsets>
</Label>
<Label layoutX="74.0" layoutY="299.0" text="Dienstag" textFill="#6f7baf">
<Label fx:id="tuesday" layoutX="74.0" layoutY="299.0" textFill="#6f7baf">
<font>
<Font name="Century Gothic Bold" size="13.0" />
</font>
@@ -29,7 +29,7 @@
<Insets />
</opaqueInsets>
</Label>
<Label layoutX="72.0" layoutY="422.0" text="Mittwoch" textFill="#6f7baf">
<Label fx:id="wendesday" layoutX="72.0" layoutY="422.0" textFill="#6f7baf">
<font>
<Font name="Century Gothic Bold" size="13.0" />
</font>
@@ -37,7 +37,7 @@
<Insets />
</opaqueInsets>
</Label>
<Label layoutX="63.0" layoutY="543.0" text="Donnerstag" textFill="#6f7baf">
<Label fx:id="thursday" layoutX="63.0" layoutY="543.0" textFill="#6f7baf">
<font>
<Font name="Century Gothic Bold" size="13.0" />
</font>
@@ -45,7 +45,7 @@
<Insets />
</opaqueInsets>
</Label>
<Label layoutX="79.0" layoutY="664.0" text="Freitag" textFill="#6f7baf">
<Label fx:id="friday" layoutX="79.0" layoutY="664.0" textFill="#6f7baf">
<font>
<Font name="Century Gothic Bold" size="13.0" />
</font>