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

Merge remote-tracking branch 'origin/stable' into stable

Browse Source 
# Conflicts:
#	src/main/resources/com/bib/essensbestellungsverwaltung/child-view.fxml
This commit is contained in:
pbs2h21asc
2023-02-05 21:41:33 +01:00
parent 6ca54aa026 6fc28a0827
commit 3a2288f8c8
27 changed files with 1190 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/resources/com/bib/essensbestellungsverwaltung/createFood-view.fxml
View File

@@ -4,6 +4,7 @@
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<?import javafx.scene.text.*?>
<?import org.controlsfx.control.*?>
<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="731.0" stylesheets="@createFood.css" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.bib.essensbestellungsverwaltung.CreateFoodController">
<children>
@@ -90,8 +91,8 @@
</HBox>
<HBox prefHeight="76.0" prefWidth="459.0">
<children>
<Label prefHeight="41.0" prefWidth="171.0" text="Allergien mit Komma getrennt" />
<TextArea fx:id="allergienTextBox" prefHeight="76.0" prefWidth="246.0" />
<Label prefHeight="25.0" prefWidth="171.0" text="Allergien" />
<CheckComboBox fx:id="allergienComboBox" prefHeight="25.0" prefWidth="200.0" />
</children>
</HBox>
<Text fx:id="responseText" fill="RED" strokeType="OUTSIDE" strokeWidth="0.0" textAlignment="CENTER" wrappingWidth="459.13673400878906">
@@ -101,7 +102,7 @@
</Text>
</children>
</VBox>
<Button id="btCreateFood" layoutX="484.0" layoutY="481.0" mnemonicParsing="false" onAction="#onHinzufügen" prefHeight="34.0" prefWidth="146.0" text="Hinzufügen" />
<Button id="btCreateFood" layoutX="484.0" layoutY="481.0" mnemonicParsing="false" onAction="#onHinzufuegen" prefHeight="34.0" prefWidth="146.0" text="Hinzufügen" />
<Button id="btCancelFood" layoutX="102.0" layoutY="473.0" mnemonicParsing="false" onAction="#onAbbrechen" prefHeight="50.0" prefWidth="162.0" text="Abbrechen" />
</children>
</AnchorPane>

25
src/main/resources/com/bib/essensbestellungsverwaltung/dailyOrder-view.fxml
View File

@@ -1,14 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import java.lang.*?>
<?import java.util.*?>
<?import javafx.scene.*?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<?import javafx.scene.text.*?>
<AnchorPane xmlns="http://javafx.com/javafx"
xmlns:fx="http://javafx.com/fxml"
fx:controller="com.bib.essensbestellungsverwaltung.AdminController"
prefHeight="400.0" prefWidth="600.0">
<AnchorPane prefHeight="700.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.bib.essensbestellungsverwaltung.DailyOrderController">
<children>
<HBox alignment="CENTER" layoutX="58.0" layoutY="221.0" prefHeight="349.0" prefWidth="683.0">
<children>
<ListView fx:id="listView" prefHeight="349.0" prefWidth="300.0" />
</children>
</HBox>
<Text layoutX="88.0" layoutY="68.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Tagesbestellung">
<font>
<Font name="System Bold" size="25.0" />
</font>
</Text>
<DatePicker fx:id="datePicker" layoutX="88.0" layoutY="142.0" onAction="#onChangeDate" />
<Label layoutX="88.0" layoutY="121.0" text="Datum" />
<Button fx:id="sendButton" layoutX="374.0" layoutY="617.0" mnemonicParsing="false" onAction="#onSendButton" text="Bestellung senden" />
</children>
</AnchorPane>

20
src/main/resources/com/bib/essensbestellungsverwaltung/invoice-view.fxml
View File

@@ -17,14 +17,10 @@
</font></Text>
<HBox alignment="CENTER" prefHeight="100.0" prefWidth="122.0" spacing="20.0">
<children>
<VBox alignment="CENTER" prefHeight="200.0" prefWidth="100.0">
<VBox alignment="CENTER" layoutX="150.0" layoutY="10.0" prefHeight="200.0" prefWidth="100.0">
<children>
<Label text="Jahr" />
<Spinner fx:id="jahrSpinner">
<valueFactory>
<SpinnerValueFactory.IntegerSpinnerValueFactory initialValue="2023" max="2100" min="2020" />
</valueFactory>
</Spinner>
<Label text="Kind" />
<ChoiceBox fx:id="childChoiceBox"></ChoiceBox>
</children>
</VBox>
<VBox alignment="CENTER" prefHeight="200.0" prefWidth="100.0">
@@ -50,6 +46,16 @@
</ChoiceBox>
</children>
</VBox>
<VBox alignment="CENTER" prefHeight="200.0" prefWidth="100.0">
<children>
<Label text="Jahr" />
<Spinner fx:id="jahrSpinner">
<valueFactory>
<SpinnerValueFactory.IntegerSpinnerValueFactory initialValue="2023" max="2100" min="2020" />
</valueFactory>
</Spinner>
</children>
</VBox>
</children>
</HBox>
<Button mnemonicParsing="false" onMouseClicked="#onRechnungErstellenClick" text="Rechnung erstellen" />

3
src/main/resources/com/bib/essensbestellungsverwaltung/menue.css
View File

@@ -30,4 +30,7 @@
.btFood.active{
-fx-background-color: rgba(97, 97, 232, 0.3);
-fx-background-radius: 25;
}
.sidebar-nav_button.active {
-fx-background-color: #4e92b4;
}

17
src/main/resources/com/bib/essensbestellungsverwaltung/orderHistory-view.fxml Normal file
View File

@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<?import javafx.scene.text.*?>
<AnchorPane prefHeight="700.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.bib.essensbestellungsverwaltung.OrderHistoryController">
<children>
<Text layoutX="91.0" layoutY="84.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Bestellungen">
<font>
<Font name="System Bold" size="25.0" />
</font>
</Text>
<ListView fx:id="listView" layoutX="91.0" layoutY="135.0" prefHeight="428.0" prefWidth="499.0" />
</children>
</AnchorPane>

155
src/main/resources/com/bib/essensbestellungsverwaltung/signUp-view.fxml
View File

@@ -29,72 +29,109 @@
<Circle fill="#67b5ff2e" layoutX="-23.0" layoutY="368.0" radius="100.0" stroke="BLACK" strokeType="INSIDE" strokeWidth="0.0" />
<Circle fill="#69b6ffb0" layoutX="235.0" layoutY="310.0" radius="158.0" stroke="BLACK" strokeType="INSIDE" strokeWidth="0.0" />
<Circle fill="#93c4f23d" layoutY="258.0" radius="106.0" stroke="BLACK" strokeType="INSIDE" strokeWidth="0.0" />
<VBox alignment="CENTER" layoutX="263.0" prefHeight="400.0" prefWidth="338.0" style="-fx-background-color: white;">
<VBox layoutX="262.0" prefHeight="400.0" prefWidth="364.0" style="-fx-background-color: white;">
<children>
<TextField promptText="Email" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;" fx:id="tfEmail">
<effect>
<Blend />
</effect>
<font>
<Font name="Microsoft Tai Le Bold" size="12.0" />
</font>
<VBox.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</VBox.margin>
</TextField>
<TextField promptText="Email bestätigen" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;" fx:id="tfBestätigungEmail">
<effect>
<Blend />
</effect>
<font>
<Font name="Microsoft Tai Le Bold" size="12.0" />
</font>
<VBox.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</VBox.margin>
</TextField>
<PasswordField promptText="Passwort" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;" fx:id="pfPasswort">
<font>
<Font name="Microsoft Tai Le Bold" size="12.0" />
</font>
<opaqueInsets>
<Insets />
</opaqueInsets>
<effect>
<Blend />
</effect>
<VBox.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</VBox.margin>
</PasswordField>
<PasswordField promptText="Passwort bestätigen" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;" fx:id="pfBestätigungPassowrt">
<font>
<Font name="Microsoft Tai Le Bold" size="12.0" />
</font>
<opaqueInsets>
<Insets />
</opaqueInsets>
<effect>
<Blend />
</effect>
<VBox.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</VBox.margin>
</PasswordField>
<TextField fx:id="tfLastName" alignment="TOP_LEFT" prefHeight="26.0" prefWidth="282.0" promptText="Name" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
<effect>
<Blend />
</effect>
<font>
<Font name="Microsoft Tai Le Bold" size="12.0" />
</font>
<VBox.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</VBox.margin>
</TextField>
<TextField fx:id="tfFirstName" promptText="Vorname" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
<effect>
<Blend />
</effect>
<font>
<Font name="Microsoft Tai Le Bold" size="12.0" />
</font>
<VBox.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</VBox.margin>
</TextField>
<TextField fx:id="tfEmail" promptText="Email" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
<effect>
<Blend />
</effect>
<font>
<Font name="Microsoft Tai Le Bold" size="12.0" />
</font>
<VBox.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</VBox.margin>
</TextField>
<PasswordField fx:id="pfPassword" accessibleRole="TEXT_FIELD" promptText="Passwort" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
<font>
<Font name="Microsoft Tai Le Bold" size="12.0" />
</font>
<opaqueInsets>
<Insets />
</opaqueInsets>
<effect>
<Blend />
</effect>
<VBox.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</VBox.margin>
</PasswordField>
<HBox prefHeight="100.0" prefWidth="200.0">
<children>
<TextField fx:id="tfPostCode" prefHeight="35.0" prefWidth="92.0" promptText="PLZ" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
<HBox.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</HBox.margin>
<font>
<Font name="Microsoft Tai Le Bold" size="12.0" />
</font>
</TextField>
<TextField fx:id="tfCity" prefHeight="35.0" prefWidth="182.0" promptText="Stadt" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
<HBox.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</HBox.margin>
<font>
<Font name="Microsoft Tai Le Bold" size="12.0" />
</font>
</TextField>
</children>
</HBox>
<HBox prefHeight="100.0" prefWidth="200.0">
<children>
<TextField fx:id="tfStreet" prefHeight="27.0" prefWidth="134.0" promptText="Straße" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
<HBox.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</HBox.margin>
<font>
<Font name="Microsoft Tai Le Bold" size="12.0" />
</font>
</TextField>
<TextField fx:id="tfHouseNumber" prefHeight="27.0" prefWidth="99.0" promptText="Hausnummer" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
<HBox.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</HBox.margin>
<font>
<Font name="Microsoft Tai Le Bold" size="12.0" />
</font>
</TextField>
</children>
</HBox>
<HBox alignment="CENTER" prefHeight="30.0" prefWidth="238.0">
<children>
<Button mnemonicParsing="false" prefHeight="25.0" prefWidth="106.0" style="-fx-background-radius: 25; -fx-background-color: lightblue;" text="Konto erstellen" textFill="WHITE" onAction="#onKontoErstellenBtClick">
<Button mnemonicParsing="false" onAction="#onKontoErstellenBtClick" prefHeight="25.0" prefWidth="106.0" style="-fx-background-radius: 25; -fx-background-color: lightblue;" text="Konto erstellen" textFill="WHITE">
<font>
<Font name="Microsoft Tai Le Bold" size="12.0" />
</font></Button>
<Button id="btSignUp" mnemonicParsing="false" prefHeight="25.0" prefWidth="101.0" style="-fx-background-color: tranparent;" text="Anmelden" textFill="#7c7b7b" underline="true" onAction="#onAnmeldenBtClick"/>
<Button id="btSignUp" mnemonicParsing="false" onAction="#onAnmeldenBtClick" prefHeight="25.0" prefWidth="101.0" style="-fx-background-color: tranparent;" text="Anmelden" textFill="#7c7b7b" underline="true" />
</children>
<opaqueInsets>
<Insets top="15.0" />
</opaqueInsets>
<VBox.margin>
<Insets top="15.0" />
</VBox.margin>
<opaqueInsets>
<Insets top="15.0" />
</opaqueInsets>
<VBox.margin>
<Insets top="15.0" />
</VBox.margin>
</HBox>
</children>
<padding>

