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

Merge pull request 'Max' (#13) from Max into master

Browse Source 
Reviewed-on: #13
This commit is contained in:
Maximilian Heer 2024-01-19 10:56:26 +01:00
commit f0d87b0e43
7 changed files with 71 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.idea/misc.xml
View File

@ -7,8 +7,9 @@
<option value="$PROJECT_DIR$/pom.xml" />
</list>
</option>
<option name="workspaceImportForciblyTurnedOn" value="true" />
</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" />
</component>
</project>

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

@ -62,7 +62,7 @@ public class AccounterstellungMitarbeiter {
* @author Sven Alteköster
*/
public void onAbmelden(ActionEvent actionEvent) {
VerwaltungApplication.abmelden();
//VerwaltungApplication.abmelden();
}
/**

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

@ -88,7 +88,7 @@ public class EssensverwaltungMitarbeiterView {
cc.setFillWidth(true);
tagesplan.getColumnConstraints().add(cc);
}
/*
tagesplan.heightProperty().addListener((obs,oldValue,newValue) -> {
final int zeile = 1;
for (Node n : tagesplan.getChildren()){
@ -97,7 +97,7 @@ public class EssensverwaltungMitarbeiterView {
}
}
});
*/
VerwaltungApplication.responsiveBreiteGrid(tagesplan);
@ -181,10 +181,11 @@ public class EssensverwaltungMitarbeiterView {
tagesplan.add(label, 0, 0);
}
for (Node n : tagesplan.getChildren()) {
if (n instanceof Control) {
((Control) n).setPrefWidth(tagesplan.getWidth() / tagesplan.getColumnCount());
}
}
tagesplan.getStyleClass().add("essensuebersicht_gridlines");
}

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

@ -1,11 +1,68 @@
package de.subway_surfers.vpr_app;
import Logik.Tagesplan;
import RestAPISchnittstelle.RestApiClient;
import javafx.event.ActionEvent;
import javafx.fxml.FXML;
import javafx.geometry.Pos;
import javafx.scene.control.Label;
import javafx.scene.layout.GridPane;
import javafx.scene.text.TextAlignment;
import java.text.DateFormat;
import java.util.Date;
public class HauptmenueMitarbeiterView {
@FXML
private GridPane wochenplan;
private String date;
private String day;
private String month;
private String year;
/**
* Ruft die Methode zum Befüllen der Ansicht auf
* @author Max Heer
*/
public void initialize(){
wochenuebersichtFuellen();
}
/**
* Methode zum initialisieren und befüllen der Tabelle im Hauptmenü
* @author Max Heer
*/
public void wochenuebersichtFuellen(){
String dateanzeige;
DateFormat dateFormat = DateFormat.getDateInstance();
date = dateFormat.format(new Date());
date = date.replace('.', '-');
day = date.split("-")[0];
month = date.split("-")[1];
year = date.split("-")[2];
date = String.format("%s-%s-%s", year, month, day);
dateanzeige = String.format("%s.%s.%s",day,month,year);
Tagesplan t = new RestApiClient().getGerichteOnTag(date);
for(int i=0;i<5;i++){
Label tag = new Label();
wochenplan.add(tag, i, 0);
tag.setText(dateanzeige);
for(int j=0; j<t.getGerichte().size();j++){
Label name = new Label();
name.setWrapText(true);
wochenplan.add(name, i, j+1);
name.setText(t.getGerichte().get(j).getName());
name.setPrefHeight(75);
name.setTextAlignment(TextAlignment.CENTER);
}
day = String.valueOf(Integer.parseInt(day)+1);
date = String.format("%s-%s-%s", year, month, day);
dateanzeige = String.format("%s.%s.%s",day,month,year);
t = new RestApiClient().getGerichteOnTag(date);
}
}
public void onAbmelden(ActionEvent actionEvent) {
VerwaltungApplication.abmelden();
//VerwaltungApplication.abmelden();
}
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();
}
}
public static void abmelden() {
sceneWechseln("login-view.fxml");
}
/**

8
src/main/resources/de/subway_surfers/vpr_app/hauptmenue_mitarbeiter-view.fxml
View File

@ -31,14 +31,8 @@
</VBox>
</left>
<right>
<GridPane styleClass="hauptmenue_wochenuebersicht">
<Label text="Montag" GridPane.columnIndex="0" GridPane.rowIndex="0"/>
<Label text="Dienstag" GridPane.columnIndex="1" GridPane.rowIndex="0"/>
<Label text="Mittwoch" GridPane.columnIndex="2" GridPane.rowIndex="0"/>
<Label text="Donnerstag" GridPane.columnIndex="3" GridPane.rowIndex="0"/>
<Label text="Freitag" GridPane.columnIndex="4" GridPane.rowIndex="0"/>
<GridPane fx:id="wochenplan" styleClass="hauptmenue_wochenuebersicht">
<Label text="Gericht1" styleClass="hauptmenue_gericht" GridPane.columnIndex="0" GridPane.rowIndex="1"/>
</GridPane>
</right>
</BorderPane>

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

@ -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, .button-untenrechts{
-fx-spacing: 20;
@ -89,24 +82,3 @@
-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;
}