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

Merge remote-tracking branch 'origin/Max'

Browse Source 
# Conflicts:
#	src/main/resources/de/subway_surfers/vpr_app/inhaltsstoffe_filtern-view.fxml
#	src/main/resources/de/subway_surfers/vpr_app/rechnungFilter-view.fxml
#	src/main/resources/de/subway_surfers/vpr_app/zutatListview-view.fxml
This commit is contained in:
Samuel Wolff 2024-01-26 08:25:09 +01:00
commit f97211ae84
7 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/de/subway_surfers/vpr_app/HauptmenueElternController.java
View File

@ -19,10 +19,17 @@ public class HauptmenueElternController {
private String month; private String month;
private String year; private String year;
/**
* Ruft die Methode zum Befüllen der Ansicht auf der Hauptseite auf
* @author Max Heer
*/
public void initialize(){ public void initialize(){
wochenuebersichtFuellen(); wochenuebersichtFuellen();
} }
/**
* Methode zum initialisieren und befüllen der Tabelle im Hauptmenü
* @author Max Heer
*/
public void wochenuebersichtFuellen(){ public void wochenuebersichtFuellen(){
String dateanzeige; String dateanzeige;
DateFormat dateFormat = DateFormat.getDateInstance(); DateFormat dateFormat = DateFormat.getDateInstance();

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

@ -21,7 +21,7 @@ public class VerwaltungApplication extends Application {
@Override @Override
public void start(Stage stage) throws IOException { public void start(Stage stage) throws IOException {
FXMLLoader fxmlLoader = new FXMLLoader(VerwaltungApplication.class.getResource("login-view.fxml")); FXMLLoader fxmlLoader = new FXMLLoader(VerwaltungApplication.class.getResource("gerichterstellung_mitarbeiter-view.fxml"));
Scene scene = new Scene(fxmlLoader.load()); Scene scene = new Scene(fxmlLoader.load());
stage.setWidth(960); stage.setWidth(960);

2
src/main/resources/de/subway_surfers/vpr_app/gerichterstellung_mitarbeiter-view.fxml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!--Sven Alteköster-->
<?import java.lang.*?> <?import java.lang.*?>
<?import java.util.*?> <?import java.util.*?>
<?import javafx.scene.*?> <?import javafx.scene.*?>

2
src/main/resources/de/subway_surfers/vpr_app/hauptmenue_eltern-view.fxml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!--Erstellt von Sven Alteköster--> <!--Erstellt von Sven Alteköster und Max Heer-->
<?import java.lang.*?> <?import java.lang.*?>
<?import java.util.*?> <?import java.util.*?>

2
src/main/resources/de/subway_surfers/vpr_app/inhaltsstoffe_filtern-view.fxml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- @author Samuel Wolff --> <!--Samuel Wolff-->
<?import javafx.scene.control.*?> <?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?> <?import javafx.scene.layout.*?>

2
src/main/resources/de/subway_surfers/vpr_app/rechnungFilter-view.fxml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- @author Samuel Wolff --> <!--Samuel Wolff-->
<?import java.lang.*?> <?import java.lang.*?>
<?import java.util.*?> <?import java.util.*?>

2
src/main/resources/de/subway_surfers/vpr_app/zutatListview-view.fxml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- @author Samuel Wolff --> <!--Samuel Wolff-->
<?import java.lang.*?> <?import java.lang.*?>
<?import java.util.*?> <?import java.util.*?>