Skip to content
Snippets Groups Projects
Commit 6cd9fe22 authored by Koivisto Ida Maria Hannuntytär's avatar Koivisto Ida Maria Hannuntytär
Browse files

toimivampi

parent 74e20192
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 391 additions and 0 deletions
.classpath 0 → 100644
+ 13
− 0
View file @ 6cd9fe22
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.fx.ide.jdt.core.JAVAFX_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/ohj2"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="output" path="bin"/>
</classpath>
.project 0 → 100644
+ 23
− 0
View file @ 6cd9fe22
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>ht</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
build.fxbuild 0 → 100644
+ 8
− 0
View file @ 6cd9fe22
<?xml version="1.0" encoding="ASCII"?>
<anttasks:AntTask xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:anttasks="http://org.eclipse.fx.ide.jdt/1.0" buildDirectory="${project}/build">
<deploy>
<application name="ht"/>
<info/>
</deploy>
<signjar/>
</anttasks:AntTask>
src/rekisteri/RalliGUIController.java 0 → 100644
+ 44
− 0
View file @ 6cd9fe22
package rekisteri;
import java.net.URL;
import java.util.ResourceBundle;
import fi.jyu.mit.fxgui.Dialogs;
import javafx.application.Application.Parameters;
import javafx.fxml.FXML;
import javafx.fxml.Initializable;
/**
* @author idamk
* @version 16.2.2023
*
*/
public class RalliGUIController implements Initializable {
@FXML void handleHae() {
hae();
}
@FXML void handleTarkasteluun() {
Dialogs.showMessageDialog("Tässä siirryttäisiin suoraan hakuun, ei toimi vielä");
}
@FXML void handleUusi() {
Dialogs.showMessageDialog("Tästä päästäisiin lisäämään uusia tietoja, ei toimi vielä");
}
private void hae() {
Dialogs.showMessageDialog("Tästä avautuisi haku, ei toimi vielä");
}
@Override
public void initialize(URL location, ResourceBundle resources) {
hae();
}
//TODO
}
\ No newline at end of file
src/rekisteri/RalliGUIView.fxml 0 → 100644
+ 69
− 0
View file @ 6cd9fe22
<?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.Menu?>
<?import javafx.scene.control.MenuBar?>
<?import javafx.scene.control.MenuItem?>
<?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.text.Font?>
<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="rekisteri.RalliGUIController">
<top>
<MenuBar BorderPane.alignment="CENTER">
<menus>
<Menu mnemonicParsing="false" text="File">
<items>
<MenuItem mnemonicParsing="false" text="Close" />
</items>
</Menu>
<Menu mnemonicParsing="false" text="Edit">
<items>
<MenuItem mnemonicParsing="false" text="Delete" />
</items>
</Menu>
<Menu mnemonicParsing="false" text="Help">
<items>
<MenuItem mnemonicParsing="false" text="About" />
</items>
</Menu>
</menus>
</MenuBar>
</top>
<center>
<Label text="Rallirekisteri" BorderPane.alignment="CENTER_LEFT">
<font>
<Font size="55.0" />
</font>
</Label>
</center>
<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 mnemonicParsing="false" onAction="#handleUusi" text="Lisää Uusi" />
<Button mnemonicParsing="false" onAction="#handleHae" text="Hae">
<HBox.margin>
<Insets />
</HBox.margin>
</Button>
</children>
</HBox>
</bottom>
<left>
<BorderPane prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER">
<top>
<Button mnemonicParsing="false" onAction="#handleTarkasteluun" text="Tarkasteluun" BorderPane.alignment="TOP_LEFT">
<BorderPane.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</BorderPane.margin>
</Button>
</top>
</BorderPane>
</left>
</BorderPane>
src/rekisteri/RalliMain.java 0 → 100644
+ 47
− 0
View file @ 6cd9fe22
package rekisteri;
import javafx.application.Application;
import javafx.stage.Stage;
import javafx.scene.Scene;
import javafx.scene.layout.BorderPane;
import javafx.scene.layout.Pane;
import javafx.fxml.FXMLLoader;
/**
* @author idamk
* @version 16.2.2023
*
*/
public class RalliMain extends Application {
@Override
public void start(Stage primaryStage) {
try {
BorderPane root = (BorderPane)FXMLLoader.load(getClass().getResource("RalliGUIView.fxml"));
//FXMLLoader ldr = new FXMLLoader(getClass().getResource("RalliGUIView.fxml"));
//final Pane root = ldr.load();
//final RalliGUIController ralliCtrl = (RalliGUIController) ldr.getController();
Scene scene = new Scene(root);
scene.getStylesheets().add(getClass().getResource("ralli.css").toExternalForm());
primaryStage.setScene(scene);
primaryStage.setTitle("Ralli");
primaryStage.show();
//ralliCtrl.jotain(getParameters()); ///KORJAA
} catch(Exception e) {
e.printStackTrace();
}
}
/**
* @param args Ei kaytossa
*/
public static void main(String[] args) {
launch(args);
}
}
\ No newline at end of file
src/rekisteri/aloitusikkuna.fxml 0 → 100644
+ 46
− 0
View file @ 6cd9fe22
<?xml version="1.0" encoding="UTF-8"?>
<?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.TextField?>
<?import javafx.scene.layout.Pane?>
<?import javafx.scene.text.Font?>
<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1">
<children>
<MenuBar layoutY="2.0" prefHeight="26.0" prefWidth="600.0">
<menus>
<Menu mnemonicParsing="false" text="File">
<items>
<MenuItem mnemonicParsing="false" text="Close" />
</items>
</Menu>
<Menu mnemonicParsing="false" text="Edit">
<items>
<MenuItem mnemonicParsing="false" text="Delete" />
</items>
</Menu>
<Menu mnemonicParsing="false" text="Help">
<items>
<MenuItem mnemonicParsing="false" text="About" />
</items>
</Menu>
</menus>
</MenuBar>
<Button layoutX="15.0" layoutY="37.0" mnemonicParsing="false" onAction="#handleAvaaSuora" text="Suoraan hakuun" />
<Button layoutX="549.0" layoutY="361.0" mnemonicParsing="false" onAction="#handleHae" text="Hae" />
<Button layoutX="14.0" layoutY="361.0" mnemonicParsing="false" onAction="#handleSuljeOhjelma" text="Poistu" />
<Label layoutX="172.0" layoutY="165.0" text="Rallirekisteri">
<font>
<Font size="48.0" />
</font>
</Label>
<Label layoutX="214.0" layoutY="293.0" text="Hae henkilöitä" />
<TextField fx:id="henkilohaku" layoutX="300.0" layoutY="289.0" onAction="#haeHenkilo" prefHeight="25.0" prefWidth="287.0" />
<TextField fx:id="ralliHaku" layoutX="300.0" layoutY="324.0" onAction="#haeRalli" prefHeight="25.0" prefWidth="287.0" />
<Label layoutX="234.0" layoutY="328.0" text="Hae ralleja" />
</children>
</Pane>
src/rekisteri/eihakutuloskia.fxml 0 → 100644
+ 18
− 0
View file @ 6cd9fe22
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.layout.Pane?>
<?import javafx.scene.text.Font?>
<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="200.0" prefWidth="525.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1">
<children>
<Label layoutX="190.0" layoutY="83.0" text="Ei hakutuloksia">
<font>
<Font size="24.0" />
</font>
</Label>
<Button layoutX="460.0" layoutY="161.0" mnemonicParsing="false" onAction="#handleSulje" text="Sulje" />
<Button layoutX="24.0" layoutY="161.0" mnemonicParsing="false" onAction="#handleLisaaUusi" text="Lisää uusi" />
</children>
</Pane>
src/rekisteri/henkhakutulos.fxml 0 → 100644
+ 74
− 0
View file @ 6cd9fe22
<?xml version="1.0" encoding="UTF-8"?>
<?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.layout.Pane?>
<?import javafx.scene.text.Font?>
<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1">
<children>
<MenuBar layoutY="2.0" prefHeight="26.0" prefWidth="600.0">
<menus>
<Menu mnemonicParsing="false" text="File">
<items>
<MenuItem mnemonicParsing="false" text="Close" />
</items>
</Menu>
<Menu mnemonicParsing="false" text="Edit">
<items>
<MenuItem mnemonicParsing="false" text="Delete" />
</items>
</Menu>
<Menu mnemonicParsing="false" text="Help">
<items>
<MenuItem mnemonicParsing="false" text="About" />
</items>
</Menu>
</menus>
</MenuBar>
<Button layoutX="478.0" layoutY="361.0" mnemonicParsing="false" onAction="#handlePoistu" text="Takaisin hakuun" />
<Button layoutX="14.0" layoutY="361.0" mnemonicParsing="false" onAction="#handlePoista" text="Poista" />
<Button layoutX="113.0" layoutY="361.0" mnemonicParsing="false" onAction="#handleMuokkaa" text="Muokkaa tietoja" />
<Label layoutX="14.0" layoutY="35.0" text="Hakutulos: Nimi Sukunimi">
<font>
<Font size="14.0" />
</font>
</Label>
<Label layoutX="14.0" layoutY="79.0" text="Nimi: Nimi Sukunimi" />
<Label layoutX="14.0" layoutY="102.0" text="Syntymäpäivä: 01.01.1999" />
<Label layoutX="14.0" layoutY="142.0" text="Seura: UUA" />
<Label layoutX="187.0" layoutY="102.0" text="Ikä: 24" />
<Label layoutX="465.0" layoutY="79.0" text="KULJETTAJA" />
<Label layoutX="14.0" layoutY="192.0" text="Rallit:">
<font>
<Font size="13.0" />
</font>
</Label>
<Label layoutX="14.0" layoutY="219.0" text="Ralli1" textFill="#2904ff" />
<Label layoutX="14.0" layoutY="248.0" text="Ralli2" textFill="#0400ff" />
<Label layoutX="159.0" layoutY="192.0" text="päivämäärä">
<font>
<Font size="13.0" />
</font>
</Label>
<Label layoutX="159.0" layoutY="219.0" text="10.10.2021" />
<Label layoutX="159.0" layoutY="248.0" text="9.9.2014" />
<Label layoutX="256.0" layoutY="192.0" text="Auto">
<font>
<Font size="13.0" />
</font>
</Label>
<Label layoutX="256.0" layoutY="219.0" text="Toyota Starlett" />
<Label layoutX="256.0" layoutY="248.0" text="Toyota Starlett" />
<Label layoutX="469.0" layoutY="192.0" text="Sijoitus">
<font>
<Font size="13.0" />
</font>
</Label>
<Label layoutX="469.0" layoutY="219.0" text="1." />
<Label layoutX="469.0" layoutY="248.0" text="5." />
</children>
</Pane>
kuvat/README.md → src/rekisteri/kuvat/README.md
+ 0
− 0
View file @ 6cd9fe22
File moved
kuvat/aloitusikkuna.png → src/rekisteri/kuvat/aloitusikkuna.png
+ 0
− 0
View file @ 6cd9fe22
File moved
kuvat/eihakutuloksia.png → src/rekisteri/kuvat/eihakutuloksia.png
+ 0
− 0
View file @ 6cd9fe22
File moved
kuvat/henkhakutulos.png → src/rekisteri/kuvat/henkhakutulos.png
+ 0
− 0
View file @ 6cd9fe22
File moved
kuvat/paaikkuna.png → src/rekisteri/kuvat/paaikkuna.png
+ 0
− 0
View file @ 6cd9fe22
File moved
kuvat/rallihakutulos.png → src/rekisteri/kuvat/rallihakutulos.png
+ 0
− 0
View file @ 6cd9fe22
File moved
kuvat/tarkastele.png → src/rekisteri/kuvat/tarkastele.png
+ 0
− 0
View file @ 6cd9fe22
File moved
kuvat/uusihenk.png → src/rekisteri/kuvat/uusihenk.png
+ 0
− 0
View file @ 6cd9fe22
File moved
kuvat/uusiralli.png → src/rekisteri/kuvat/uusiralli.png
+ 0
− 0
View file @ 6cd9fe22
File moved
src/rekisteri/ralli.css 0 → 100644
+ 1
− 0
View file @ 6cd9fe22
/* JavaFX CSS - Leave this comment until you have at least create one rule which uses -fx-Property */
\ No newline at end of file
src/rekisteri/rallihakutulos.fxml 0 → 100644
+ 48
− 0
View file @ 6cd9fe22
<?xml version="1.0" encoding="UTF-8"?>
<?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.layout.Pane?>
<?import javafx.scene.text.Font?>
<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1">
<children>
<Button layoutX="14.0" layoutY="361.0" mnemonicParsing="false" onAction="#handlePoista" text="Poista" />
<Button layoutX="90.0" layoutY="361.0" mnemonicParsing="false" onAction="#handleMuokkaa" text="Muokkaa tietoja" />
<Button layoutX="477.0" layoutY="361.0" mnemonicParsing="false" onAction="#handlePoistu" text="Takaisin hakuun" />
<Label layoutX="14.0" layoutY="36.0" text="Hakutulos: Ralli1">
<font>
<Font size="14.0" />
</font>
</Label>
<MenuBar layoutY="2.0" prefHeight="26.0" prefWidth="600.0">
<menus>
<Menu mnemonicParsing="false" text="File">
<items>
<MenuItem mnemonicParsing="false" text="Close" />
</items>
</Menu>
<Menu mnemonicParsing="false" text="Edit">
<items>
<MenuItem mnemonicParsing="false" text="Delete" />
</items>
</Menu>
<Menu mnemonicParsing="false" text="Help">
<items>
<MenuItem mnemonicParsing="false" text="About" />
</items>
</Menu>
</menus>
</MenuBar>
<Label layoutX="14.0" layoutY="75.0" text="Nimi: Ralli1" />
<Label layoutX="14.0" layoutY="99.0" text="Paikkakunta: Rallinpaikkakunta" />
<Label layoutX="14.0" layoutY="127.0" text="Päivämäärä: 14.12.2016" />
<Label layoutX="14.0" layoutY="192.0" text="Osallistujalista" textFill="#1a00ff" />
<Label layoutX="14.0" layoutY="224.0" text="Tuloslista" textFill="#1100ff" />
<Label layoutX="14.0" layoutY="253.0" text="Linkki tapahtuman sivuille" textFill="#0011ff" />
<Label layoutX="14.0" layoutY="153.0" text="Järjestäjä: Rallipaikkakunnan rallimartat" />
</children>
</Pane>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment