Merge remote-tracking branch 'origin/Max' into Max
# Conflicts: # src/main/java/de/subway_surfers/vpr_app/EssensverwaltungMitarbeiterView.java
This commit is contained in:
commit
afb53d8863
@ -48,7 +48,7 @@ public class AccounterstellungMitarbeiter {
|
||||
}
|
||||
|
||||
public void onAbmelden(ActionEvent actionEvent) {
|
||||
VerwaltungApplication.abmelden();
|
||||
//VerwaltungApplication.abmelden();
|
||||
}
|
||||
|
||||
public void onTypMitarbeiter(ActionEvent actionEvent) {
|
||||
|
@ -9,8 +9,6 @@ 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 {
|
||||
@ -41,24 +39,15 @@ public class EssensverwaltungMitarbeiterView {
|
||||
}
|
||||
|
||||
public void onFilter(ActionEvent actionEvent) {
|
||||
Stage stage = new Stage();
|
||||
VerwaltungApplication.sceneWechseln(stage, 450, 400, "inhaltsstoffe_filtern-view.fxml");
|
||||
|
||||
}
|
||||
|
||||
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) {
|
||||
VerwaltungApplication.sceneWechseln("hauptmenue_mitarbeiter-view.fxml");
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -5,7 +5,7 @@ import javafx.event.ActionEvent;
|
||||
public class HauptmenueMitarbeiterView {
|
||||
|
||||
public void onAbmelden(ActionEvent actionEvent) {
|
||||
VerwaltungApplication.abmelden();
|
||||
//VerwaltungApplication.abmelden();
|
||||
}
|
||||
|
||||
public void onAccountAnlegenClick(ActionEvent actionEvent) {
|
||||
|
@ -110,10 +110,7 @@ public class VerwaltungApplication extends Application {
|
||||
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
public static void abmelden() {
|
||||
sceneWechseln("login-view.fxml");
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -18,7 +18,7 @@
|
||||
-fx-padding: 20;
|
||||
}
|
||||
|
||||
.hauptmenue_buttons_links, .gerichterstellung_felder, .filter, .main, .filter_unten{
|
||||
.hauptmenue_buttons_links{
|
||||
-fx-spacing: 20;
|
||||
}
|
||||
|
||||
@ -73,13 +73,6 @@
|
||||
-fx-vgap: 10;
|
||||
-fx-hgap: 10;
|
||||
}
|
||||
.test {
|
||||
-fx-padding: 10 20;
|
||||
}
|
||||
|
||||
.essensuebersicht_gridlines {
|
||||
-fx-grid-lines-visible: true;
|
||||
}
|
||||
|
||||
.accounterstellung_links {
|
||||
-fx-spacing: 20;
|
||||
@ -88,25 +81,4 @@
|
||||
.falscheEingabe {
|
||||
-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;
|
||||
}
|
||||
.titledPaneUeberschrift > .title {
|
||||
-fx-pref-height: 50;
|
||||
-fx-padding: 10 10 16 10;
|
||||
-fx-font-size: 15;
|
||||
-fx-font-weight: bold;
|
||||
}
|
Loading…
Reference in New Issue
Block a user