diff --git a/src/fxHiihtorekisteri/PaaikkunaGUIView.fxml b/src/fxHiihtorekisteri/PaaikkunaGUIView.fxml
index 1500c088f659ba5bd5e948054640147d50c29877..c3a3f6000b91f4147330bf160e9c6f235172884d 100644
--- a/src/fxHiihtorekisteri/PaaikkunaGUIView.fxml
+++ b/src/fxHiihtorekisteri/PaaikkunaGUIView.fxml
@@ -2,14 +2,15 @@
<?import fi.jyu.mit.fxgui.ComboBoxChooser?>
<?import fi.jyu.mit.fxgui.ListChooser?>
+<?import fi.jyu.mit.fxgui.StringGrid?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.DatePicker?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.Menu?>
<?import javafx.scene.control.MenuBar?>
<?import javafx.scene.control.MenuItem?>
<?import javafx.scene.control.ScrollPane?>
+<?import javafx.scene.control.TableColumn?>
<?import javafx.scene.control.TextField?>
<?import javafx.scene.control.Tooltip?>
<?import javafx.scene.input.KeyCodeCombination?>
@@ -20,7 +21,7 @@
<?import javafx.scene.layout.RowConstraints?>
<?import javafx.scene.layout.VBox?>
-<BorderPane xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="fxHiihtorekisteri.HiihtorekisteriGUIController">
+<BorderPane prefHeight="587.0" prefWidth="673.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="fxHiihtorekisteri.HiihtorekisteriGUIController">
<bottom>
<HBox spacing="10.0" BorderPane.alignment="CENTER">
<BorderPane.margin>
@@ -31,7 +32,7 @@
<tooltip>
<Tooltip text="Uuden jäsenen lisääminen" />
</tooltip></Button>
- <Button mnemonicParsing="false" text="Hiihtäjän tiedot">
+ <Button alignment="CENTER" mnemonicParsing="false" text="Katso hiihdot">
<tooltip>
<Tooltip text="Tallenna" />
</tooltip></Button>
@@ -72,9 +73,51 @@
<VBox alignment="TOP_CENTER" prefHeight="200.0" prefWidth="100.0">
<children>
<Label contentDisplay="CENTER" text="Hiihtäjät" textAlignment="CENTER" wrapText="true" />
- <ListChooser rivit=" " />
+ <ListChooser rivit="nimi" />
</children>
</VBox>
+ <VBox alignment="TOP_CENTER">
+ <children>
+ <Label contentDisplay="CENTER" text="Hiihtäjän tiedot" textAlignment="CENTER" />
+ </children>
+ </VBox>
+ <GridPane hgap="10.0" prefHeight="117.0" prefWidth="209.0">
+ <columnConstraints>
+ <ColumnConstraints fillWidth="false" halignment="RIGHT" hgrow="SOMETIMES" />
+ <ColumnConstraints hgrow="ALWAYS" maxWidth="140.00004069010416" minWidth="69.33333841959634" prefWidth="83.33335367838542" />
+ </columnConstraints>
+ <rowConstraints>
+ <RowConstraints vgrow="SOMETIMES" />
+ <RowConstraints prefHeight="30.0" vgrow="SOMETIMES" />
+ <RowConstraints prefHeight="30.0" vgrow="SOMETIMES" />
+ <RowConstraints prefHeight="30.0" vgrow="SOMETIMES" />
+ <RowConstraints prefHeight="30.0" vgrow="SOMETIMES" />
+ <RowConstraints prefHeight="30.0" vgrow="SOMETIMES" />
+ <RowConstraints prefHeight="30.0" vgrow="SOMETIMES" />
+ <RowConstraints prefHeight="30.0" vgrow="SOMETIMES" />
+ </rowConstraints>
+ <padding>
+ <Insets left="10.0" right="10.0" top="10.0" />
+ </padding>
+ <children>
+ <Label text="Sukunimi" />
+ <TextField text="Nokka" GridPane.columnIndex="1" />
+ <Label text="Etunimi" GridPane.rowIndex="1" />
+ <TextField text="Räkä" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="1" />
+ <Label text="Syntymäaika" GridPane.rowIndex="2" />
+ <TextField text="01.08.1955" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+ <Label text="Paikkakunta" GridPane.rowIndex="3" />
+ <TextField text="Lahti" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="3" />
+ <Label text="Puhelinnumero" GridPane.rowIndex="4" />
+ <TextField text="0552012233" GridPane.columnIndex="1" GridPane.rowIndex="4" />
+ <Label text="Sähköposti" GridPane.rowIndex="5" />
+ <TextField text="nr@niilot.fi" GridPane.columnIndex="1" GridPane.rowIndex="5" />
+ <Label text="Liittymisvuosi" GridPane.rowIndex="6" />
+ <TextField text="1960" GridPane.columnIndex="1" GridPane.rowIndex="6" />
+ <Label text="Km yhteensä" GridPane.rowIndex="7" />
+ <TextField text="1200" GridPane.columnIndex="1" GridPane.rowIndex="7" />
+ </children>
+ </GridPane>
</children>
</VBox>
</top>
@@ -83,40 +126,17 @@
<center>
<ScrollPane fitToWidth="true" prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER">
<content>
- <GridPane hgap="10.0">
- <columnConstraints>
- <ColumnConstraints fillWidth="false" halignment="RIGHT" hgrow="SOMETIMES" />
- <ColumnConstraints hgrow="ALWAYS" maxWidth="140.00004069010416" minWidth="69.33333841959634" prefWidth="83.33335367838542" />
- </columnConstraints>
- <rowConstraints>
- <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
- <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
- <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
- <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
- <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
- <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
- <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
- </rowConstraints>
- <padding>
- <Insets left="10.0" right="10.0" top="10.0" />
- </padding>
- <children>
- <Label text="Suorituspvm." />
- <DatePicker GridPane.columnIndex="1" />
- <Label text="Matka" GridPane.rowIndex="1" />
- <TextField text="50" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="1" />
- <Label text="Hiihtoaika" GridPane.rowIndex="2" />
- <TextField text="01:30" GridPane.columnIndex="1" GridPane.rowIndex="2" />
- <Label text="Lämpötila" GridPane.rowIndex="3" />
- <TextField text="-5" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="3" />
- <Label text="Keskisyke" GridPane.rowIndex="4" />
- <TextField text="135" GridPane.columnIndex="1" GridPane.rowIndex="4" />
- <Label text="Maksimisyke" GridPane.rowIndex="5" />
- <TextField text="180" GridPane.columnIndex="1" GridPane.rowIndex="5" />
- <Label text="Kalorit" GridPane.rowIndex="6" />
- <TextField text="550" GridPane.columnIndex="1" GridPane.rowIndex="6" />
- </children>
- </GridPane>
+ <StringGrid prefHeight="400.0" prefWidth="443.0">
+ <columns>
+ <TableColumn minWidth="-1.0" prefWidth="75.0" text="Suorituspvm" />
+ <TableColumn prefWidth="75.0" text="Matka" />
+ <TableColumn prefWidth="75.0" text="Hiihtoaika" />
+ <TableColumn prefWidth="75.0" text="Lämpötila" />
+ <TableColumn prefWidth="75.0" text="Keskisyke" />
+ <TableColumn prefWidth="75.0" text="Maksimisyke" />
+ <TableColumn prefWidth="75.0" text="Kalorit" />
+ </columns>
+ </StringGrid>
</content>
</ScrollPane>
</center>