diff --git a/src/fxHarakka/HarakkaController.java b/src/fxHarakka/HarakkaController.java
index 5e0c73e2bfea240d1e5d553fc52987b998d5f6bc..2425cd2b0fbb1800f65e160817a9049a832c7d9f 100644
--- a/src/fxHarakka/HarakkaController.java
+++ b/src/fxHarakka/HarakkaController.java
@@ -195,4 +195,5 @@ public class HarakkaController {
Dialogs.showMessageDialog("Myöhemmin: Saat lisätietoja ohjelmasta");
}
+
}
diff --git a/src/fxHarakka/Oksa.fxml b/src/fxHarakka/Oksa.fxml
index 1f87142de6148b4d4f6fb47fda3ec12c29f7b8bb..c6cf891bba761f380bac008c5bf8aaefe6a103db 100644
--- a/src/fxHarakka/Oksa.fxml
+++ b/src/fxHarakka/Oksa.fxml
@@ -2,13 +2,17 @@
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ScrollPane?>
+<?import javafx.scene.control.ButtonBar?>
+<?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.ProgressBar?>
<?import javafx.scene.control.SplitPane?>
+<?import javafx.scene.control.TextArea?>
<?import javafx.scene.control.TextField?>
<?import javafx.scene.control.TitledPane?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.ColumnConstraints?>
<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.Pane?>
<?import javafx.scene.layout.RowConstraints?>
<SplitPane dividerPositions="0.5, 0.510590015128593" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="445.0" prefWidth="663.0" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1">
@@ -21,78 +25,54 @@
<children>
<Button layoutX="23.0" layoutY="367.0" mnemonicParsing="false" text="Tallenna" />
<Button layoutX="98.0" layoutY="367.0" mnemonicParsing="false" text="Hylkää muutokset" />
+ <TextField layoutX="56.0" layoutY="37.0" prefHeight="26.0" prefWidth="206.0" text="Lisää "ei toimi" promptit" />
+ <TextField layoutX="56.0" layoutY="70.0" prefHeight="26.0" prefWidth="206.0" text="Lisää sample data" />
+ <CheckBox layoutX="31.0" layoutY="41.0" mnemonicParsing="false" />
+ <CheckBox layoutX="31.0" layoutY="74.0" mnemonicParsing="false" />
+ <ProgressBar layoutX="30.0" layoutY="329.0" prefHeight="20.0" prefWidth="254.0" progress="0.0" />
</children>
</AnchorPane>
</content>
</TitledPane>
</children></AnchorPane>
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="100.0" />
- <TitledPane animated="false" prefHeight="443.0" prefWidth="327.0" text="Tiedot">
+ <TitledPane animated="false" prefHeight="443.0" prefWidth="327.0" text="Tehtävän tiedot">
<content>
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="0.0" prefWidth="38.0">
<children>
- <ScrollPane layoutX="-7.0" layoutY="1.0" prefHeight="416.0" prefWidth="318.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
- <content>
- <GridPane gridLinesVisible="true">
- <columnConstraints>
- <ColumnConstraints hgrow="SOMETIMES" maxWidth="130.22607421875" minWidth="10.0" prefWidth="101.00753784179688" />
- <ColumnConstraints hgrow="SOMETIMES" maxWidth="123.17330932617188" minWidth="10.0" prefWidth="98.99246215820312" />
- <ColumnConstraints hgrow="SOMETIMES" maxWidth="123.17330932617188" minWidth="10.0" prefWidth="100.0" />
- </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 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>
- <opaqueInsets>
- <Insets />
- </opaqueInsets>
- <children>
- <TextField GridPane.rowIndex="1" />
- <TextField GridPane.columnIndex="1" GridPane.rowIndex="1" />
- <TextField GridPane.columnIndex="2" GridPane.rowIndex="1" />
- <TextField GridPane.rowIndex="2" />
- <TextField GridPane.columnIndex="1" GridPane.rowIndex="3" />
- <TextField GridPane.rowIndex="3" />
- <TextField GridPane.columnIndex="2" GridPane.rowIndex="2" />
- <TextField GridPane.columnIndex="1" GridPane.rowIndex="2" />
- <TextField GridPane.rowIndex="6" />
- <TextField GridPane.columnIndex="2" GridPane.rowIndex="5" />
- <TextField GridPane.columnIndex="1" GridPane.rowIndex="5" />
- <TextField GridPane.rowIndex="5" />
- <TextField GridPane.columnIndex="2" GridPane.rowIndex="4" />
- <TextField GridPane.columnIndex="1" GridPane.rowIndex="4" />
- <TextField GridPane.rowIndex="4" />
- <TextField GridPane.columnIndex="2" GridPane.rowIndex="3" />
- <TextField GridPane.rowIndex="10" />
- <TextField GridPane.columnIndex="2" GridPane.rowIndex="9" />
- <TextField GridPane.rowIndex="9" />
- <TextField GridPane.columnIndex="2" GridPane.rowIndex="7" />
- <TextField GridPane.columnIndex="1" GridPane.rowIndex="8" />
- <TextField GridPane.columnIndex="1" GridPane.rowIndex="9" />
- <TextField GridPane.rowIndex="8" />
- <TextField GridPane.columnIndex="2" GridPane.rowIndex="8" />
- <TextField GridPane.columnIndex="1" GridPane.rowIndex="7" />
- <TextField GridPane.rowIndex="7" />
- <TextField GridPane.columnIndex="2" GridPane.rowIndex="6" />
- <TextField GridPane.columnIndex="1" GridPane.rowIndex="6" />
- <TextField GridPane.columnIndex="2" GridPane.rowIndex="10" />
- <TextField GridPane.columnIndex="1" GridPane.rowIndex="10" />
- </children>
- </GridPane>
- </content>
- </ScrollPane>
+ <TextArea layoutX="22.0" layoutY="200.0" prefHeight="109.0" prefWidth="278.0" promptText="Lisätietoja" />
+ <Pane layoutX="23.0" layoutY="-7.0" prefHeight="200.0" prefWidth="252.0" />
+ <GridPane gridLinesVisible="true" layoutX="10.0" layoutY="10.0">
+ <columnConstraints>
+ <ColumnConstraints hgrow="SOMETIMES" maxWidth="130.22607421875" minWidth="10.0" prefWidth="101.00753784179688" />
+ <ColumnConstraints hgrow="SOMETIMES" maxWidth="123.17330932617188" minWidth="10.0" prefWidth="98.99246215820312" />
+ <ColumnConstraints hgrow="SOMETIMES" maxWidth="123.17330932617188" minWidth="10.0" prefWidth="100.0" />
+ </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>
+ <opaqueInsets>
+ <Insets />
+ </opaqueInsets>
+ <children>
+ <TextField text="Kiinteä aika:" GridPane.rowIndex="1" />
+ <TextField promptText="muotoa 1,1 - 1,4" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+ <TextField GridPane.columnIndex="2" GridPane.rowIndex="1" />
+ <TextField text="Ajankohta:" GridPane.rowIndex="2" />
+ <TextField GridPane.columnIndex="2" GridPane.rowIndex="2" />
+ <TextField promptText="pv.tt." GridPane.columnIndex="1" GridPane.rowIndex="2" />
+ <TextField />
+ <TextField GridPane.columnIndex="2" />
+ <TextField GridPane.columnIndex="1" />
+ </children>
+ </GridPane>
+ <ButtonBar layoutX="15.0" layoutY="362.0" prefHeight="40.0" prefWidth="282.0">
+ <buttons>
+ <Button mnemonicParsing="false" text="Ohje" />
+ </buttons>
+ </ButtonBar>
</children>
</AnchorPane>
</content>