74
src/main/resources/com/bib/essensbestellungsverwaltung/workerMenu-view.fxml
View File

@@ -1,129 +1,113 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.geometry.Insets?>
<?import javafx.geometry.*?>
<?import javafx.scene.control.*?>
<?import javafx.scene.image.*?>
<?import javafx.scene.layout.*?>
<?import javafx.scene.text.*?>
<BorderPane fx:id="contentView" prefHeight="750.0" prefWidth="1200.0" stylesheets="@menue.css"
xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="com.bib.essensbestellungsverwaltung.WorkerMenuController">
<BorderPane fx:id="contentView" prefHeight="750.0" prefWidth="1200.0" stylesheets="@menue.css" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.bib.essensbestellungsverwaltung.WorkerMenuController">
<left>
<VBox alignment="TOP_CENTER" prefHeight="750.0" prefWidth="350.0" spacing="10.0"
style="-fx-background-color: #69b6ff; -fx-padding: 20;" BorderPane.alignment="CENTER">
<VBox alignment="TOP_CENTER" prefHeight="750.0" prefWidth="350.0" spacing="10.0" style="-fx-background-color: #69b6ff; -fx-padding: 20;" BorderPane.alignment="CENTER">
<children>
<Button fx:id="tagesbestellungButton" alignment="CENTER_LEFT" mnemonicParsing="false"
onMouseClicked="#onTagesbestellungenClick" prefHeight="60.0" prefWidth="250.0"
styleClass="sidebar-nav_button" text="Tagesbestellung">
<Button fx:id="tagesbestellungButton" alignment="CENTER_LEFT" mnemonicParsing="false" onMouseClicked="#onTagesbestellungenClick" prefHeight="60.0" prefWidth="250.0" styleClass="sidebar-nav_button" text="Tagesbestellung">
<font>
<Font size="20.0"/>
<Font size="20.0" />
</font>
<graphic>
<ImageView fitHeight="35.0" fitWidth="35.0" pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@pics/to-do-list.png"/>
<Image url="@pics/to-do-list.png" />
</image>
</ImageView>
</graphic>
</Button>
<Button fx:id="monatsabrechnungButton" alignment="CENTER_LEFT" mnemonicParsing="false"
onMouseClicked="#onMonatsabrechnungClick" prefHeight="60.0" prefWidth="250.0"
styleClass="sidebar-nav_button" text="Monatsabrechnung">
<Button fx:id="monatsabrechnungButton" alignment="CENTER_LEFT" mnemonicParsing="false" onMouseClicked="#onMonatsabrechnungClick" prefHeight="60.0" prefWidth="250.0" styleClass="sidebar-nav_button" text="Monatsabrechnung">
<font>
<Font size="20.0"/>
<Font size="20.0" />
</font>
<graphic>
<ImageView fitHeight="35.0" fitWidth="35.0" pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@pics/spreadsheet.png"/>
<Image url="@pics/spreadsheet.png" />
</image>
</ImageView>
</graphic>
</Button>
<Button fx:id="wochenplanButton" alignment="CENTER_LEFT" mnemonicParsing="false"
onMouseClicked="#onWochenplanClick" prefHeight="60.0" prefWidth="250.0"
styleClass="sidebar-nav_button" text="Wochenplan">
<Button fx:id="wochenplanButton" alignment="CENTER_LEFT" mnemonicParsing="false" onMouseClicked="#onWochenplanClick" prefHeight="60.0" prefWidth="250.0" styleClass="sidebar-nav_button" text="Wochenplan">
<font>
<Font size="20.0"/>
<Font size="20.0" />
</font>
<graphic>
<ImageView fitHeight="35.0" fitWidth="35.0" pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@pics/calendar.png"/>
<Image url="@pics/calendar.png" />
</image>
</ImageView>
</graphic>
</Button>
<Button fx:id="mahlzeitButton" alignment="CENTER_LEFT" mnemonicParsing="false"
onMouseClicked="#onMahlzeitClick" prefHeight="60.0" prefWidth="250.0"
styleClass="sidebar-nav_button" text="Mahlzeit">
<Button fx:id="mahlzeitButton" alignment="CENTER_LEFT" mnemonicParsing="false" onMouseClicked="#onMahlzeitClick" prefHeight="60.0" prefWidth="250.0" styleClass="sidebar-nav_button" text="Mahlzeit">
<font>
<Font size="20.0"/>
<Font size="20.0" />
</font>
<graphic>
<ImageView fitHeight="35.0" fitWidth="35.0" pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@pics/lunch.png"/>
<Image url="@pics/lunch.png" />
</image>
</ImageView>
</graphic>
</Button>
<Button fx:id="mitarbeiterButton" alignment="CENTER_LEFT" mnemonicParsing="false"
onMouseClicked="#onMitarbeiterClick" prefHeight="60.0" prefWidth="250.0"
styleClass="sidebar-nav_button" text="Mitarbeiter">
<Button fx:id="mitarbeiterButton" alignment="CENTER_LEFT" mnemonicParsing="false" onMouseClicked="#onMitarbeiterClick" prefHeight="60.0" prefWidth="250.0" styleClass="sidebar-nav_button" text="Mitarbeiter">
<font>
<Font size="20.0"/>
<Font size="20.0" />
</font>
<graphic>
<ImageView fitHeight="35.0" fitWidth="35.0" pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@pics/teamwork.png"/>
<Image url="@pics/teamwork.png" />
</image>
</ImageView>
</graphic>
</Button>
<Region style="-fx-padding: 20;" VBox.vgrow="ALWAYS">
<opaqueInsets>
<Insets/>
<Insets />
</opaqueInsets>
</Region>
<Button fx:id="einstellungenButton" alignment="CENTER_LEFT" layoutX="10.0" layoutY="130.0"
mnemonicParsing="false" onMouseClicked="#onEinstellungenClick" prefHeight="60.0"
prefWidth="250.0" styleClass="sidebar-nav_button" text="Einstellungen">
<Button fx:id="einstellungenButton" alignment="CENTER_LEFT" layoutX="10.0" layoutY="130.0" mnemonicParsing="false" onMouseClicked="#onEinstellungenClick" prefHeight="60.0" prefWidth="250.0" styleClass="sidebar-nav_button" text="Einstellungen">
<font>
<Font size="20.0"/>
<Font size="20.0" />
</font>
<graphic>
<ImageView fitHeight="35.0" fitWidth="35.0" pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@pics/setting.png"/>
<Image url="@pics/setting.png" />
</image>
</ImageView>
</graphic>
</Button>
</children>
<opaqueInsets>
<Insets/>
<Insets />
</opaqueInsets>
</VBox>
</left>
<top>
<HBox alignment="CENTER_RIGHT" prefHeight="50.0" prefWidth="1200.0" style="-fx-background-color: #69b6ff;"
BorderPane.alignment="CENTER">
<HBox alignment="CENTER_RIGHT" prefHeight="50.0" prefWidth="1200.0" style="-fx-background-color: #69b6ff;" BorderPane.alignment="CENTER">
<children>
<Button mnemonicParsing="false" onMouseClicked="#onAusloggenClick" styleClass="sidebar-nav_button"
text="Ausloggen">
<Button mnemonicParsing="false" onMouseClicked="#onAusloggenClick" styleClass="sidebar-nav_button" text="Ausloggen">
<opaqueInsets>
<Insets/>
<Insets />
</opaqueInsets>
</Button>
</children>
<padding>
<Insets right="20.0"/>
<Insets right="20.0" />
</padding>
</HBox>
</top>
<center>
<AnchorPane prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER"/>
<AnchorPane prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER" />
</center>
</BorderPane>