Merge remote-tracking branch 'origin/develope_Game_branch' into develope_Game_branch
This commit is contained in:
+20
@@ -1,14 +1,34 @@
|
||||
package ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView;
|
||||
|
||||
import ch.zhaw.projekt2.turnierverwaltung.FXController;
|
||||
import javafx.event.ActionEvent;
|
||||
import javafx.fxml.FXML;
|
||||
import javafx.scene.control.ChoiceBox;
|
||||
import javafx.scene.control.Label;
|
||||
import javafx.scene.control.TextField;
|
||||
|
||||
public class GameController extends FXController {
|
||||
|
||||
@FXML
|
||||
private Label participantNameOne;
|
||||
|
||||
@FXML
|
||||
private Label participantNameTwo;
|
||||
|
||||
@FXML
|
||||
private ChoiceBox<?> placesChoiceBox;
|
||||
|
||||
@FXML
|
||||
private TextField pointsTeamOne;
|
||||
|
||||
@FXML
|
||||
private TextField pointsTeamTwo;
|
||||
|
||||
@FXML
|
||||
void saveGamerResult(ActionEvent event) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void loadContent() {
|
||||
|
||||
|
||||
+3
-3
@@ -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">
|
||||
<children>
|
||||
<Label fx:id="teamNameOne" text="Team One" />
|
||||
<Label fx:id="participantNameOne" text="Participant One" />
|
||||
<HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
|
||||
<children>
|
||||
<Label text="Points">
|
||||
@@ -21,7 +21,7 @@
|
||||
<TextField fx:id="pointsTeamOne" prefHeight="25.0" prefWidth="50.0" />
|
||||
</children>
|
||||
</HBox>
|
||||
<Label fx:id="teamNameTwo" text="Team Two" />
|
||||
<Label fx:id="participantNameTwo" text="Participant Two" />
|
||||
<HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
|
||||
<children>
|
||||
<Label text="Points">
|
||||
@@ -45,7 +45,7 @@
|
||||
<Insets top="10.0" />
|
||||
</VBox.margin>
|
||||
</HBox>
|
||||
<Button mnemonicParsing="false" text="Speichern">
|
||||
<Button mnemonicParsing="false" onAction="#saveGamerResult" text="Speichern">
|
||||
<VBox.margin>
|
||||
<Insets bottom="10.0" top="10.0" />
|
||||
</VBox.margin>
|
||||
|
||||
Reference in New Issue
Block a user