diff --git a/src/main/java/edu/ntnu/idatt1002/k1g4/client/App.java b/src/main/java/edu/ntnu/idatt1002/k1g4/client/App.java index d0c7fe78ebccf0cd41a7dfc48cea2b2f1fce76d4..4c0f1e709bef69430297f54c0b980d6f08349bc5 100644 --- a/src/main/java/edu/ntnu/idatt1002/k1g4/client/App.java +++ b/src/main/java/edu/ntnu/idatt1002/k1g4/client/App.java @@ -39,7 +39,6 @@ public class App extends Application { } public static void main(String[] args) { - createDummyCups(2); launch(); } diff --git a/src/main/java/edu/ntnu/idatt1002/k1g4/client/controllers/MatchOverviewController.java b/src/main/java/edu/ntnu/idatt1002/k1g4/client/controllers/MatchOverviewController.java index 0df77744ca7369fb9319e05a0b9e1f5a54acf0d2..2071d1e3ebb549735402d20de51f1f1646a301dd 100644 --- a/src/main/java/edu/ntnu/idatt1002/k1g4/client/controllers/MatchOverviewController.java +++ b/src/main/java/edu/ntnu/idatt1002/k1g4/client/controllers/MatchOverviewController.java @@ -6,6 +6,7 @@ import javafx.fxml.FXML; import javafx.fxml.Initializable; import javafx.scene.control.Button; import javafx.scene.control.DatePicker; +import javafx.scene.control.ListView; import javafx.scene.control.TextField; import javafx.scene.text.Text; @@ -127,6 +128,18 @@ public class MatchOverviewController implements Initializable { incrementScore(teamTwoScore, -1, 2); } + public void refereeList(ListView.EditEvent editEvent) { + } + + public void removeReferee(ActionEvent actionEvent) { + } + + public void nameReferee(ActionEvent actionEvent) { + } + + public void addReferee(ActionEvent actionEvent) { + } + /** * Increments the score in the GUI * @param scoreField @@ -156,4 +169,5 @@ public class MatchOverviewController implements Initializable { } + } diff --git a/src/main/resources/match-overview.fxml b/src/main/resources/match-overview.fxml index 3b687aec118cfe8430ee0aa32e7fd6b2a5179603..d119ca530e21f02db08c13607abf124b45194274 100644 --- a/src/main/resources/match-overview.fxml +++ b/src/main/resources/match-overview.fxml @@ -3,6 +3,7 @@ <?import javafx.geometry.Insets?> <?import javafx.scene.control.Button?> <?import javafx.scene.control.DatePicker?> +<?import javafx.scene.control.ListView?> <?import javafx.scene.control.SplitPane?> <?import javafx.scene.control.TextField?> <?import javafx.scene.layout.AnchorPane?> @@ -114,34 +115,80 @@ </AnchorPane> <AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefWidth="1280.0"> <children> - <GridPane layoutX="340.0" layoutY="2.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="200.0" prefWidth="600.0"> - <columnConstraints> - <ColumnConstraints hgrow="SOMETIMES" maxWidth="95.0" minWidth="1.0" prefWidth="1.0" /> - <ColumnConstraints hgrow="SOMETIMES" maxWidth="208.0" minWidth="0.0" prefWidth="154.0" /> - <ColumnConstraints hgrow="SOMETIMES" maxWidth="205.0" minWidth="10.0" prefWidth="43.0" /> - <ColumnConstraints hgrow="SOMETIMES" maxWidth="249.0" minWidth="10.0" prefWidth="172.0" /> - <ColumnConstraints hgrow="SOMETIMES" maxWidth="306.0" minWidth="0.0" prefWidth="23.0" /> - <ColumnConstraints hgrow="SOMETIMES" maxWidth="249.0" minWidth="10.0" prefWidth="103.0" /> - <ColumnConstraints hgrow="SOMETIMES" maxWidth="249.0" minWidth="10.0" prefWidth="112.0" /> - </columnConstraints> - <rowConstraints> - <RowConstraints maxHeight="25.0" minHeight="4.0" prefHeight="10.0" vgrow="SOMETIMES" /> - <RowConstraints maxHeight="100.0" minHeight="10.0" prefHeight="50.0" vgrow="SOMETIMES" /> - <RowConstraints maxHeight="100.0" minHeight="10.0" prefHeight="49.0" vgrow="SOMETIMES" /> - <RowConstraints maxHeight="64.0" minHeight="0.0" prefHeight="49.0" vgrow="SOMETIMES" /> - </rowConstraints> - <children> - <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Start time:" GridPane.columnIndex="1" GridPane.halignment="RIGHT" GridPane.rowIndex="1" GridPane.valignment="CENTER" /> - <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Duration:" GridPane.columnIndex="1" GridPane.halignment="RIGHT" GridPane.rowIndex="2" GridPane.valignment="CENTER" /> - <TextField maxWidth="-Infinity" onAction="#setStartTimeField" prefHeight="25.0" prefWidth="100.0" promptText="hh:mm" GridPane.columnIndex="5" GridPane.rowIndex="1" /> - <DatePicker onAction="#setStartDateField" prefHeight="25.0" promptText="start date" GridPane.columnIndex="3" GridPane.halignment="LEFT" GridPane.rowIndex="1" GridPane.valignment="CENTER" /> - <TextField alignment="CENTER" maxWidth="-Infinity" onAction="#setTimeDurationField" prefHeight="25.0" prefWidth="100.0" promptText="min" GridPane.columnIndex="3" GridPane.halignment="LEFT" GridPane.rowIndex="2" GridPane.valignment="CENTER" /> - <Text strokeType="OUTSIDE" strokeWidth="0.0" text="minutes" GridPane.columnIndex="4" GridPane.halignment="RIGHT" GridPane.rowIndex="2" GridPane.valignment="CENTER"> - <GridPane.margin> - <Insets /> - </GridPane.margin></Text> - </children> - </GridPane> + <SplitPane dividerPositions="0.29797979797979796" prefHeight="260.0" prefWidth="1280.0"> + <items> + <AnchorPane prefHeight="260.0" prefWidth="640.0"> + <children> + <GridPane layoutX="39.0" layoutY="39.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="200.0" prefWidth="500.0"> + <columnConstraints> + <ColumnConstraints hgrow="SOMETIMES" maxWidth="95.0" minWidth="1.0" prefWidth="1.0" /> + <ColumnConstraints hgrow="SOMETIMES" maxWidth="208.0" minWidth="0.0" prefWidth="154.0" /> + <ColumnConstraints hgrow="SOMETIMES" maxWidth="205.0" minWidth="10.0" prefWidth="43.0" /> + <ColumnConstraints hgrow="SOMETIMES" maxWidth="249.0" minWidth="10.0" prefWidth="172.0" /> + <ColumnConstraints hgrow="SOMETIMES" maxWidth="306.0" minWidth="0.0" prefWidth="23.0" /> + <ColumnConstraints hgrow="SOMETIMES" maxWidth="249.0" minWidth="10.0" prefWidth="120.0" /> + </columnConstraints> + <rowConstraints> + <RowConstraints maxHeight="25.0" minHeight="4.0" prefHeight="10.0" vgrow="SOMETIMES" /> + <RowConstraints maxHeight="100.0" minHeight="10.0" prefHeight="50.0" vgrow="SOMETIMES" /> + <RowConstraints maxHeight="100.0" minHeight="10.0" prefHeight="49.0" vgrow="SOMETIMES" /> + <RowConstraints maxHeight="64.0" minHeight="0.0" prefHeight="49.0" vgrow="SOMETIMES" /> + </rowConstraints> + <children> + <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Start time:" GridPane.columnIndex="1" GridPane.halignment="RIGHT" GridPane.rowIndex="1" GridPane.valignment="CENTER" /> + <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Duration:" GridPane.columnIndex="1" GridPane.halignment="RIGHT" GridPane.rowIndex="2" GridPane.valignment="CENTER" /> + <TextField maxWidth="-Infinity" onAction="#setStartTimeField" prefHeight="25.0" prefWidth="100.0" promptText="hh:mm" GridPane.columnIndex="5" GridPane.rowIndex="1" /> + <DatePicker onAction="#setStartDateField" prefHeight="25.0" promptText="start date" GridPane.columnIndex="3" GridPane.halignment="LEFT" GridPane.rowIndex="1" GridPane.valignment="CENTER" /> + <TextField alignment="CENTER" maxWidth="-Infinity" onAction="#setTimeDurationField" prefHeight="25.0" prefWidth="100.0" promptText="min" GridPane.columnIndex="3" GridPane.halignment="LEFT" GridPane.rowIndex="2" GridPane.valignment="CENTER" /> + <Text strokeType="OUTSIDE" strokeWidth="0.0" text="minutes" GridPane.columnIndex="4" GridPane.halignment="RIGHT" GridPane.rowIndex="2" GridPane.valignment="CENTER"> + <GridPane.margin> + <Insets /> + </GridPane.margin> + </Text> + </children> + </GridPane> + </children> + </AnchorPane> + <AnchorPane maxWidth="-Infinity" prefHeight="260.0" prefWidth="640.0"> + <children> + <GridPane layoutX="70.0" layoutY="29.0" prefHeight="200.0" prefWidth="500.0"> + <columnConstraints> + <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" /> + <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" /> + </columnConstraints> + <rowConstraints> + <RowConstraints maxHeight="62.0" minHeight="10.0" prefHeight="15.0" vgrow="SOMETIMES" /> + <RowConstraints maxHeight="141.0" minHeight="10.0" prefHeight="128.0" vgrow="SOMETIMES" /> + <RowConstraints maxHeight="50.0" minHeight="10.0" prefHeight="50.0" vgrow="SOMETIMES" /> + </rowConstraints> + <children> + <ListView onEditStart="#refereeList" prefHeight="100.0" prefWidth="299.0" GridPane.rowIndex="1" /> + <Button mnemonicParsing="false" onAction="#removeReferee" prefWidth="180.0" text="Remove referee" GridPane.halignment="RIGHT" GridPane.rowIndex="2" GridPane.valignment="TOP"> + <GridPane.margin> + <Insets top="5.0" /> + </GridPane.margin> + </Button> + <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Match referees:" GridPane.halignment="LEFT" GridPane.valignment="BOTTOM"> + <GridPane.margin> + <Insets bottom="5.0" left="5.0" /> + </GridPane.margin> + </Text> + <TextField maxWidth="-Infinity" onAction="#nameReferee" prefWidth="150.0" GridPane.columnIndex="1" GridPane.halignment="LEFT" GridPane.rowIndex="1" GridPane.valignment="BOTTOM"> + <GridPane.margin> + <Insets left="10.0" /> + </GridPane.margin> + </TextField> + <Button mnemonicParsing="false" onAction="#addReferee" prefWidth="150.0" text="Add referee" GridPane.columnIndex="1" GridPane.halignment="LEFT" GridPane.rowIndex="2" GridPane.valignment="TOP"> + <GridPane.margin> + <Insets left="10.0" top="5.0" /> + </GridPane.margin> + </Button> + </children> + </GridPane> + </children> + </AnchorPane> + </items> + </SplitPane> </children> </AnchorPane> </items>