Merge branch 'master' into samu_masken
This commit is contained in:
commit
a4c908c1ba
@ -49,43 +49,55 @@ public class AccounterstellungMitarbeiter {
|
||||
kindDaten.add(ueberschrift,0,0);
|
||||
|
||||
kindDaten.addRow(1);
|
||||
Label name = new Label("Name:");
|
||||
kindDaten.add(name, 0, 1);
|
||||
TextField nameEingabe = new TextField();
|
||||
kindDaten.add(nameEingabe, 1, 1);
|
||||
Label vname = new Label("Vorname:");
|
||||
kindDaten.add(vname, 0, 1);
|
||||
TextField vnameEingabe = new TextField();
|
||||
kindDaten.add(vnameEingabe, 1, 1);
|
||||
|
||||
kindDaten.addRow(2);
|
||||
Label geburtstag = new Label("Geburtstag: ");
|
||||
kindDaten.add(geburtstag, 0, 2);
|
||||
DatePicker geburtstagEingabe = new DatePicker();
|
||||
geburtstagEingabe.setEditable(false);
|
||||
kindDaten.add(geburtstagEingabe, 1, 2);
|
||||
Label nname = new Label("Nachname:");
|
||||
kindDaten.add(nname, 0, 2);
|
||||
TextField nnameEingabe = new TextField();
|
||||
kindDaten.add(nnameEingabe, 1, 2);
|
||||
|
||||
kindDaten.addRow(3);
|
||||
Button hinzufuegen = new Button("hinzufügen");
|
||||
kindDaten.add(hinzufuegen, 1, 3);
|
||||
Label geburtstag = new Label("Geburtstag: ");
|
||||
kindDaten.add(geburtstag, 0, 3);
|
||||
DatePicker geburtstagEingabe = new DatePicker();
|
||||
geburtstagEingabe.setEditable(false);
|
||||
kindDaten.add(geburtstagEingabe, 1, 3);
|
||||
|
||||
kindDaten.addRow(4);
|
||||
Button hinzufuegen = new Button("hinzufügen");
|
||||
kindDaten.add(hinzufuegen, 1, 4);
|
||||
|
||||
kindDaten.addRow(5);
|
||||
hinzufuegen.setOnAction(e -> {
|
||||
Button neues = new Button(nameEingabe.getText());
|
||||
Button neues = new Button(vnameEingabe.getText());
|
||||
|
||||
boolean nameGueltig = false;
|
||||
boolean vnameGueltig = false;
|
||||
boolean gebGueltig = false;
|
||||
boolean nnameGueltig = false;
|
||||
|
||||
if (!nameEingabe.getText().equals("")) {
|
||||
nameGueltig = true;
|
||||
if (!vnameEingabe.getText().equals("")) {
|
||||
vnameGueltig = true;
|
||||
}
|
||||
|
||||
if (!nnameEingabe.getText().equals("")) {
|
||||
nnameGueltig = true;
|
||||
}
|
||||
|
||||
if (!geburtstagEingabe.getEditor().getText().equals("")) {
|
||||
gebGueltig = true;
|
||||
}
|
||||
|
||||
if (nameGueltig && gebGueltig) {
|
||||
if (vnameGueltig && gebGueltig && nnameGueltig) {
|
||||
kindanzeige.getChildren().add(neues);
|
||||
neues.setOnAction(a -> {
|
||||
((HBox) neues.getParent()).getChildren().remove(neues);
|
||||
});
|
||||
nameEingabe.setText("");
|
||||
vnameEingabe.setText("");
|
||||
nnameEingabe.setText("");
|
||||
geburtstagEingabe.getEditor().setText("");
|
||||
}
|
||||
});
|
||||
|
@ -0,0 +1,61 @@
|
||||
package de.subway_surfers.vpr_app;
|
||||
|
||||
import javafx.event.ActionEvent;
|
||||
import javafx.fxml.FXML;
|
||||
import javafx.geometry.Pos;
|
||||
import javafx.scene.Node;
|
||||
import javafx.scene.control.Control;
|
||||
import javafx.scene.layout.ColumnConstraints;
|
||||
import javafx.scene.layout.GridPane;
|
||||
import javafx.scene.layout.Priority;
|
||||
import javafx.scene.layout.RowConstraints;
|
||||
import javafx.stage.Modality;
|
||||
import javafx.stage.Stage;
|
||||
|
||||
|
||||
public class EssensverwaltungMitarbeiterView {
|
||||
@FXML
|
||||
private GridPane tagesplan;
|
||||
|
||||
public void initialize(){
|
||||
for (int i = 0; i < tagesplan.getColumnCount(); i++) {
|
||||
ColumnConstraints cc = new ColumnConstraints();
|
||||
cc.setHgrow(Priority.ALWAYS);
|
||||
cc.setFillWidth(true);
|
||||
tagesplan.getColumnConstraints().add(cc);
|
||||
}
|
||||
VerwaltungApplication.responsiveBreiteGrid(tagesplan);
|
||||
|
||||
tagesplan.heightProperty().addListener((obs,oldValue,newValue) -> {
|
||||
final int zeile = 1;
|
||||
for (Node n : tagesplan.getChildren()){
|
||||
if(n instanceof Control && GridPane.getRowIndex(n) == zeile){
|
||||
((Control) n).setPrefHeight(newValue.floatValue());
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
public void onAbmelden(ActionEvent actionEvent) {
|
||||
VerwaltungApplication.sceneWechseln("login-view.fxml");
|
||||
}
|
||||
|
||||
public void onFilter(ActionEvent actionEvent) {
|
||||
}
|
||||
|
||||
public void onHinzufuegen(ActionEvent actionEvent) {
|
||||
Stage gerichterstellung = new Stage();
|
||||
|
||||
//solange das neu geöffnete Fenster offen ist, wird das Hauptfenster gesperrt
|
||||
gerichterstellung.initModality(Modality.APPLICATION_MODAL);
|
||||
|
||||
VerwaltungApplication.sceneWechseln(gerichterstellung, 400, 530, "gerichterstellung_mitarbeiter-view.fxml");
|
||||
|
||||
gerichterstellung.minWidthProperty().set(400);
|
||||
gerichterstellung.minHeightProperty().set(530);
|
||||
}
|
||||
|
||||
public void onZurueck(ActionEvent actionEvent) {
|
||||
}
|
||||
|
||||
}
|
@ -0,0 +1,52 @@
|
||||
package de.subway_surfers.vpr_app;
|
||||
|
||||
import de.subway_surfers.vpr_app.logik.Zutat;
|
||||
import javafx.event.ActionEvent;
|
||||
import javafx.fxml.FXML;
|
||||
import javafx.scene.Node;
|
||||
import javafx.scene.control.Button;
|
||||
import javafx.scene.control.TextArea;
|
||||
import javafx.scene.control.TextField;
|
||||
import javafx.scene.layout.HBox;
|
||||
import javafx.scene.layout.Pane;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
public class GerichterstellungMitarbeiterView {
|
||||
private @FXML HBox anzeigeInhaltsstoffe;
|
||||
private @FXML TextArea eingabeBeschreibung;
|
||||
private @FXML TextField eingabeName;
|
||||
private @FXML Button buttonInhaltsstoffe;
|
||||
private @FXML TextField eingabeInhaltsstoffe;
|
||||
|
||||
private ArrayList<Zutat> zutaten;
|
||||
|
||||
public void initialize() {
|
||||
zutaten = new ArrayList<>();
|
||||
|
||||
//wird das Fenster vergrößert, wird das Eingabefeld für Inhaltstoffe und den Hinzufügenbutton
|
||||
// auf die volle breite vergrößert.
|
||||
((Pane) eingabeInhaltsstoffe.getParent()).widthProperty().addListener((obs, oldValue, newValue) -> {
|
||||
//eingabeName, da dieses Feld immer die gesamte breite der Stage haben.
|
||||
eingabeInhaltsstoffe.setPrefWidth(eingabeName.getWidth() - buttonInhaltsstoffe.getPrefWidth());
|
||||
});
|
||||
}
|
||||
|
||||
public void onButtonInhaltsstoffeClick(ActionEvent actionEvent) {
|
||||
String text = eingabeInhaltsstoffe.getText();
|
||||
if (!text.equals("")) {
|
||||
eingabeInhaltsstoffe.setText("");
|
||||
|
||||
Button neuerInhalt = new Button();
|
||||
neuerInhalt.setText(text);
|
||||
anzeigeInhaltsstoffe.getChildren().add(neuerInhalt);
|
||||
|
||||
Zutat neue = new Zutat(text);
|
||||
zutaten.add(neue);
|
||||
neuerInhalt.setOnAction(e -> {
|
||||
((HBox) neuerInhalt.getParent()).getChildren().remove(neuerInhalt);
|
||||
zutaten.remove(neue);
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
@ -8,8 +8,11 @@ public class HauptmenueMitarbeiterView {
|
||||
VerwaltungApplication.abmelden();
|
||||
}
|
||||
|
||||
public void onAccountAnlegen(ActionEvent actionEvent) {
|
||||
public void onAccountAnlegenClick(ActionEvent actionEvent) {
|
||||
VerwaltungApplication.sceneWechseln("accounterstellung_mitarbeiter.fxml");
|
||||
}
|
||||
|
||||
public void onSpeiseplanClick(ActionEvent actionEvent) {
|
||||
VerwaltungApplication.sceneWechseln("essensverwaltung_mitarbeiter-view.fxml");
|
||||
}
|
||||
}
|
||||
|
@ -2,8 +2,11 @@ package de.subway_surfers.vpr_app;
|
||||
|
||||
import javafx.application.Application;
|
||||
import javafx.fxml.FXMLLoader;
|
||||
import javafx.scene.Node;
|
||||
import javafx.scene.Scene;
|
||||
import javafx.scene.control.Alert;
|
||||
import javafx.scene.control.Control;
|
||||
import javafx.scene.layout.GridPane;
|
||||
import javafx.stage.Stage;
|
||||
|
||||
import java.io.IOException;
|
||||
@ -92,10 +95,12 @@ public class VerwaltungApplication extends Application {
|
||||
Stage akt = VerwaltungApplication.getStage();
|
||||
//neue Scene wird auf eine neue Stage gesetzt
|
||||
try {
|
||||
Scene scene = new Scene(fxmlLoader.load(), width, height);
|
||||
Scene scene = new Scene(fxmlLoader.load());
|
||||
neue.setScene(scene);
|
||||
|
||||
neue.show();
|
||||
neue.setHeight(height);
|
||||
neue.setWidth(width);
|
||||
}
|
||||
//wird die angegebene fxml Datei nicht gefunden, wird ein Alertfenster geöffnet
|
||||
catch (IOException | RuntimeException e) {
|
||||
@ -111,6 +116,24 @@ public class VerwaltungApplication extends Application {
|
||||
sceneWechseln("login-view.fxml");
|
||||
}
|
||||
|
||||
/**
|
||||
* Methode zum automatischen vergrößern und verkleinern von Grids
|
||||
*
|
||||
* Geschrieben: Max Heer, Sven Alteköster
|
||||
* Getestet
|
||||
*
|
||||
* @param grid das responsiv sein soll
|
||||
*/
|
||||
public static void responsiveBreiteGrid (GridPane grid) {
|
||||
grid.widthProperty().addListener((obs, oldValue, newValue) -> {
|
||||
for (Node n : grid.getChildren()) {
|
||||
if (n instanceof Control) {
|
||||
((Control) n).setPrefWidth(newValue.floatValue() / grid.getColumnCount());
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public static void main(String[] args) {
|
||||
launch();
|
||||
}
|
||||
|
41
src/main/java/de/subway_surfers/vpr_app/logik/Kind.java
Normal file
41
src/main/java/de/subway_surfers/vpr_app/logik/Kind.java
Normal file
@ -0,0 +1,41 @@
|
||||
package de.subway_surfers.vpr_app.logik;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
public class Kind {
|
||||
private String name;
|
||||
private String vorname;
|
||||
private int id;
|
||||
private ArrayList<Zutat> filter;
|
||||
|
||||
public Kind(String name, String vorname, int id) {
|
||||
ArrayList<Zutat> filter = new ArrayList<>();
|
||||
this.name = name;
|
||||
this.vorname = vorname;
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getVorname() {
|
||||
return vorname;
|
||||
}
|
||||
|
||||
public void setVorname(String vorname) {
|
||||
this.vorname = vorname;
|
||||
}
|
||||
|
||||
public int getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public ArrayList<Zutat> getFilter() {
|
||||
return filter;
|
||||
}
|
||||
}
|
34
src/main/java/de/subway_surfers/vpr_app/logik/Mahlzeit.java
Normal file
34
src/main/java/de/subway_surfers/vpr_app/logik/Mahlzeit.java
Normal file
@ -0,0 +1,34 @@
|
||||
package de.subway_surfers.vpr_app.logik;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
public class Mahlzeit {
|
||||
private String name;
|
||||
private float preis;
|
||||
private ArrayList<Zutat> zutaten;
|
||||
private String beschreibung;
|
||||
|
||||
public Mahlzeit (String name, float preis, String beschreibung) {
|
||||
this.name = name;
|
||||
this.preis = preis;
|
||||
this.beschreibung = beschreibung;
|
||||
zutaten = new ArrayList<>();
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public float getPreis() {
|
||||
return preis;
|
||||
}
|
||||
|
||||
public ArrayList<Zutat> getZutaten() {
|
||||
return zutaten;
|
||||
}
|
||||
|
||||
public String getBeschreibung() {
|
||||
return beschreibung;
|
||||
}
|
||||
|
||||
}
|
22
src/main/java/de/subway_surfers/vpr_app/logik/Tagesplan.java
Normal file
22
src/main/java/de/subway_surfers/vpr_app/logik/Tagesplan.java
Normal file
@ -0,0 +1,22 @@
|
||||
package de.subway_surfers.vpr_app.logik;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
public class Tagesplan {
|
||||
|
||||
private ArrayList<Mahlzeit> gerichte;
|
||||
private String datum;
|
||||
|
||||
public Tagesplan(String datum) {
|
||||
this.datum = datum;
|
||||
}
|
||||
|
||||
public ArrayList<Mahlzeit> getGerichte() {
|
||||
return gerichte;
|
||||
}
|
||||
|
||||
public String getDatum() {
|
||||
return datum;
|
||||
}
|
||||
|
||||
}
|
12
src/main/java/de/subway_surfers/vpr_app/logik/Zutat.java
Normal file
12
src/main/java/de/subway_surfers/vpr_app/logik/Zutat.java
Normal file
@ -0,0 +1,12 @@
|
||||
package de.subway_surfers.vpr_app.logik;
|
||||
|
||||
public class Zutat {
|
||||
private String name;
|
||||
public Zutat (String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getName(){
|
||||
return this.name;
|
||||
}
|
||||
}
|
@ -0,0 +1,65 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!--Erstellt von Max Heer-->
|
||||
|
||||
<?import java.lang.*?>
|
||||
<?import java.util.*?>
|
||||
<?import javafx.scene.*?>
|
||||
<?import javafx.scene.control.*?>
|
||||
<?import javafx.scene.layout.*?>
|
||||
|
||||
<BorderPane xmlns="http://javafx.com/javafx"
|
||||
xmlns:fx="http://javafx.com/fxml"
|
||||
fx:controller="de.subway_surfers.vpr_app.EssensverwaltungMitarbeiterView"
|
||||
prefHeight="400.0" prefWidth="600.0"
|
||||
stylesheets="@layout.css">
|
||||
<top>
|
||||
<BorderPane styleClass="kopfzeile">
|
||||
<right>
|
||||
<Button text="Abmelden" onAction="#onAbmelden"/>
|
||||
</right>
|
||||
<left>
|
||||
<Button text="Zurück" onAction="#onZurueck"/>
|
||||
</left>
|
||||
</BorderPane>
|
||||
</top>
|
||||
<center>
|
||||
<BorderPane>
|
||||
<top>
|
||||
<BorderPane>
|
||||
<left>
|
||||
<HBox styleClass="test" spacing="10">
|
||||
<Button text="Filter" onAction="#onFilter"/>
|
||||
<Button text="Hinzufügen" onAction="#onHinzufuegen"/>
|
||||
</HBox>
|
||||
</left>
|
||||
<right>
|
||||
<HBox styleClass="test" spacing="10">
|
||||
<Button styleClass="pfeil, links"/>
|
||||
<Label text="Montag DD.MM.YY"/>
|
||||
<Button styleClass="pfeil"/>
|
||||
</HBox>
|
||||
</right>
|
||||
</BorderPane>
|
||||
</top>
|
||||
<center>
|
||||
<AnchorPane>
|
||||
<GridPane fx:id="tagesplan" AnchorPane.bottomAnchor="20" AnchorPane.rightAnchor="20" AnchorPane.leftAnchor="20" AnchorPane.topAnchor="20" styleClass="essensuebersicht_gridlines">
|
||||
<Label text="GerichtName" GridPane.columnIndex="0" GridPane.rowIndex="0"/>
|
||||
<Label GridPane.columnIndex="1" GridPane.rowIndex="0"/>
|
||||
<Label GridPane.columnIndex="2" GridPane.rowIndex="0"/>
|
||||
<Label GridPane.columnIndex="3" GridPane.rowIndex="0"/>
|
||||
<Label GridPane.columnIndex="0" GridPane.rowIndex="1"/>
|
||||
</GridPane>
|
||||
</AnchorPane>
|
||||
</center>
|
||||
</BorderPane>
|
||||
|
||||
</center>
|
||||
<bottom>
|
||||
<BorderPane styleClass="button-untenrechts">
|
||||
<right>
|
||||
<Button text="Bestätigen" styleClass=".button"/>
|
||||
</right>
|
||||
</BorderPane>
|
||||
</bottom>
|
||||
</BorderPane>
|
@ -0,0 +1,34 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<?import java.lang.*?>
|
||||
<?import java.util.*?>
|
||||
<?import javafx.scene.*?>
|
||||
<?import javafx.scene.control.*?>
|
||||
<?import javafx.scene.layout.*?>
|
||||
|
||||
<BorderPane xmlns="http://javafx.com/javafx"
|
||||
xmlns:fx="http://javafx.com/fxml"
|
||||
fx:controller="de.subway_surfers.vpr_app.GerichterstellungMitarbeiterView"
|
||||
prefHeight="400.0" prefWidth="600.0"
|
||||
stylesheets="@layout.css" styleClass="main">
|
||||
<center>
|
||||
<VBox styleClass="gerichterstellung_felder">
|
||||
<TextField fx:id="eingabeName" promptText="Name des Gerichtes" focusTraversable="false"/>
|
||||
<TextArea fx:id="eingabeBeschreibung" promptText="Beschreibung" focusTraversable="false"/>
|
||||
<HBox>
|
||||
<TextField fx:id="eingabeInhaltsstoffe" promptText="Inhaltsstoffe" focusTraversable="false"/>
|
||||
<Button fx:id="buttonInhaltsstoffe" onAction="#onButtonInhaltsstoffeClick" text="Hinzufügen"/>
|
||||
</HBox>
|
||||
<HBox fx:id="anzeigeInhaltsstoffe" />
|
||||
</VBox>
|
||||
</center>
|
||||
<bottom>
|
||||
<BorderPane>
|
||||
<right>
|
||||
<HBox styleClass="button_untenrechts">
|
||||
<Button text="Speichern"/>
|
||||
</HBox>
|
||||
</right>
|
||||
</BorderPane>
|
||||
</bottom>
|
||||
</BorderPane>
|
@ -23,11 +23,11 @@
|
||||
<BorderPane styleClass="main">
|
||||
<left>
|
||||
<VBox styleClass="hauptmenue_buttons_links">
|
||||
<Button text="Speiseplan"/>
|
||||
<Button text="Speiseplan" onAction="#onSpeiseplanClick"/>
|
||||
<Button text="Alle Bestellungen anzeigen"/>
|
||||
<Button text="Rechnungen herunterladen"/>
|
||||
<Button text="Daten importieren/Exportieren"/>
|
||||
<Button text="Account anlegen" onAction="#onAccountAnlegen"/>
|
||||
<Button text="Account anlegen" onAction="#onAccountAnlegenClick"/>
|
||||
</VBox>
|
||||
</left>
|
||||
<right>
|
||||
|
@ -18,7 +18,7 @@
|
||||
-fx-padding: 20;
|
||||
}
|
||||
|
||||
.hauptmenue_buttons_links{
|
||||
.hauptmenue_buttons_links, .gerichterstellung_felder{
|
||||
-fx-spacing: 20;
|
||||
}
|
||||
|
||||
@ -73,6 +73,13 @@
|
||||
-fx-vgap: 10;
|
||||
-fx-hgap: 10;
|
||||
}
|
||||
.test {
|
||||
-fx-padding: 10 20;
|
||||
}
|
||||
|
||||
.essensuebersicht_gridlines {
|
||||
-fx-grid-lines-visible: true;
|
||||
}
|
||||
|
||||
.accounterstellung_links {
|
||||
-fx-spacing: 20;
|
||||
@ -82,3 +89,18 @@
|
||||
-fx-background-color: #FFDCDC;
|
||||
-fx-text-fill: #FFDCDC;
|
||||
}
|
||||
.essensuebersicht_gridlines > * {
|
||||
-fx-alignment: center;
|
||||
}
|
||||
|
||||
.pfeil{
|
||||
-fx-background-color: -fx-mark-highlight-color, -fx-mark-color;
|
||||
-fx-background-insets: 0 0 -1 0, 0;
|
||||
-fx-padding: 0.25em;
|
||||
-fx-shape: "M 0 -3.5 v 7 l 4 -3.5 z";
|
||||
-fx-pref-width: 25;
|
||||
}
|
||||
|
||||
.links {
|
||||
-fx-rotate: 180;
|
||||
}
|
Loading…
Reference in New Issue
Block a user