Homeoffice/Essensbestellungsverwaltung
5
3
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Homeoffice:2814244d29619d5890cfebff62df567ec35da467
Branches Tags
Homeoffice:main
Homeoffice:stable
Homeoffice:feat/kindErstellen
Homeoffice:Richards_Branch
Homeoffice:feat/essensplanErstellen
..
compare: Homeoffice:6747188668dedfb06c5e8753dee82e77abdefe04
Branches Tags
Homeoffice:stable
Homeoffice:main
Homeoffice:feat/kindErstellen
Homeoffice:Richards_Branch
Homeoffice:feat/essensplanErstellen

No commits in common. "2814244d29619d5890cfebff62df567ec35da467" and "6747188668dedfb06c5e8753dee82e77abdefe04" have entirely different histories.
2814244d29 ... 6747188668

2 changed files with 35 additions and 74 deletions
Show Stats Expand all files Collapse all files

78
src/main/java/com/bib/essensbestellungsverwaltung/AdminController.java
View File

@ -1,81 +1,43 @@
package com.bib.essensbestellungsverwaltung; package com.bib.essensbestellungsverwaltung;
import javafx.fxml.FXML;
import javafx.scene.control.Alert;
import javafx.scene.control.PasswordField; import javafx.scene.control.PasswordField;
import javafx.scene.control.TextField; import javafx.scene.control.TextField;
public class AdminController { public class AdminController {
@FXML private TextField lastname;
TextField lastname; private TextField firstname;
@FXML private TextField street;
TextField firstname; private TextField number;
@FXML private TextField city;
TextField street; private TextField plz;
@FXML private TextField email;
TextField number; private PasswordField password;
@FXML
TextField city;
@FXML
TextField plz;
@FXML
TextField email;
@FXML
PasswordField password;
@FXML
protected void onBtSignUp(){ protected void onBtSignUp(){
String ln = lastname.toString();
String fn = firstname.toString();
String st = street.toString();
String nr = number.toString();
String cityString = city.toString();
String plzString = plz.toString();
String emailString = email.toString();
String pw = password.toString();
String[] userData = new String[]{ln,fn,pw,emailString};
String[] addressData = new String[]{st,nr,plzString,cityString};
Address adresse = new Address(st,nr,plzString,cityString);
String ln = lastname.getText(); Worker worker = new Worker(ln,fn,pw,emailString,adresse);
String fn = firstname.getText();
String st = street.getText();
String nr = number.getText();
String cityString = city.getText();
String plzString = plz.getText();
String emailString = email.getText();
String pw = password.getText();
if(!pw.matches("^(?=.*[0-9])(?=.*[a-z])(?=.*[A-Z])(?=.*[@#$%^&+=])(?=\\S+$).{8,}$")){
Alert alert = new Alert(Alert.AlertType.ERROR);
alert.setTitle("Passwort");
alert.setHeaderText("Ungültiges Passwort");
alert.setContentText("Das Passwort benötigt mindestens: \n-8 Zeichen\n-einen Kleinbuchstaben\n-einen Großbuchstaben\n-ein Sonderzeichen\n-kein Leerzeichen");
password.setText("");
}
if(!emailString.matches("^(?=.{1,64}@)[A-Za-z0-9_-]+(\\\\.[A-Za-z0-9_-]+)*@[^-][A-Za-z0-9-]+(\\\\.[A-Za-z0-9-]+)*(\\\\.[A-Za-z]{2,})$")){
Alert alert = new Alert(Alert.AlertType.ERROR);
alert.setTitle("E-Mail");
alert.setHeaderText("Ungültige E-Mail Adresse");
alert.setContentText("Bitte geben sie eine gültige E-Mail Adresse an");
email.setText("");
}
//String[] userData = new String[]{ln,fn,pw,emailString};
//String[] addressData = new String[]{st,nr,plzString,cityString};
Address address = new Address(st,nr,plzString,cityString);
Worker worker = new Worker(ln,fn,pw,emailString,address);
AccountMgr.createWorker(worker); AccountMgr.createWorker(worker);
} }
@FXML
protected void onBtCancel(){
}
} }

31
src/main/resources/com/bib/essensbestellungsverwaltung/createCoworker-view.fxml
View File

