diff --git a/kuvat/LisaaHiihtaja.png b/kuvat/LisaaHiihtaja.png
new file mode 100644
index 0000000000000000000000000000000000000000..6df3bcb4b8e96b6abaac7cda90403bf1fb4b406f
Binary files /dev/null and b/kuvat/LisaaHiihtaja.png differ
diff --git a/kuvat/LisaaHiihto.png b/kuvat/LisaaHiihto.png
new file mode 100644
index 0000000000000000000000000000000000000000..0a4b16057141077038e13a7da53dc2de4cc44e47
Binary files /dev/null and b/kuvat/LisaaHiihto.png differ
diff --git a/kuvat/Muokkaa.png b/kuvat/Muokkaa.png
new file mode 100644
index 0000000000000000000000000000000000000000..717c7f50d8ad9397db700983e94aeb7a49b89ff9
Binary files /dev/null and b/kuvat/Muokkaa.png differ
diff --git a/kuvat/Ohje.png b/kuvat/Ohje.png
new file mode 100644
index 0000000000000000000000000000000000000000..846de117764b164e9fef788940f09f779fe650f6
Binary files /dev/null and b/kuvat/Ohje.png differ
diff --git a/kuvat/PoistaHiihtaja.png b/kuvat/PoistaHiihtaja.png
new file mode 100644
index 0000000000000000000000000000000000000000..a811e3eaeb453f02328046115b02b72044bd9068
Binary files /dev/null and b/kuvat/PoistaHiihtaja.png differ
diff --git a/kuvat/Tallenna.png b/kuvat/Tallenna.png
new file mode 100644
index 0000000000000000000000000000000000000000..7c13ab2feef40c7daf37e735ff06eba27420bdef
Binary files /dev/null and b/kuvat/Tallenna.png differ
diff --git a/kuvat/Tietoja.png b/kuvat/Tietoja.png
new file mode 100644
index 0000000000000000000000000000000000000000..2c8e9a4e8b0f9e4b94f53193164381e8e7728874
Binary files /dev/null and b/kuvat/Tietoja.png differ
diff --git a/kuvat/Tulosta.png b/kuvat/Tulosta.png
new file mode 100644
index 0000000000000000000000000000000000000000..add4f7489805dcc24c812e08fbeb6320944cf11f
Binary files /dev/null and b/kuvat/Tulosta.png differ
diff --git a/src/fxHiihtorekisteri/EiLoydy.fxml b/src/fxHiihtorekisteri/EiLoydy.fxml
index c3a3f6000b91f4147330bf160e9c6f235172884d..e653798b5e3563c11147d49d25a62f8d5cd723ae 100644
--- a/src/fxHiihtorekisteri/EiLoydy.fxml
+++ b/src/fxHiihtorekisteri/EiLoydy.fxml
@@ -1,143 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?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.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?>
<?import javafx.scene.layout.BorderPane?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.RowConstraints?>
-<?import javafx.scene.layout.VBox?>
-<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">
+<BorderPane prefHeight="164.0" prefWidth="316.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="fxHiihtorekisteri.HiihtorekisteriGUIController">
+ <center>
+ <Label text="Hakemaasi nimeä ei löydy!" BorderPane.alignment="CENTER" />
+ </center>
<bottom>
- <HBox spacing="10.0" BorderPane.alignment="CENTER">
+ <Button mnemonicParsing="false" text="OK" BorderPane.alignment="CENTER">
<BorderPane.margin>
- <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+ <Insets bottom="5.0" />
</BorderPane.margin>
- <children>
- <Button text="_Lisää hiihto">
- <tooltip>
- <Tooltip text="Uuden jäsenen lisääminen" />
- </tooltip></Button>
- <Button alignment="CENTER" mnemonicParsing="false" text="Katso hiihdot">
- <tooltip>
- <Tooltip text="Tallenna" />
- </tooltip></Button>
- </children>
- </HBox>
+ </Button>
</bottom>
- <top>
- <MenuBar BorderPane.alignment="CENTER">
- <menus>
- <Menu mnemonicParsing="false" text="Tiedosto">
- <items>
- <MenuItem mnemonicParsing="false" text="Tallenna">
- <accelerator>
- <KeyCodeCombination alt="UP" code="S" control="DOWN" meta="UP" shift="UP" shortcut="UP" />
- </accelerator></MenuItem>
- <MenuItem mnemonicParsing="false" text="Tulosta" />
- <MenuItem mnemonicParsing="false" text="Lisää hiihtäjä" />
- <MenuItem mnemonicParsing="false" text="Poista hiihtäjä" />
- <MenuItem mnemonicParsing="false" text="Lopeta" />
- </items>
- </Menu>
- <Menu mnemonicParsing="false" text="Ohje">
- <items>
- <MenuItem mnemonicParsing="false" text="Käyttöohjeet" />
- <MenuItem mnemonicParsing="false" text="Tietoja" />
- </items>
- </Menu>
- </menus>
- </MenuBar>
- </top>
- <left>
- <BorderPane prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER">
- <top>
- <VBox BorderPane.alignment="CENTER">
- <children>
- <ComboBoxChooser rivit="Nimi Paikkakunta " />
- <TextField prefHeight="0.0" prefWidth="200.0" />
- <VBox alignment="TOP_CENTER" prefHeight="200.0" prefWidth="100.0">
- <children>
- <Label contentDisplay="CENTER" text="Hiihtäjät" textAlignment="CENTER" wrapText="true" />
- <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>
- </BorderPane>
- </left>
- <center>
- <ScrollPane fitToWidth="true" prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER">
- <content>
- <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>
</BorderPane>
diff --git a/src/fxHiihtorekisteri/Hiihtajantiedot.fxml b/src/fxHiihtorekisteri/Hiihtajantiedot.fxml
deleted file mode 100644
index 1500c088f659ba5bd5e948054640147d50c29877..0000000000000000000000000000000000000000
--- a/src/fxHiihtorekisteri/Hiihtajantiedot.fxml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import fi.jyu.mit.fxgui.ComboBoxChooser?>
-<?import fi.jyu.mit.fxgui.ListChooser?>
-<?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.TextField?>
-<?import javafx.scene.control.Tooltip?>
-<?import javafx.scene.input.KeyCodeCombination?>
-<?import javafx.scene.layout.BorderPane?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.HBox?>
-<?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">
- <bottom>
- <HBox spacing="10.0" BorderPane.alignment="CENTER">
- <BorderPane.margin>
- <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
- </BorderPane.margin>
- <children>
- <Button text="_Lisää hiihto">
- <tooltip>
- <Tooltip text="Uuden jäsenen lisääminen" />
- </tooltip></Button>
- <Button mnemonicParsing="false" text="Hiihtäjän tiedot">
- <tooltip>
- <Tooltip text="Tallenna" />
- </tooltip></Button>
- </children>
- </HBox>
- </bottom>
- <top>
- <MenuBar BorderPane.alignment="CENTER">
- <menus>
- <Menu mnemonicParsing="false" text="Tiedosto">
- <items>
- <MenuItem mnemonicParsing="false" text="Tallenna">
- <accelerator>
- <KeyCodeCombination alt="UP" code="S" control="DOWN" meta="UP" shift="UP" shortcut="UP" />
- </accelerator></MenuItem>
- <MenuItem mnemonicParsing="false" text="Tulosta" />
- <MenuItem mnemonicParsing="false" text="Lisää hiihtäjä" />
- <MenuItem mnemonicParsing="false" text="Poista hiihtäjä" />
- <MenuItem mnemonicParsing="false" text="Lopeta" />
- </items>
- </Menu>
- <Menu mnemonicParsing="false" text="Ohje">
- <items>
- <MenuItem mnemonicParsing="false" text="Käyttöohjeet" />
- <MenuItem mnemonicParsing="false" text="Tietoja" />
- </items>
- </Menu>
- </menus>
- </MenuBar>
- </top>
- <left>
- <BorderPane prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER">
- <top>
- <VBox BorderPane.alignment="CENTER">
- <children>
- <ComboBoxChooser rivit="Nimi Paikkakunta " />
- <TextField prefHeight="0.0" prefWidth="200.0" />
- <VBox alignment="TOP_CENTER" prefHeight="200.0" prefWidth="100.0">
- <children>
- <Label contentDisplay="CENTER" text="Hiihtäjät" textAlignment="CENTER" wrapText="true" />
- <ListChooser rivit=" " />
- </children>
- </VBox>
- </children>
- </VBox>
- </top>
- </BorderPane>
- </left>
- <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>
- </content>
- </ScrollPane>
- </center>
-</BorderPane>
diff --git a/src/fxHiihtorekisteri/LisaaHiihtaja.fxml b/src/fxHiihtorekisteri/LisaaHiihtaja.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..08624674ad0b7f29bbe17f97f3b415df8bfc2981
--- /dev/null
+++ b/src/fxHiihtorekisteri/LisaaHiihtaja.fxml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.RowConstraints?>
+
+<BorderPane 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>
+ <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+ </BorderPane.margin>
+ <children>
+ <Button text="Tallenna" />
+ <Button alignment="CENTER" mnemonicParsing="false" text="Peruuta" />
+ </children>
+ </HBox>
+ </bottom>
+ <center>
+ <GridPane hgap="10.0" BorderPane.alignment="CENTER">
+ <columnConstraints>
+ <ColumnConstraints fillWidth="false" halignment="RIGHT" hgrow="SOMETIMES" />
+ <ColumnConstraints hgrow="ALWAYS" maxWidth="550.000010172526" minWidth="69.33333841959634" />
+ </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 GridPane.columnIndex="1" />
+ <Label text="Etunimi" GridPane.rowIndex="1" />
+ <TextField GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="1" />
+ <Label text="Syntymäaika" GridPane.rowIndex="2" />
+ <TextField GridPane.columnIndex="1" GridPane.rowIndex="2" />
+ <Label text="Paikkakunta" GridPane.rowIndex="3" />
+ <TextField GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="3" />
+ <Label text="Puhelinnumero" GridPane.rowIndex="4" />
+ <TextField GridPane.columnIndex="1" GridPane.rowIndex="4" />
+ <Label text="Sähköposti" GridPane.rowIndex="5" />
+ <TextField GridPane.columnIndex="1" GridPane.rowIndex="5" />
+ <Label text="Liittymisvuosi" GridPane.rowIndex="6" />
+ <TextField GridPane.columnIndex="1" GridPane.rowIndex="6" />
+ <Label text="Km yhteensä" GridPane.rowIndex="7" />
+ <TextField GridPane.columnIndex="1" GridPane.rowIndex="7" />
+ </children>
+ </GridPane>
+ </center>
+</BorderPane>
diff --git a/src/fxHiihtorekisteri/LisaaHiihto.fxml b/src/fxHiihtorekisteri/LisaaHiihto.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..4306e92efdd819a528b46f41e989601f53080e96
--- /dev/null
+++ b/src/fxHiihtorekisteri/LisaaHiihto.fxml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.DatePicker?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.control.Tooltip?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.RowConstraints?>
+
+<BorderPane prefHeight="254.0" prefWidth="307.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>
+ <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+ </BorderPane.margin>
+ <children>
+ <Button text="Peruuta">
+ <tooltip>
+ <Tooltip text="Uuden jäsenen lisääminen" />
+ </tooltip></Button>
+ <Button mnemonicParsing="false" text="Tallenna">
+ <tooltip>
+ <Tooltip text="Tallenna" />
+ </tooltip></Button>
+ </children>
+ </HBox>
+ </bottom>
+ <center>
+ <GridPane hgap="10.0" BorderPane.alignment="CENTER">
+ <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 GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="1" />
+ <Label text="Hiihtoaika" GridPane.rowIndex="2" />
+ <TextField GridPane.columnIndex="1" GridPane.rowIndex="2" />
+ <Label text="Lämpötila" GridPane.rowIndex="3" />
+ <TextField GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="3" />
+ <Label text="Keskisyke" GridPane.rowIndex="4" />
+ <TextField GridPane.columnIndex="1" GridPane.rowIndex="4" />
+ <Label text="Maksimisyke" GridPane.rowIndex="5" />
+ <TextField GridPane.columnIndex="1" GridPane.rowIndex="5" />
+ <Label text="Kalorit" GridPane.rowIndex="6" />
+ <TextField GridPane.columnIndex="1" GridPane.rowIndex="6" />
+ </children>
+ </GridPane>
+ </center>
+ <top>
+ <HBox spacing="10.0" BorderPane.alignment="CENTER">
+ <children>
+ <TextField text="Juha" />
+ <TextField text="Mieto" />
+ </children>
+ <BorderPane.margin>
+ <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
+ </BorderPane.margin>
+ </HBox>
+ </top>
+</BorderPane>
diff --git a/src/fxHiihtorekisteri/Muokkaa.fxml b/src/fxHiihtorekisteri/Muokkaa.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..ef0883a8c8a7fab0357e0fd571552ab11aaf533d
--- /dev/null
+++ b/src/fxHiihtorekisteri/Muokkaa.fxml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import fi.jyu.mit.fxgui.StringGrid?>
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.ScrollPane?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.RowConstraints?>
+<?import javafx.scene.layout.VBox?>
+
+<BorderPane prefHeight="408.0" prefWidth="684.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>
+ <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+ </BorderPane.margin>
+ <children>
+ <Button text="Tallenna" />
+ <Button alignment="CENTER" mnemonicParsing="false" text="Peruuta" />
+ </children>
+ </HBox>
+ </bottom>
+ <left>
+ <BorderPane BorderPane.alignment="CENTER">
+ <top>
+ <VBox BorderPane.alignment="CENTER">
+ <children>
+ <VBox alignment="TOP_CENTER">
+ <children>
+ <Label contentDisplay="CENTER" text="Hiihtäjän tiedot" textAlignment="CENTER" />
+ </children>
+ <VBox.margin>
+ <Insets top="10.0" />
+ </VBox.margin>
+ </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>
+ </BorderPane>
+ </left>
+ <center>
+ <ScrollPane fitToWidth="true" prefHeight="421.0" prefWidth="353.0" BorderPane.alignment="CENTER">
+ <content>
+ <StringGrid minWidth="-Infinity" prefHeight="400.0" rivit="Pvm|Matka|Hiihtoaika|Lämpötila|Keskisyke|Maksimisyke|Kalorit 30.1.2020|20|2:30|-5|135|160|400" />
+ </content>
+ </ScrollPane>
+ </center>
+</BorderPane>
diff --git a/src/fxHiihtorekisteri/Ohje.fxml b/src/fxHiihtorekisteri/Ohje.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..6bacb25d29a8aa60f8361d46752c25ce6702743d
--- /dev/null
+++ b/src/fxHiihtorekisteri/Ohje.fxml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.TextArea?>
+<?import javafx.scene.layout.BorderPane?>
+
+<BorderPane xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="fxHiihtorekisteri.HiihtorekisteriGUIController">
+ <bottom>
+ <Button text="Sulje" BorderPane.alignment="CENTER">
+ <BorderPane.margin>
+ <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+ </BorderPane.margin>
+ </Button>
+ </bottom>
+ <center>
+ <TextArea text="Käyttöohjeet Aloita lisäämällä omat henkilötietosi. Voit muokata ja poistaa henkilötietojasi jälkikäteen. Lisää oma hiihtotapahtuma “lisää hiihto†kohdasta. Voit syöttää kaikki ohjelman kysymät tiedot tai vain ne tiedot, jotka näet oleellisiksi. Voit muokata omia hiihtotapahtumiasi “muokkaa hiihtoa†kohdasta. Mikäli hiihtosi eivät mielytä, voit myös poistaa hiihtoja." wrapText="true" BorderPane.alignment="CENTER" />
+ </center>
+</BorderPane>
diff --git a/src/fxHiihtorekisteri/PaaikkunaGUIView.fxml b/src/fxHiihtorekisteri/PaaikkunaGUIView.fxml
index c3a3f6000b91f4147330bf160e9c6f235172884d..5537f32d7e0baeb2a12c4dd830255cbecd39aebe 100644
--- a/src/fxHiihtorekisteri/PaaikkunaGUIView.fxml
+++ b/src/fxHiihtorekisteri/PaaikkunaGUIView.fxml
@@ -12,7 +12,6 @@
<?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?>
<?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.layout.ColumnConstraints?>
@@ -28,14 +27,9 @@
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</BorderPane.margin>
<children>
- <Button text="_Lisää hiihto">
- <tooltip>
- <Tooltip text="Uuden jäsenen lisääminen" />
- </tooltip></Button>
- <Button alignment="CENTER" mnemonicParsing="false" text="Katso hiihdot">
- <tooltip>
- <Tooltip text="Tallenna" />
- </tooltip></Button>
+ <Button text="_Lisää hiihto" />
+ <Button alignment="CENTER" mnemonicParsing="false" text="Katso hiihdot" />
+ <Button mnemonicParsing="false" text="Tulosta" />
</children>
</HBox>
</bottom>
diff --git a/src/fxHiihtorekisteri/PoistaJasen.fxml b/src/fxHiihtorekisteri/PoistaJasen.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..9c9e083a1438f96debce72f48df1df5516fed28c
--- /dev/null
+++ b/src/fxHiihtorekisteri/PoistaJasen.fxml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.HBox?>
+
+<BorderPane xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="fxHiihtorekisteri.HiihtorekisteriGUIController">
+ <bottom>
+ <HBox spacing="20.0" BorderPane.alignment="CENTER">
+ <children>
+ <Button mnemonicParsing="false" text="Kyllä">
+ <HBox.margin>
+ <Insets left="50.0" />
+ </HBox.margin>
+ </Button>
+ <Button mnemonicParsing="false" text="EI">
+ <HBox.margin>
+ <Insets left="80.0" />
+ </HBox.margin>
+ </Button>
+ </children>
+ <BorderPane.margin>
+ <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+ </BorderPane.margin>
+ </HBox>
+ </bottom>
+ <top>
+ <Label text="Poistetaanko hiihtäjä?" BorderPane.alignment="CENTER">
+ <BorderPane.margin>
+ <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+ </BorderPane.margin></Label>
+ </top>
+ <center>
+ <HBox spacing="5.0" BorderPane.alignment="CENTER">
+ <children>
+ <TextField text="Juha" />
+ <TextField text="Mieto" />
+ </children>
+ <BorderPane.margin>
+ <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
+ </BorderPane.margin>
+ </HBox>
+ </center>
+</BorderPane>
diff --git a/src/fxHiihtorekisteri/Tallenna.fxml b/src/fxHiihtorekisteri/Tallenna.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..8d5e730a9ef95584e32080b90f2ac58a338532df
--- /dev/null
+++ b/src/fxHiihtorekisteri/Tallenna.fxml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.HBox?>
+
+<BorderPane prefHeight="164.0" prefWidth="316.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="fxHiihtorekisteri.HiihtorekisteriGUIController">
+ <center>
+ <Label text="Tallennetaanko muutokset?" BorderPane.alignment="CENTER" />
+ </center>
+ <bottom>
+ <HBox spacing="20.0" BorderPane.alignment="CENTER">
+ <children>
+ <Button mnemonicParsing="false" text="Kyllä">
+ <HBox.margin>
+ <Insets left="50.0" />
+ </HBox.margin>
+ </Button>
+ <Button mnemonicParsing="false" text="EI">
+ <HBox.margin>
+ <Insets left="80.0" />
+ </HBox.margin>
+ </Button>
+ </children>
+ <BorderPane.margin>
+ <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+ </BorderPane.margin>
+ </HBox>
+ </bottom>
+</BorderPane>
diff --git a/src/fxHiihtorekisteri/Tietoja.fxml b/src/fxHiihtorekisteri/Tietoja.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..83e452cdef093a9a88b00aa6a1f86e43de5ea348
--- /dev/null
+++ b/src/fxHiihtorekisteri/Tietoja.fxml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.TextArea?>
+<?import javafx.scene.layout.BorderPane?>
+
+<BorderPane xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="fxHiihtorekisteri.HiihtorekisteriGUIController">
+ <bottom>
+ <Button text="Sulje" BorderPane.alignment="CENTER">
+ <BorderPane.margin>
+ <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+ </BorderPane.margin>
+ </Button>
+ </bottom>
+ <center>
+ <TextArea minHeight="-Infinity" text="Tietoja ohjelmasta Tämä ohjelma pitää hiihtotapahtumasi ajantasalla. Ja kun kuitenkin olet kiinnostunut muiden hiihtäjien hiihdoista, niin tämä ohjelma mahdollistaa sen. Kurkkaa, millä paikkakunnalla harrastetaan hiihtoa, eikä vain yritetä harrastaa." wrapText="true" BorderPane.alignment="CENTER" />
+ </center>
+</BorderPane>
diff --git a/src/fxHiihtorekisteri/Tulosta.fxml b/src/fxHiihtorekisteri/Tulosta.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..344380deac7168a12e1ecf3ad115d6e349df73eb
--- /dev/null
+++ b/src/fxHiihtorekisteri/Tulosta.fxml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import fi.jyu.mit.fxgui.StringGrid?>
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ScrollPane?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+
+<BorderPane prefHeight="408.0" prefWidth="684.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="fxHiihtorekisteri.HiihtorekisteriGUIController">
+ <bottom>
+ <HBox spacing="50.0" BorderPane.alignment="CENTER">
+ <BorderPane.margin>
+ <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+ </BorderPane.margin>
+ <children>
+ <Button text="Tulosta" />
+ <Button alignment="CENTER" mnemonicParsing="false" text="Peruuta" />
+ </children>
+ </HBox>
+ </bottom>
+ <left>
+ <BorderPane BorderPane.alignment="CENTER">
+ <top>
+ <VBox BorderPane.alignment="CENTER" />
+ </top>
+ </BorderPane>
+ </left>
+ <center>
+ <ScrollPane fitToWidth="true" prefHeight="421.0" prefWidth="353.0" BorderPane.alignment="CENTER">
+ <content>
+ <StringGrid minWidth="-Infinity" prefHeight="400.0" rivit="Pvm|Matka|Hiihtoaika|Lämpötila|Keskisyke|Maksimisyke|Kalorit 30.1.2020|20|2:30|-5|135|160|400" />
+ </content>
+ </ScrollPane>
+ </center>
+</BorderPane>