diff --git a/mmkurssit/src/fxMMKurssit/KurssienListaGUIController.java b/mmkurssit/src/fxMMKurssit/KurssienListaGUIController.java new file mode 100644 index 0000000000000000000000000000000000000000..a6521a802e98699ae002e82a3d646b8f709c060e --- /dev/null +++ b/mmkurssit/src/fxMMKurssit/KurssienListaGUIController.java @@ -0,0 +1,30 @@ +package fxMMKurssit; + +import javafx.fxml.FXML; +import javafx.scene.control.Button; + +/** + * @author aichi + * @version 21.2.2025 + * + */ + +public class KurssienListaGUIController { + + @FXML private Button addMeeting; + @FXML private Button buttonBacktoMain; + @FXML private Button openCourseInfo; + + @FXML void addMeeting() { + // + } + + @FXML void backToMain() { + // + } + + @FXML void openCourseInfo() { + // + } + +} \ No newline at end of file diff --git a/mmkurssit/src/fxMMKurssit/KurssienListaGUIView.fxml b/mmkurssit/src/fxMMKurssit/KurssienListaGUIView.fxml new file mode 100644 index 0000000000000000000000000000000000000000..6b47e6db7d82e3f0b36b99303244a6d90a94f262 --- /dev/null +++ b/mmkurssit/src/fxMMKurssit/KurssienListaGUIView.fxml @@ -0,0 +1,57 @@ +<?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.Label?> +<?import javafx.scene.control.TextField?> +<?import javafx.scene.layout.BorderPane?> +<?import javafx.scene.layout.HBox?> +<?import javafx.scene.layout.VBox?> +<?import javafx.scene.text.Font?> + + +<BorderPane prefWidth="400.0" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/23.0.1" fx:controller="fxMMKurssit.KurssienListaGUIController"> + <top> + <Label text="Find a course" BorderPane.alignment="BOTTOM_LEFT"> + <font> + <Font name="System Bold" size="18.0" /> + </font> + </Label> + </top> + <center> + <VBox prefHeight="200.0" prefWidth="100.0" BorderPane.alignment="CENTER"> + <children> + <HBox prefHeight="100.0" prefWidth="200.0"> + <children> + <TextField promptText="Put a keyword" /> + <ComboBoxChooser rivit="Teacher's family name Teacher's first name Course's name" /> + </children> + </HBox> + <ListChooser rivit="(Alphabetical order) (whether based on teacher's name or course's name) Literature English Linguistics Math Valmisteleva kurssi A " /> + </children> + </VBox> + </center> + <right> + <Button fx:id="openCourseInfo" mnemonicParsing="false" onAction="#openCourseInfo" text="Open Course info" BorderPane.alignment="TOP_CENTER"> + <BorderPane.margin> + <Insets bottom="5.0" left="5.0" right="5.0" top="25.0" /> + </BorderPane.margin> + </Button> + </right> + <bottom> + <HBox spacing="200.0" BorderPane.alignment="CENTER"> + <children> + <Button fx:id="addMeeting" mnemonicParsing="false" onAction="#addMeeting" text="Add new course" /> + <Button fx:id="buttonBacktoMain" mnemonicParsing="false" onAction="#backToMain" text="Close" /> + </children> + <BorderPane.margin> + <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" /> + </BorderPane.margin> + </HBox> + </bottom> + <padding> + <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" /> + </padding> +</BorderPane> diff --git a/mmkurssit/src/fxMMKurssit/KurssienListaMain.java b/mmkurssit/src/fxMMKurssit/KurssienListaMain.java new file mode 100644 index 0000000000000000000000000000000000000000..1f423227a8fee1ee754e1815fadfc9bfa76353df --- /dev/null +++ b/mmkurssit/src/fxMMKurssit/KurssienListaMain.java @@ -0,0 +1,38 @@ +package fxMMKurssit; + +import javafx.application.Application; +import javafx.stage.Stage; +import javafx.scene.Scene; +import javafx.scene.layout.Pane; +import javafx.fxml.FXMLLoader; + + +/** + * @author aichi + * @version 21.2.2025 + * + */ +public class KurssienListaMain extends Application { + @Override + public void start(Stage primaryStage) { + try { + FXMLLoader ldr = new FXMLLoader(getClass().getResource("KurssienListaGUIView.fxml")); + final Pane root = ldr.load(); + //final KurssienListaGUIController kurssienlistaCtrl = (KurssienListaGUIController) ldr.getController(); + Scene scene = new Scene(root); + scene.getStylesheets().add(getClass().getResource("kurssienlista.css").toExternalForm()); + primaryStage.setScene(scene); + primaryStage.setTitle("kurssienLista"); + primaryStage.show(); + } catch(Exception e) { + e.printStackTrace(); + } + } + + /** + * @param args Ei kaytossa + */ + public static void main(String[] args) { + launch(args); + } +} \ No newline at end of file diff --git a/mmkurssit/src/fxMMKurssit/MMKurssitGUIController.java b/mmkurssit/src/fxMMKurssit/MMKurssitGUIController.java index a8e19757625c0e4e8e6f087e734aa85ae5badcd5..4a661d6519e3e5d5c76ac5050bc3677d5da178c8 100644 --- a/mmkurssit/src/fxMMKurssit/MMKurssitGUIController.java +++ b/mmkurssit/src/fxMMKurssit/MMKurssitGUIController.java @@ -20,7 +20,6 @@ import javafx.stage.Stage; * @author aichi * @version 5.2.2025 * - *HUOM!! vaihe5:n alussa muista laittaa Git:n branch! */ public class MMKurssitGUIController { @@ -106,6 +105,11 @@ public class MMKurssitGUIController { } + @FXML + void refreshWindow() { + // + } + @FXML void closeProgram() { Platform.exit(); } diff --git a/mmkurssit/src/fxMMKurssit/MMKurssitGUIView.fxml b/mmkurssit/src/fxMMKurssit/MMKurssitGUIView.fxml index 314be13d9ca0b5be003fd2686f3469cacada7ff0..4f66315c32e8455468a8cf2d48ee3b36c339e0ac 100644 --- a/mmkurssit/src/fxMMKurssit/MMKurssitGUIView.fxml +++ b/mmkurssit/src/fxMMKurssit/MMKurssitGUIView.fxml @@ -22,6 +22,11 @@ <menus> <Menu mnemonicParsing="false" text="Edit"> <items> + <MenuItem mnemonicParsing="false" onAction="#refreshWindow" text="Refresh"> + <accelerator> + <KeyCodeCombination alt="UP" code="F5" control="DOWN" meta="UP" shift="UP" shortcut="UP" /> + </accelerator> + </MenuItem> <MenuItem fx:id="menuAddCourse" mnemonicParsing="false" onAction="#addCourse" text="Add new course"> <accelerator> <KeyCodeCombination alt="UP" code="C" control="DOWN" meta="UP" shift="UP" shortcut="UP" /> diff --git a/mmkurssit/src/fxMMKurssit/MMKurssitMain.java b/mmkurssit/src/fxMMKurssit/MMKurssitMain.java index 1871a22104d86bc483b0a7e06ef7e92b398e3561..55bd3e065ee2e0ddbee07c44633ce39b00c3dd34 100644 --- a/mmkurssit/src/fxMMKurssit/MMKurssitMain.java +++ b/mmkurssit/src/fxMMKurssit/MMKurssitMain.java @@ -12,6 +12,14 @@ import javafx.fxml.FXMLLoader; * @author aichinos * @version 5.2.2025 * + * + * HUOM!! vaihe5:n alussa muista laittaa Git:n branch! + * + * Puuttuu + * - tamaapisen tietojen sivun modify-button jälkeen tuleva näkymä, jossa on sekä save- että delete-button. + * - sama kurssin tietojen sivun modify-button jälkeen tuleva näkymä + * Onko mahdollista, että ne kaksi napit ovat jo paikoillaan mutta ennen käyttäjä painaa "modify" niin ne ovat invisible? + * Eli painamalla modify-nappia, kahden nappien näkövyys asetukset ja texstikentän muokkaaminen avaaminen */ diff --git a/mmkurssit/src/fxMMKurssit/kurssienlista.css b/mmkurssit/src/fxMMKurssit/kurssienlista.css new file mode 100644 index 0000000000000000000000000000000000000000..83d6f3343843c65d5dfaf3fedb97b6494c19113d --- /dev/null +++ b/mmkurssit/src/fxMMKurssit/kurssienlista.css @@ -0,0 +1 @@ +/* JavaFX CSS - Leave this comment until you have at least create one rule which uses -fx-Property */ \ No newline at end of file