@ -3,22 +3,21 @@
<?import javafx.geometry.Insets?> <?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?> <?import javafx.scene.control.Button?>
<?import javafx.scene.control.Label?> <?import javafx.scene.control.Label?>
<?import javafx.scene.control.PasswordField?>
<?import javafx.scene.control.TextField?> <?import javafx.scene.control.TextField?>
<?import javafx.scene.layout.AnchorPane?> <?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.HBox?> <?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.VBox?> <?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?> <?import javafx.scene.text.Font?>
<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="860.0" prefWidth="850.0" stylesheets="@createCoworker.css" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.bib.essensbestellungsverwaltung.AdminController"> <AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="479.0" prefWidth="719.0" stylesheets="@createCoworker.css" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1">
<children> <children>
<Label layoutX="301.0" layoutY="49.0" /> <Label layoutX="301.0" layoutY="49.0" />
<Label layoutX="223.0" layoutY="76.0" prefHeight="28.0" prefWidth="220.0" text="Mitarbeiter hinzufügen"> <Label layoutX="230.0" layoutY="30.0" prefHeight="28.0" prefWidth="220.0" text="Mitarbeiter hinzufügen">
<font> <font>
<Font size="18.0" /> <Font size="18.0" />
</font> </font>
</Label> </Label>
<VBox layoutX="223.0" layoutY="149.0" prefHeight="317.0" prefWidth="514.0"> <VBox layoutX="119.0" layoutY="95.0" prefHeight="317.0" prefWidth="331.0">
<children> <children>
<HBox prefHeight="43.0" prefWidth="331.0"> <HBox prefHeight="43.0" prefWidth="331.0">
<children> <children>
@ -27,7 +26,7 @@
<Font size="16.0" /> <Font size="16.0" />
</font> </font>
</Label> </Label>
<TextField id="lastname" prefHeight="25.0" prefWidth="194.0" /> <TextField prefHeight="25.0" prefWidth="194.0" />
</children> </children>
</HBox> </HBox>
<HBox prefHeight="60.0" prefWidth="331.0"> <HBox prefHeight="60.0" prefWidth="331.0">
@ -40,7 +39,7 @@
<Font size="16.0" /> <Font size="16.0" />
</font> </font>
</Label> </Label>
<TextField id="firstname" prefHeight="25.0" prefWidth="193.0"> <TextField prefHeight="25.0" prefWidth="193.0">
<HBox.margin> <HBox.margin>
<Insets top="10.0" /> <Insets top="10.0" />
</HBox.margin> </HBox.margin>
@ -57,7 +56,7 @@
<Insets top="10.0" /> <Insets top="10.0" />
</padding> </padding>
</Label> </Label>
<TextField id="street" prefHeight="25.0" prefWidth="195.0"> <TextField prefHeight="25.0" prefWidth="195.0">
<HBox.margin> <HBox.margin>
<Insets top="10.0" /> <Insets top="10.0" />
</HBox.margin> </HBox.margin>
@ -74,7 +73,7 @@
<Insets top="10.0" /> <Insets top="10.0" />
</padding> </padding>
</Label> </Label>
<TextField id="number" prefHeight="25.0" prefWidth="87.0"> <TextField prefHeight="25.0" prefWidth="87.0">
<HBox.margin> <HBox.margin>
<Insets top="10.0" /> <Insets top="10.0" />
</HBox.margin> </HBox.margin>
@ -88,7 +87,7 @@
<Font size="16.0" /> <Font size="16.0" />
</font> </font>
</Label> </Label>
<TextField id="plz" prefHeight="25.0" prefWidth="87.0"> <TextField prefHeight="25.0" prefWidth="87.0">
<HBox.margin> <HBox.margin>
<Insets /> <Insets />
</HBox.margin> </HBox.margin>
@ -105,7 +104,7 @@
<Font size="16.0" /> <Font size="16.0" />
</font> </font>
</Label> </Label>
<TextField id="city" prefHeight="13.0" prefWidth="194.0"> <TextField prefHeight="13.0" prefWidth="194.0">
<HBox.margin> <HBox.margin>
<Insets top="5.0" /> <Insets top="5.0" />
</HBox.margin> </HBox.margin>
@ -125,14 +124,14 @@
<Insets top="10.0" /> <Insets top="10.0" />
</padding> </padding>
</Label> </Label>
<TextField id="email" prefHeight="25.0" prefWidth="196.0"> <TextField prefHeight="25.0" prefWidth="196.0">
<HBox.margin> <HBox.margin>
<Insets top="10.0" /> <Insets top="10.0" />
</HBox.margin> </HBox.margin>
</TextField> </TextField>
</children> </children>
</HBox> </HBox>
<HBox prefHeight="100.0" prefWidth="471.0"> <HBox prefHeight="100.0" prefWidth="200.0">
<children> <children>
<Label prefHeight="35.0" prefWidth="122.0" text="Passwort"> <Label prefHeight="35.0" prefWidth="122.0" text="Passwort">
<font> <font>
@ -142,16 +141,16 @@
<Insets top="10.0" /> <Insets top="10.0" />
</padding> </padding>
</Label> </Label>
<PasswordField id="password" accessibleRole="PASSWORD_FIELD" prefHeight="25.0" prefWidth="194.0"> <TextField prefHeight="25.0" prefWidth="194.0">
<HBox.margin> <HBox.margin>
<Insets top="10.0" /> <Insets top="10.0" />
</HBox.margin> </HBox.margin>
</PasswordField> </TextField>
</children> </children>
</HBox> </HBox>
</children> </children>
</VBox> </VBox>
<Button id="btCreateCoworker" fx:id="btCreateCoworker" layoutX="216.0" layoutY="533.0" mnemonicParsing="false" onAction="#onBtSignUp" prefHeight="44.0" prefWidth="158.0" text="Mitarbeiter hinzufügen" /> <Button id="btCreateCoworker" layoutX="119.0" layoutY="412.0" mnemonicParsing="false" prefHeight="44.0" prefWidth="158.0" text="Mitarbeiter hinzufügen" />
<Button id="btCancelCoworker" fx:id="btCancelCoworker" layoutX="443.0" layoutY="533.0" mnemonicParsing="false" onAction="#onBtCancel" prefHeight="44.0" prefWidth="158.0" text="Abbrechen" /> <Button id="btCancelCoworker" layoutX="357.0" layoutY="412.0" mnemonicParsing="false" prefHeight="44.0" prefWidth="158.0" text="Abbrechen" />
</children> </children>
</AnchorPane> </AnchorPane>