Einbindung Filter in Gerichtsverwaltung
This commit is contained in:
parent
20db36e70e
commit
8dd43b212e
@ -7,9 +7,8 @@
|
||||
<option value="$PROJECT_DIR$/pom.xml" />
|
||||
</list>
|
||||
</option>
|
||||
<option name="workspaceImportForciblyTurnedOn" value="true" />
|
||||
</component>
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="21" project-jdk-type="JavaSDK">
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_X" default="true" project-jdk-name="21" project-jdk-type="JavaSDK">
|
||||
<output url="file://$PROJECT_DIR$/out" />
|
||||
</component>
|
||||
</project>
|
||||
@ -9,7 +9,7 @@ public class Kind {
|
||||
private String vorname;
|
||||
private int id;
|
||||
// TODO Zutat implementieren!
|
||||
// private ArrayList<Zutat> filter;
|
||||
private ArrayList<Zutat> filter;
|
||||
// endregion
|
||||
|
||||
// region Getter & Setter
|
||||
@ -38,7 +38,7 @@ public class Kind {
|
||||
}
|
||||
|
||||
// TODO Zutat implementieren!
|
||||
/*
|
||||
|
||||
public ArrayList<Zutat> getFilter() {
|
||||
return filter;
|
||||
}
|
||||
@ -46,7 +46,6 @@ public class Kind {
|
||||
public void setFilter(ArrayList<Zutat> filter) {
|
||||
this.filter = filter;
|
||||
}
|
||||
*/
|
||||
// endregion
|
||||
|
||||
// region Konstruktoren
|
||||
@ -56,4 +55,10 @@ public class Kind {
|
||||
}
|
||||
// endregion
|
||||
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return String.format("%s %s, %d", vorname, name, id);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
package de.subway_surfers.vpr_app.logik;
|
||||
package Logik;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
public class Mahlzeit {
|
||||
private String name;
|
||||
private float preis;
|
||||
private float preis;
|
||||
private ArrayList<Zutat> zutaten;
|
||||
private String beschreibung;
|
||||
private String beschreibung;
|
||||
|
||||
public Mahlzeit (String name, float preis, String beschreibung) {
|
||||
this.name = name;
|
||||
@ -1,11 +1,11 @@
|
||||
package de.subway_surfers.vpr_app.logik;
|
||||
package Logik;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
public class Tagesplan {
|
||||
|
||||
private ArrayList<Mahlzeit> gerichte;
|
||||
private String datum;
|
||||
private String datum;
|
||||
|
||||
public Tagesplan(String datum) {
|
||||
this.datum = datum;
|
||||
@ -1,4 +1,4 @@
|
||||
package de.subway_surfers.vpr_app.logik;
|
||||
package Logik;
|
||||
|
||||
public class Zutat {
|
||||
private String name;
|
||||
@ -114,6 +114,7 @@ public class AccounterstellungMitarbeiter {
|
||||
}
|
||||
|
||||
private boolean eingabenGueltig() {
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -121,6 +122,7 @@ public class AccounterstellungMitarbeiter {
|
||||
if (eingabenGueltig()) {
|
||||
status.setText("Daten Erfolgreich gespeichert");
|
||||
einmalpw.setText(einmalPwGenerieren());
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -101,7 +101,11 @@ public class BestelluebersichtMitarbeiter {
|
||||
}
|
||||
|
||||
public void onAbmelden(ActionEvent event) {
|
||||
VerwaltungApplication.sceneWechseln("login-view.fxml");
|
||||
VerwaltungApplication.abmelden();
|
||||
}
|
||||
|
||||
public void onZurueck(ActionEvent actionEvent) {
|
||||
VerwaltungApplication.sceneWechseln("hauptmenue_mitarbeiter-view.fxml");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -1,9 +1,8 @@
|
||||
package de.subway_surfers.vpr_app;
|
||||
|
||||
import de.subway_surfers.vpr_app.logik.Zutat;
|
||||
import 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;
|
||||
|
||||
@ -15,4 +15,9 @@ public class HauptmenueMitarbeiterView {
|
||||
public void onSpeiseplanClick(ActionEvent actionEvent) {
|
||||
VerwaltungApplication.sceneWechseln("essensverwaltung_mitarbeiter-view.fxml");
|
||||
}
|
||||
|
||||
public void onBestellungenAnzeigen(ActionEvent actionEvent) {
|
||||
VerwaltungApplication.sceneWechseln("bestelluebersicht_mitarbeiter-view.fxml");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -17,7 +17,7 @@ public class VerwaltungApplication extends Application {
|
||||
|
||||
@Override
|
||||
public void start(Stage stage) throws IOException {
|
||||
FXMLLoader fxmlLoader = new FXMLLoader(VerwaltungApplication.class.getResource("bestelluebersicht_mitarbeiter-view.fxml"));
|
||||
FXMLLoader fxmlLoader = new FXMLLoader(VerwaltungApplication.class.getResource("login-view.fxml"));
|
||||
Scene scene = new Scene(fxmlLoader.load());
|
||||
|
||||
stage.setWidth(960);
|
||||
@ -26,7 +26,7 @@ public class VerwaltungApplication extends Application {
|
||||
stage.setMinWidth(960);
|
||||
stage.setMinHeight(540);
|
||||
|
||||
stage.setTitle("Hello!");
|
||||
//stage.setTitle("Hello!");
|
||||
stage.setScene(scene);
|
||||
stage.show();
|
||||
|
||||
|
||||
@ -1,18 +1,21 @@
|
||||
package de.subway_surfers.vpr_app.logik;
|
||||
|
||||
import Logik.Zutat;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
public class Kind {
|
||||
private String name;
|
||||
private String vorname;
|
||||
private int id;
|
||||
|
||||
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.name = name;
|
||||
this.vorname = vorname;
|
||||
this.id = id;
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
@ -38,4 +41,4 @@ public class Kind {
|
||||
public ArrayList<Zutat> getFilter() {
|
||||
return filter;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -51,7 +51,7 @@
|
||||
<right>
|
||||
<HBox styleClass="button-untenrechts">
|
||||
<Label fx:id="status"/>
|
||||
<Button text="Speichern" onAction="#onSpeichern"/>
|
||||
<Button text="Speichern" defaultButton="true" onAction="#onSpeichern"/>
|
||||
</HBox>
|
||||
</right>
|
||||
</BorderPane>
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
<BorderPane styleClass="kopfzeile">
|
||||
<left>
|
||||
<Button fx:id="zurueck" text="Zurück"/>
|
||||
<Button fx:id="zurueck" text="Zurück" onAction="#onZurueck"/>
|
||||
</left>
|
||||
<right>
|
||||
<Button fx:id="abmelden" text="Abmelden" onAction="#onAbmelden"/>
|
||||
|
||||
@ -58,7 +58,7 @@
|
||||
<bottom>
|
||||
<BorderPane styleClass="button-untenrechts">
|
||||
<right>
|
||||
<Button text="Bestätigen" styleClass=".button"/>
|
||||
<Button text="Bestätigen" defaultButton="true" styleClass=".button"/>
|
||||
</right>
|
||||
</BorderPane>
|
||||
</bottom>
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
<BorderPane>
|
||||
<right>
|
||||
<HBox styleClass="button_untenrechts">
|
||||
<Button text="Speichern"/>
|
||||
<Button text="Speichern" defaultButton="true"/>
|
||||
</HBox>
|
||||
</right>
|
||||
</BorderPane>
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
<left>
|
||||
<VBox styleClass="hauptmenue_buttons_links">
|
||||
<Button text="Speiseplan" onAction="#onSpeiseplanClick"/>
|
||||
<Button text="Alle Bestellungen anzeigen"/>
|
||||
<Button text="Alle Bestellungen anzeigen" onAction="#onBestellungenAnzeigen"/>
|
||||
<Button text="Rechnungen herunterladen"/>
|
||||
<Button text="Daten importieren/Exportieren"/>
|
||||
<Button text="Account anlegen" onAction="#onAccountAnlegenClick"/>
|
||||
|
||||
@ -13,9 +13,17 @@
|
||||
<Label text="Nach Inhaltsstoffen filtern" />
|
||||
<ListView fx:id="zutatListView" />
|
||||
|
||||
<HBox prefHeight="128.0" prefWidth="600.0" styleClass="filter_unten">
|
||||
<CheckBox fx:id="speichernCheckBox" text="Auswahl für KindA speichern " />
|
||||
<Button fx:id="abbrechenButton" cancelButton="true" text="Abbrechen" />
|
||||
<Button fx:id="fortfahrenButton" defaultButton="true" text="Fortfahren" />
|
||||
</HBox>
|
||||
<BorderPane prefHeight="128.0" prefWidth="600.0" styleClass="filter_unten">
|
||||
<left>
|
||||
<HBox>
|
||||
<CheckBox fx:id="speichernCheckBox" text="Auswahl speichern " />
|
||||
</HBox>
|
||||
</left>
|
||||
<right>
|
||||
<HBox styleClass="filter_unten">
|
||||
<Button fx:id="abbrechenButton" cancelButton="true" text="Abbrechen" />
|
||||
<Button fx:id="fortfahrenButton" defaultButton="true" text="Fortfahren" />
|
||||
</HBox>
|
||||
</right>
|
||||
</BorderPane>
|
||||
</VBox>
|
||||
@ -31,7 +31,7 @@
|
||||
<BorderPane>
|
||||
<right>
|
||||
<VBox styleClass="button-untenrechts">
|
||||
<Button text="Anmelden" onAction="#onAnmeldenClick"/>
|
||||
<Button text="Anmelden" defaultButton="true" onAction="#onAnmeldenClick"/>
|
||||
</VBox>
|
||||
|
||||
</right>
|
||||
|
||||
@ -23,8 +23,8 @@
|
||||
<RadioButton fx:id="bezahlt" text="Alle bezahlten Anzeigen" />
|
||||
|
||||
<HBox>
|
||||
<Button fx:id="abbrechenButton" text="Abbruch" />
|
||||
<Button fx:id="fortfahrenButton" text="Fortfahren" />
|
||||
<Button fx:id="abbrechenButton" cancelButton="true" text="Abbruch" />
|
||||
<Button fx:id="fortfahrenButton" defaultButton="true" text="Fortfahren" />
|
||||
</HBox>
|
||||
|
||||
</VBox>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user