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

Merge remote-tracking branch 'origin/master' into Max

Browse Source 
# Conflicts:
#	src/main/java/de/subway_surfers/vpr_app/EssensverwaltungMitarbeiterView.java
This commit is contained in:
Maximilian Heer
2024-01-19 08:17:50 +01:00
parent afb53d8863 9e8ca5cebf
commit 0741325aa6
8 changed files with 261 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/resources/de/subway_surfers/vpr_app/essensverwaltung_mitarbeiter-view.fxml
View File

@@ -34,21 +34,16 @@
</left>
<right>
<HBox styleClass="test" spacing="10">
<Button styleClass="pfeil, links"/>
<Label text="Montag DD.MM.YY"/>
<Button styleClass="pfeil"/>
<Button styleClass="pfeil, links" onAction="#pfeilLinks"/>
<Label fx:id="dateLabel"/>
<Button styleClass="pfeil" onAction="#pfeilRechts"/>
</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 fx:id="tagesplan" AnchorPane.bottomAnchor="20" AnchorPane.rightAnchor="20" AnchorPane.leftAnchor="20" AnchorPane.topAnchor="20" >
</GridPane>
</AnchorPane>
</center>

4
src/main/resources/de/subway_surfers/vpr_app/login-view.fxml
View File

@@ -19,9 +19,9 @@
</HBox>
<Label text="Benutzername" GridPane.rowIndex="1" GridPane.columnIndex="0"/>
<TextField GridPane.rowIndex="1" GridPane.columnIndex="1"/>
<TextField fx:id="benutzernameTextfield" GridPane.rowIndex="1" GridPane.columnIndex="1"/>
<Label text="Passwort" GridPane.rowIndex="2" GridPane.columnIndex="0"/>
<PasswordField GridPane.rowIndex="2" GridPane.columnIndex="1"/>
<PasswordField fx:id="passwortTextfield" GridPane.rowIndex="2" GridPane.columnIndex="1"/>
<CheckBox text="Kennwort merken" GridPane.rowIndex="3" GridPane.columnIndex="0"/>
</GridPane>