fix: refactor
This commit is contained in:
Johannes Kantz
parent
4d6c2043d7
commit
c08b0aece5
@ -3,16 +3,11 @@ package com.bib.essensbestellungsverwaltung;
|
||||
import javafx.fxml.FXML;
|
||||
import javafx.fxml.FXMLLoader;
|
||||
import javafx.scene.Parent;
|
||||
import javafx.scene.Scene;
|
||||
import javafx.scene.control.Button;
|
||||
import javafx.scene.input.ContextMenuEvent;
|
||||
import javafx.scene.input.MouseEvent;
|
||||
import javafx.scene.layout.Background;
|
||||
import javafx.scene.layout.BorderPane;
|
||||
import javafx.stage.Stage;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Arrays;
|
||||
|
||||
public class ParentMenuController {
|
||||
|
||||
@ -60,7 +55,7 @@ public class ParentMenuController {
|
||||
|
||||
@FXML
|
||||
public void onAusloggenClick(MouseEvent mouseEvent) throws IOException {
|
||||
Parent p = FXMLLoader.load(StartViewApplication.class.getResource("workerMenu.fxml"));
|
||||
Parent p = FXMLLoader.load(StartViewApplication.class.getResource("workerMenu-view.fxml"));
|
||||
StartViewApplication.primary.getScene().setRoot(p);
|
||||
}
|
||||
|
||||
@ -72,7 +67,8 @@ public class ParentMenuController {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
private void setButtonActive(Button b){
|
||||
|
||||
private void setButtonActive(Button b) {
|
||||
einstellungenButton.getStyleClass().remove("active");
|
||||
kinderButton.getStyleClass().remove("active");
|
||||
bestellungButton.getStyleClass().remove("active");
|
||||
|
||||
@ -3,12 +3,9 @@ package com.bib.essensbestellungsverwaltung;
|
||||
import javafx.fxml.FXML;
|
||||
import javafx.fxml.FXMLLoader;
|
||||
import javafx.scene.Parent;
|
||||
import javafx.scene.Scene;
|
||||
import javafx.scene.control.Button;
|
||||
import javafx.scene.input.ContextMenuEvent;
|
||||
import javafx.scene.input.MouseEvent;
|
||||
import javafx.scene.layout.BorderPane;
|
||||
import javafx.stage.Stage;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
@ -72,7 +69,7 @@ public class WorkerMenuController {
|
||||
|
||||
@FXML
|
||||
public void onAusloggenClick(MouseEvent mouseEvent) throws IOException {
|
||||
Parent p = FXMLLoader.load(StartViewApplication.class.getResource("parentMenu.fxml"));
|
||||
Parent p = FXMLLoader.load(StartViewApplication.class.getResource("parentMenu-view.fxml"));
|
||||
StartViewApplication.primary.getScene().setRoot(p);
|
||||
}
|
||||
|
||||
|
||||
@ -1,30 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<?import javafx.geometry.Insets?>
|
||||
<?import javafx.scene.control.Label?>
|
||||
<?import javafx.scene.control.Button?>
|
||||
<?import javafx.scene.control.TextField?>
|
||||
<?import javafx.scene.layout.GridPane?>
|
||||
<?import javafx.scene.control.PasswordField?>
|
||||
<GridPane hgap="10.0" vgap="10.0"
|
||||
xmlns:fx="http://javafx.com/fxml/1"
|
||||
xmlns="http://javafx.com/javafx/11.0.2"
|
||||
fx:controller="com.bib.essensbestellungsverwaltung.HelloController">
|
||||
<padding>
|
||||
<Insets bottom="20.0" left="20.0" right="20.0" top="20.0"/>
|
||||
</padding>
|
||||
<Label text="Bitte geben Sie Ihre Anmeldedaten ein."
|
||||
GridPane.columnIndex="0" GridPane.columnSpan="2" GridPane.rowIndex="0" />
|
||||
<Label text="Benutzername:"
|
||||
GridPane.columnIndex="0" GridPane.rowIndex="1" />
|
||||
<TextField fx:id="unsernameEingabe"
|
||||
GridPane.columnIndex="1" GridPane.rowIndex="1"/>
|
||||
<Label text="Passwort:"
|
||||
GridPane.columnIndex="0" GridPane.rowIndex="2" />
|
||||
<PasswordField fx:id="passwortEingabe"
|
||||
GridPane.columnIndex="1" GridPane.rowIndex="2"/>
|
||||
<Button text="LOGIN" onAction="#onLoginButtonClick"
|
||||
GridPane.columnIndex="1" GridPane.rowIndex="3" />
|
||||
<Label fx:id="lblAusgabe"
|
||||
GridPane.columnIndex="0" GridPane.columnSpan="2" GridPane.rowIndex="4"/>
|
||||
</GridPane>
|
||||
@ -1,60 +1,70 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<?import javafx.geometry.*?>
|
||||
<?import javafx.geometry.Insets?>
|
||||
<?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.ParentMenuController">
|
||||
<?import javafx.scene.text.Font?>
|
||||
<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.ParentMenuController">
|
||||
<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="essensplanButton" alignment="CENTER_LEFT" mnemonicParsing="false" onMouseClicked="#onEssensplanClick" prefHeight="60.0" prefWidth="250.0" styleClass="sidebar-nav_button" text="Essensplan">
|
||||
<Button fx:id="essensplanButton" alignment="CENTER_LEFT" mnemonicParsing="false"
|
||||
onMouseClicked="#onEssensplanClick" prefHeight="60.0" prefWidth="250.0"
|
||||
styleClass="sidebar-nav_button" text="Essensplan">
|
||||
<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/menu.png" />
|
||||
<Image url="@pics/menu.png"/>
|
||||
</image>
|
||||
</ImageView>
|
||||
</graphic>
|
||||
</Button>
|
||||
<Button fx:id="kinderButton" alignment="CENTER_LEFT" mnemonicParsing="false" onMouseClicked="#onKinderClick" prefHeight="60.0" prefWidth="250.0" styleClass="sidebar-nav_button" text="Kinder">
|
||||
<Button fx:id="kinderButton" alignment="CENTER_LEFT" mnemonicParsing="false"
|
||||
onMouseClicked="#onKinderClick" prefHeight="60.0" prefWidth="250.0"
|
||||
styleClass="sidebar-nav_button" text="Kinder">
|
||||
<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/little-kid.png" />
|
||||
<Image url="@pics/little-kid.png"/>
|
||||
</image>
|
||||
</ImageView>
|
||||
</graphic>
|
||||
</Button>
|
||||
<Button fx:id="bestellungButton" alignment="CENTER_LEFT" mnemonicParsing="false" onMouseClicked="#onBestellungClick" prefHeight="60.0" prefWidth="250.0" styleClass="sidebar-nav_button" text="Bestellung">
|
||||
<Button fx:id="bestellungButton" alignment="CENTER_LEFT" mnemonicParsing="false"
|
||||
onMouseClicked="#onBestellungClick" prefHeight="60.0" prefWidth="250.0"
|
||||
styleClass="sidebar-nav_button" text="Bestellung">
|
||||
<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/shopping-list.png" />
|
||||
<Image url="@pics/shopping-list.png"/>
|
||||
</image>
|
||||
</ImageView>
|
||||
</graphic>
|
||||
</Button>
|
||||
<Region VBox.vgrow="ALWAYS" />
|
||||
<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">
|
||||
<Region VBox.vgrow="ALWAYS"/>
|
||||
<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>
|
||||
@ -63,19 +73,22 @@
|
||||
</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" />
|
||||
</padding></HBox>
|
||||
<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>
|
||||
@ -1,26 +0,0 @@
|
||||
#contentContainer{
|
||||
-fx-background-color: #add8e6;
|
||||
}
|
||||
|
||||
#contentContainer2{
|
||||
-fx-background-color: lightblue;
|
||||
}
|
||||
|
||||
#contentButton{
|
||||
-fx-background-color: transparent;
|
||||
}
|
||||
|
||||
#contentButton:hover{
|
||||
-fx-underline: true;
|
||||
-fx-background-color: #78939d;
|
||||
-fx-text-fill: white;
|
||||
}
|
||||
|
||||
#btLogOut{
|
||||
-fx-background-color: transparent;
|
||||
-fx-pref-height: 40px;
|
||||
}
|
||||
|
||||
#btLogOut:hover{
|
||||
-fx-underline: true;
|
||||
}
|
||||
@ -1,111 +1,129 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<?import javafx.geometry.*?>
|
||||
<?import javafx.geometry.Insets?>
|
||||
<?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 />
|
||||
</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">
|
||||
<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">
|
||||
<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" />
|
||||
</padding></HBox>
|
||||
<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>
|
||||
Loading…
Reference in New Issue
Block a user