ZHAW-IT21b_WIN
/
team02-AngryNerds-projekt2-turnierverwaltung
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
schrom01 2022-05-06 14:04:44 +02:00
parent 593bcdc872 4ef9f62124
commit 1b9e9c27a9
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameController.java
View File

@ -1,14 +1,34 @@
package ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView; package ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView;
import ch.zhaw.projekt2.turnierverwaltung.FXController; import ch.zhaw.projekt2.turnierverwaltung.FXController;
import javafx.event.ActionEvent;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.scene.control.ChoiceBox; import javafx.scene.control.ChoiceBox;
import javafx.scene.control.Label;
import javafx.scene.control.TextField;
public class GameController extends FXController { public class GameController extends FXController {
@FXML
private Label participantNameOne;
@FXML
private Label participantNameTwo;
@FXML @FXML
private ChoiceBox<?> placesChoiceBox; private ChoiceBox<?> placesChoiceBox;
@FXML
private TextField pointsTeamOne;
@FXML
private TextField pointsTeamTwo;
@FXML
void saveGamerResult(ActionEvent event) {
}
@Override @Override
public void loadContent() { public void loadContent() {

6
app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/Game.fxml
View File

@ -10,7 +10,7 @@
<VBox alignment="CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="200.0" prefWidth="200.0" xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1" fx:controller="GameContoller"> <VBox alignment="CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="200.0" prefWidth="200.0" xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1" fx:controller="GameContoller">
<children> <children>
<Label fx:id="teamNameOne" text="Team One" /> <Label fx:id="participantNameOne" text="Participant One" />
<HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0"> <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
<children> <children>
<Label text="Points"> <Label text="Points">
@ -21,7 +21,7 @@
<TextField fx:id="pointsTeamOne" prefHeight="25.0" prefWidth="50.0" /> <TextField fx:id="pointsTeamOne" prefHeight="25.0" prefWidth="50.0" />
</children> </children>
</HBox> </HBox>
<Label fx:id="teamNameTwo" text="Team Two" /> <Label fx:id="participantNameTwo" text="Participant Two" />
<HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0"> <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
<children> <children>
<Label text="Points"> <Label text="Points">
@ -45,7 +45,7 @@
<Insets top="10.0" /> <Insets top="10.0" />
</VBox.margin> </VBox.margin>
</HBox> </HBox>
<Button mnemonicParsing="false" text="Speichern"> <Button mnemonicParsing="false" onAction="#saveGamerResult" text="Speichern">
<VBox.margin> <VBox.margin>
<Insets bottom="10.0" top="10.0" /> <Insets bottom="10.0" top="10.0" />
</VBox.margin> </VBox.margin>