diff --git a/kuvat/lisaa_muokkaa_tavara.jpg b/kuvat/lisaa_muokkaa_tavara.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..5f7260265970e10ea1af5b95b01831096d51e597
Binary files /dev/null and b/kuvat/lisaa_muokkaa_tavara.jpg differ
diff --git a/kuvat/main_w_content.jpg b/kuvat/main_w_content.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..2426dc68eb75e074c1a311d48e10450db9fd3079
Binary files /dev/null and b/kuvat/main_w_content.jpg differ
diff --git a/kuvat/main_wo_content.jpg b/kuvat/main_wo_content.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..cd686783915ee9e80aa6dfe1779cd559943894b1
Binary files /dev/null and b/kuvat/main_wo_content.jpg differ
diff --git a/kuvat/tag_lisays_tavaralle.jpg b/kuvat/tag_lisays_tavaralle.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..d9a0f9cbec3c9588dabe58162f678c0f920240c3
Binary files /dev/null and b/kuvat/tag_lisays_tavaralle.jpg differ
diff --git a/kuvat/tavaran_sisalto.jpg b/kuvat/tavaran_sisalto.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..3c25f7b83c2906a9d387d57e6c4722c88201e7ba
Binary files /dev/null and b/kuvat/tavaran_sisalto.jpg differ
diff --git a/kuvat/tilan_tiedot.jpg b/kuvat/tilan_tiedot.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..3cb7b6d53bf6c9772c8ab554a670c5a6d46188a8
Binary files /dev/null and b/kuvat/tilan_tiedot.jpg differ
diff --git a/tavaranpaikka/src/fxTavaranPaikka/TavaraLisaysGuiView.fxml b/tavaranpaikka/src/fxTavaranPaikka/TavaraLisaysGuiView.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..f60cbeb7a3acc341e92343ce653ac94431aa9e5a
--- /dev/null
+++ b/tavaranpaikka/src/fxTavaranPaikka/TavaraLisaysGuiView.fxml
@@ -0,0 +1,127 @@
+<?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 maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="350.0" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1">
+ <top>
+ <Label text="Lisää/Muokkaa tavara" BorderPane.alignment="CENTER">
+ <BorderPane.margin>
+ <Insets top="10.0" />
+ </BorderPane.margin>
+ </Label>
+ </top>
+ <center>
+ <GridPane BorderPane.alignment="CENTER">
+ <columnConstraints>
+ <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+ <ColumnConstraints hgrow="SOMETIMES" 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>
+ <children>
+ <Label text="nimi:">
+ <GridPane.margin>
+ <Insets left="10.0" />
+ </GridPane.margin>
+ </Label>
+ <Label text="tavaran_id:" GridPane.rowIndex="1">
+ <GridPane.margin>
+ <Insets left="10.0" />
+ </GridPane.margin>
+ </Label>
+ <Label text="tavaran_lokaatio:" GridPane.rowIndex="2">
+ <GridPane.margin>
+ <Insets left="10.0" />
+ </GridPane.margin>
+ </Label>
+ <Label text="paikallaan:" GridPane.rowIndex="3">
+ <GridPane.margin>
+ <Insets left="10.0" />
+ </GridPane.margin>
+ </Label>
+ <Label text="notes:" GridPane.rowIndex="4">
+ <GridPane.margin>
+ <Insets left="10.0" />
+ </GridPane.margin>
+ </Label>
+ <Label text="kuva:" GridPane.rowIndex="5">
+ <GridPane.margin>
+ <Insets left="10.0" />
+ </GridPane.margin>
+ </Label>
+ <Label text="tags:" GridPane.rowIndex="6">
+ <GridPane.margin>
+ <Insets left="10.0" />
+ </GridPane.margin>
+ </Label>
+ <TextField GridPane.columnIndex="1">
+ <GridPane.margin>
+ <Insets right="10.0" />
+ </GridPane.margin>
+ </TextField>
+ <TextField GridPane.columnIndex="1" GridPane.rowIndex="1">
+ <GridPane.margin>
+ <Insets right="10.0" />
+ </GridPane.margin>
+ </TextField>
+ <TextField GridPane.columnIndex="1" GridPane.rowIndex="2">
+ <GridPane.margin>
+ <Insets right="10.0" />
+ </GridPane.margin>
+ </TextField>
+ <TextField GridPane.columnIndex="1" GridPane.rowIndex="3">
+ <GridPane.margin>
+ <Insets right="10.0" />
+ </GridPane.margin>
+ </TextField>
+ <TextField GridPane.columnIndex="1" GridPane.rowIndex="4">
+ <GridPane.margin>
+ <Insets right="10.0" />
+ </GridPane.margin>
+ </TextField>
+ <TextField GridPane.columnIndex="1" GridPane.rowIndex="5">
+ <GridPane.margin>
+ <Insets right="10.0" />
+ </GridPane.margin>
+ </TextField>
+ <TextField GridPane.columnIndex="1" GridPane.rowIndex="6">
+ <GridPane.margin>
+ <Insets right="10.0" />
+ </GridPane.margin>
+ </TextField>
+ </children>
+ </GridPane>
+ </center>
+ <bottom>
+ <HBox prefHeight="50.0" prefWidth="200.0" BorderPane.alignment="CENTER">
+ <children>
+ <Button mnemonicParsing="false" text="Tallenna">
+ <HBox.margin>
+ <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+ </HBox.margin>
+ </Button>
+ <Button mnemonicParsing="false" text="Peruuta">
+ <HBox.margin>
+ <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+ </HBox.margin>
+ </Button>
+ </children>
+ </HBox>
+ </bottom>
+</BorderPane>
diff --git a/tavaranpaikka/src/fxTavaranPaikka/TavaranPaikkaGUIView.fxml b/tavaranpaikka/src/fxTavaranPaikka/TavaranPaikkaGUIView.fxml
index 73e65264999bfc2337282fecd9c23b8fc91f5802..37b9a8531b677b8b8e775e873bcc3632df97c80a 100644
--- a/tavaranpaikka/src/fxTavaranPaikka/TavaranPaikkaGUIView.fxml
+++ b/tavaranpaikka/src/fxTavaranPaikka/TavaranPaikkaGUIView.fxml
@@ -19,8 +19,7 @@
<?import javafx.scene.layout.RowConstraints?>
<?import javafx.scene.layout.VBox?>
-
-<BorderPane xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/21" fx:controller="fxTavaranPaikka.TavaranPaikkaGUIController">
+<BorderPane xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1" fx:controller="fxTavaranPaikka.TavaranPaikkaGUIController">
<top>
<MenuBar BorderPane.alignment="CENTER">
<menus>
@@ -49,9 +48,18 @@
<top>
<VBox prefHeight="200.0" prefWidth="100.0" BorderPane.alignment="CENTER">
<children>
- <Label text="Hakuehto" />
- <ChoiceBox prefWidth="150.0" />
- <TextField text="Nimi" />
+ <Label text="Hakuehto">
+ <padding>
+ <Insets bottom="5.0" left="10.0" right="5.0" top="5.0" />
+ </padding></Label>
+ <ChoiceBox prefWidth="150.0">
+ <VBox.margin>
+ <Insets left="5.0" right="5.0" />
+ </VBox.margin></ChoiceBox>
+ <TextField text="C">
+ <VBox.margin>
+ <Insets left="5.0" right="5.0" />
+ </VBox.margin></TextField>
</children>
</VBox>
</top>
@@ -69,7 +77,7 @@
<GridPane>
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
- <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+ <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="160.0" />
</columnConstraints>
<rowConstraints>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
@@ -81,30 +89,57 @@
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
- <Label text="nimi:" />
- <Label text="tavaran_id:" GridPane.rowIndex="1" />
- <Label text="tavaran_lokaatio:" GridPane.rowIndex="2" />
- <Label text="paikallaan:" GridPane.rowIndex="3" />
- <Label text="notes:" GridPane.rowIndex="4" />
- <Label text="kuva:" GridPane.rowIndex="5" />
- <Label text="tags:" GridPane.rowIndex="6" />
- <TextField GridPane.columnIndex="1" />
- <TextField GridPane.columnIndex="1" GridPane.rowIndex="1" />
- <TextField GridPane.columnIndex="1" GridPane.rowIndex="2" />
- <TextField GridPane.columnIndex="1" GridPane.rowIndex="3" />
- <TextField GridPane.columnIndex="1" GridPane.rowIndex="4" />
- <TextField GridPane.columnIndex="1" GridPane.rowIndex="5" />
- <TextField GridPane.columnIndex="1" GridPane.rowIndex="6" />
+ <Label text="nimi:">
+ <padding>
+ <Insets left="10.0" />
+ </padding></Label>
+ <Label text="tavaran_id:" GridPane.rowIndex="1">
+ <padding>
+ <Insets left="10.0" />
+ </padding></Label>
+ <Label text="tavaran_lokaatio:" GridPane.rowIndex="2">
+ <padding>
+ <Insets left="10.0" />
+ </padding></Label>
+ <Label text="paikallaan:" GridPane.rowIndex="3">
+ <padding>
+ <Insets left="10.0" />
+ </padding></Label>
+ <Label text="notes:" GridPane.rowIndex="4">
+ <padding>
+ <Insets left="10.0" />
+ </padding></Label>
+ <Label text="kuva:" GridPane.rowIndex="5">
+ <padding>
+ <Insets left="10.0" />
+ </padding></Label>
+ <Label text="tags:" GridPane.rowIndex="6">
+ <padding>
+ <Insets left="10.0" />
+ </padding></Label>
+ <TextField text="Creative SW G10" GridPane.columnIndex="1" />
+ <TextField text="ta1" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+ <TextField text="ta2" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+ <TextField text="k" GridPane.columnIndex="1" GridPane.rowIndex="3" />
+ <TextField text="-" GridPane.columnIndex="1" GridPane.rowIndex="4" />
+ <TextField text="-" GridPane.columnIndex="1" GridPane.rowIndex="5" />
+ <TextField text="myytava, korjattava" GridPane.columnIndex="1" GridPane.rowIndex="6" />
</children>
</GridPane>
</content>
</ScrollPane>
</center>
<bottom>
- <HBox prefHeight="100.0" prefWidth="200.0" BorderPane.alignment="CENTER">
+ <HBox prefHeight="50.0" prefWidth="200.0" BorderPane.alignment="CENTER">
<children>
- <Button mnemonicParsing="false" text="Näytä sisältö" />
- <Button mnemonicParsing="false" text="Lisää tag" />
+ <Button mnemonicParsing="false" text="Näytä sisältö">
+ <HBox.margin>
+ <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+ </HBox.margin></Button>
+ <Button mnemonicParsing="false" text="Lisää tag">
+ <HBox.margin>
+ <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+ </HBox.margin></Button>
</children>
</HBox>
</bottom>
diff --git a/tavaranpaikka/src/fxTavaranPaikka/TilanTiedotGUIView.fxml b/tavaranpaikka/src/fxTavaranPaikka/TilanTiedotGUIView.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..a62f1397eea80b3d3a68a45dc3afef2ce7d9596e
--- /dev/null
+++ b/tavaranpaikka/src/fxTavaranPaikka/TilanTiedotGUIView.fxml
@@ -0,0 +1,34 @@
+<?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.layout.BorderPane?>
+<?import javafx.scene.layout.HBox?>
+
+
+<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1">
+ <top>
+ <Label text="Tilan tiedot" BorderPane.alignment="CENTER" />
+ </top>
+ <center>
+ <StringGrid editable="true" rivit="Tilan nimi: | Tilan ID: | Tilan osoite: | Tilan kuvaus: Makuuhuone | ti1 | Elementinpolku | - Varastokoppi | ti2 | Elementinpolku | - Varastokoppi | ti3 | City-Varasto Nekala | Koko: 1,5m^2, pieni kuitenkin... Olohuone | ti4 | Elementinpolku | - " BorderPane.alignment="CENTER" />
+ </center>
+ <bottom>
+ <HBox prefHeight="50.0" prefWidth="200.0" BorderPane.alignment="CENTER">
+ <children>
+ <Button mnemonicParsing="false" text="Tallenna">
+ <HBox.margin>
+ <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+ </HBox.margin>
+ </Button>
+ <Button mnemonicParsing="false" text="Peruuta">
+ <HBox.margin>
+ <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+ </HBox.margin>
+ </Button>
+ </children>
+ </HBox>
+ </bottom>
+</BorderPane>