From a63d428b27a0cd934db5ed6bfa3c5683f351d6c1 Mon Sep 17 00:00:00 2001
From: joonatan <joonatan.a.nikkila@student.jyu.fi>
Date: Wed, 10 Apr 2024 16:49:19 +0300
Subject: [PATCH] olikohan muutoksia
---
PadelMainGUIView2.fxml | 75 ++++++++++++++++++++++++
src/HT/fx/OtteluIkkunaGUIController.java | 4 +-
2 files changed, 77 insertions(+), 2 deletions(-)
create mode 100644 PadelMainGUIView2.fxml
diff --git a/PadelMainGUIView2.fxml b/PadelMainGUIView2.fxml
new file mode 100644
index 0000000..1c8f9c4
--- /dev/null
+++ b/PadelMainGUIView2.fxml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ButtonBar?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
+
+
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="667.0" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <ButtonBar layoutX="200.0" layoutY="366.0" prefHeight="40.0" prefWidth="200.0" AnchorPane.bottomAnchor="-3.0" AnchorPane.leftAnchor="2.5" AnchorPane.rightAnchor="2.5">
+ <buttons>
+ <Button mnemonicParsing="false" text="Lisää ottelu" />
+ <Button mnemonicParsing="false" text="Lisää pelaaja" />
+ </buttons>
+ </ButtonBar>
+ <Label layoutX="14.0" layoutY="6.0" text="Padelkerho" AnchorPane.leftAnchor="2.5" AnchorPane.topAnchor="2.5">
+ <font>
+ <Font name="System Bold" size="24.0" />
+ </font>
+ </Label>
+ <HBox layoutX="3.0" layoutY="42.0" prefHeight="335.0" prefWidth="452.0" AnchorPane.bottomAnchor="35.0" AnchorPane.leftAnchor="3.0" AnchorPane.rightAnchor="160.0" AnchorPane.topAnchor="30.0">
+ <children>
+ <VBox prefHeight="100.0" prefWidth="150.0">
+ <children>
+ <Label text="Nimi">
+ <font>
+ <Font size="14.0" />
+ </font>
+ </Label>
+ </children>
+ </VBox>
+ <VBox prefHeight="100.0" prefWidth="34.0">
+ <children>
+ <Label text="Ikä">
+ <font>
+ <Font size="14.0" />
+ </font>
+ </Label>
+ </children>
+ </VBox>
+ <VBox prefHeight="335.0" prefWidth="43.0">
+ <children>
+ <Label text="Rating">
+ <font>
+ <Font size="14.0" />
+ </font>
+ </Label>
+ </children>
+ </VBox>
+ <VBox prefHeight="100.0" prefWidth="188.0">
+ <children>
+ <Label text="Sähköposti">
+ <font>
+ <Font size="14.0" />
+ </font>
+ </Label>
+ </children>
+ </VBox>
+ <VBox prefHeight="100.0" prefWidth="35.0">
+ <children>
+ <Label text="Auto?">
+ <font>
+ <Font size="14.0" />
+ </font>
+ </Label>
+ </children>
+ </VBox>
+ </children>
+ </HBox>
+ </children>
+</AnchorPane>
diff --git a/src/HT/fx/OtteluIkkunaGUIController.java b/src/HT/fx/OtteluIkkunaGUIController.java
index 4ee4e0e..e105c98 100644
--- a/src/HT/fx/OtteluIkkunaGUIController.java
+++ b/src/HT/fx/OtteluIkkunaGUIController.java
@@ -42,8 +42,8 @@ public class OtteluIkkunaGUIController implements ModalControllerInterface<Strin
int i = 0;
Ottelu ottelu = PadelMainGUIController.getKarkelo().noudaOttelu(i);
int[] numerot = ottelu.getPelaajaNrot();
- joukkue1.setText(haePelaaja(numerot[0]) + " " + haePelaaja(numerot[1]));
- joukkue2.setText(haePelaaja(numerot[2]) + " " + haePelaaja(numerot[3]));
+ joukkue1.setText(haePelaaja(numerot[0]) + ", " + haePelaaja(numerot[1]));
+ joukkue2.setText(haePelaaja(numerot[2]) + ", " + haePelaaja(numerot[3]));
lopputulos.setText(ottelu.getLopputulos());
paivamaara.setText(ottelu.getDate().toString());
--
GitLab