Subway-Surfers/VPR_App
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	.idea/misc.xml
#	src/main/java/de/subway_surfers/vpr_app/EssensverwaltungMitarbeiterView.java
#	src/main/resources/de/subway_surfers/vpr_app/layout.css
This commit is contained in:
Maximilian Heer 2024-01-15 08:23:16 +01:00
commit 93a443ebe1
6 changed files with 7 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.idea/misc.xml generated
View File

@ -7,8 +7,9 @@
<option value="$PROJECT_DIR$/pom.xml" /> <option value="$PROJECT_DIR$/pom.xml" />
</list> </list>
</option> </option>
<option name="workspaceImportForciblyTurnedOn" value="true" />
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_X" default="true" project-jdk-name="21" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="21" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" /> <output url="file://$PROJECT_DIR$/out" />
</component> </component>
</project> </project>

2
src/main/java/de/subway_surfers/vpr_app/AccounterstellungMitarbeiter.java
View File

@ -33,7 +33,7 @@ public class AccounterstellungMitarbeiter {
} }
public void onAbmelden(ActionEvent actionEvent) { public void onAbmelden(ActionEvent actionEvent) {
VerwaltungApplication.abmelden(); //VerwaltungApplication.abmelden();
} }
public void onTypMitarbeiter(ActionEvent actionEvent) { public void onTypMitarbeiter(ActionEvent actionEvent) {

13
src/main/java/de/subway_surfers/vpr_app/EssensverwaltungMitarbeiterView.java
View File

@ -9,8 +9,6 @@ import javafx.scene.layout.ColumnConstraints;
import javafx.scene.layout.GridPane; import javafx.scene.layout.GridPane;
import javafx.scene.layout.Priority; import javafx.scene.layout.Priority;
import javafx.scene.layout.RowConstraints; import javafx.scene.layout.RowConstraints;
import javafx.stage.Modality;
import javafx.stage.Stage;
public class EssensverwaltungMitarbeiterView { public class EssensverwaltungMitarbeiterView {
@ -41,22 +39,15 @@ public class EssensverwaltungMitarbeiterView {
} }
public void onFilter(ActionEvent actionEvent) { public void onFilter(ActionEvent actionEvent) {
VerwaltungApplication.sceneWechseln(new Stage(), 600, 400, "inhaltsstoffe_filtern-view.fxml");
} }
public void onHinzufuegen(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) { public void onZurueck(ActionEvent actionEvent) {
VerwaltungApplication.sceneWechseln("hauptmenue_mitarbeiter-view.fxml"); VerwaltungApplication.sceneWechseln("hauptmenue_mitarbeiter-view.fxml");
} }
} }

2
src/main/java/de/subway_surfers/vpr_app/HauptmenueMitarbeiterView.java
View File

@ -5,7 +5,7 @@ import javafx.event.ActionEvent;
public class HauptmenueMitarbeiterView { public class HauptmenueMitarbeiterView {
public void onAbmelden(ActionEvent actionEvent) { public void onAbmelden(ActionEvent actionEvent) {
VerwaltungApplication.abmelden(); //VerwaltungApplication.abmelden();
} }
public void onAccountAnlegenClick(ActionEvent actionEvent) { public void onAccountAnlegenClick(ActionEvent actionEvent) {

3
src/main/java/de/subway_surfers/vpr_app/VerwaltungApplication.java
View File

@ -110,10 +110,7 @@ public class VerwaltungApplication extends Application {
e.printStackTrace(); e.printStackTrace();
} }
}
public static void abmelden() {
sceneWechseln("login-view.fxml");
} }
/** /**

30
src/main/resources/de/subway_surfers/vpr_app/layout.css
View File

@ -18,7 +18,7 @@
-fx-padding: 20; -fx-padding: 20;
} }
.hauptmenue_buttons_links, .gerichterstellung_felder, .filter, .main, .filter_unten{ .hauptmenue_buttons_links{
-fx-spacing: 20; -fx-spacing: 20;
} }
@ -73,13 +73,6 @@
-fx-vgap: 10; -fx-vgap: 10;
-fx-hgap: 10; -fx-hgap: 10;
} }
.test {
-fx-padding: 10 20;
}
.essensuebersicht_gridlines {
-fx-grid-lines-visible: true;
}
.accounterstellung_links { .accounterstellung_links {
-fx-spacing: 20; -fx-spacing: 20;
@ -89,24 +82,3 @@
-fx-background-color: #FFDCDC; -fx-background-color: #FFDCDC;
-fx-text-fill: #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;
}