diff --git a/mmkurssit/src/fxMMKurssit/KurssinTiedotGUIController.java b/mmkurssit/src/fxMMKurssit/KurssinTiedotGUIController.java
index 7f819fb4437f363b1aad28c19c93c081621f054a..dd186c296917fd56db15edc1df5b2d7a42b54a2f 100644
--- a/mmkurssit/src/fxMMKurssit/KurssinTiedotGUIController.java
+++ b/mmkurssit/src/fxMMKurssit/KurssinTiedotGUIController.java
@@ -1,15 +1,9 @@
package fxMMKurssit;
-
-import java.util.Optional;
-
-import fi.jyu.mit.fxgui.ModalControllerInterface;
+import fi.jyu.mit.fxgui.Dialogs;
import javafx.fxml.FXML;
-import javafx.scene.control.Alert;
import javafx.scene.control.Button;
-import javafx.scene.control.ButtonType;
-import javafx.scene.control.Alert.AlertType;
-import javafx.scene.control.ButtonBar.ButtonData;
+
/**
* @author aichi
@@ -19,55 +13,31 @@ import javafx.scene.control.ButtonBar.ButtonData;
-public class KurssinTiedotGUIController implements ModalControllerInterface<Button> {
-
-
- @Override
- public Button getResult() {
- // TODO Auto-generated method stub
- return null;
- }
-
-
- @Override
- public void handleShown() {
- // TODO Auto-generated method stub
-
- }
+public class KurssinTiedotGUIController {
- @Override
- public void setDefault(Button oletus) {
- // TODO Auto-generated method stub
- }
//Attribuutit==================================
@FXML private Button buttonClose;
- @FXML private Button buttonDeleteC;
@FXML private Button buttonModifyCI;
//=============================================
-
-
- @FXML void deleteCourse() {
- showWarning();
- //deleteC();
- }
@FXML
void mofidyCourseInfo() {
- //toteutus muuta textfiled muokattavaksi + save button eli uusi ikkuna tarvitaan
+ Dialogs.showMessageDialog("Textfields tulee muokattavaksi + kurssi voi poistaa, ei juuri nyt.");
+ //TODO: textfield muokattavaksi + lisää "delete-button"+"save-button"
}
//=================================================
- /**
+ /*
* Varmista, haluaako oikeasti delete a course.
- */
+
private void showWarning() {
Alert alert = new Alert(AlertType.CONFIRMATION);
alert.setTitle("Confirmation");
@@ -82,7 +52,7 @@ public class KurssinTiedotGUIController implements ModalControllerInterface<Butt
Optional<ButtonType> result = alert.showAndWait();
if ( result.get() == buttonTypeYes ) System.out.println("The course and meetings have been deleted.");
- }
+ }*/
}
diff --git a/mmkurssit/src/fxMMKurssit/KurssinTiedotGUIView.fxml b/mmkurssit/src/fxMMKurssit/KurssinTiedotGUIView.fxml
index 59ced151ab22224b4ead27498a57f67e9dbc0d9a..66cad192f4a518571dc5b0aa2a9963fd30fc4cc6 100644
--- a/mmkurssit/src/fxMMKurssit/KurssinTiedotGUIView.fxml
+++ b/mmkurssit/src/fxMMKurssit/KurssinTiedotGUIView.fxml
@@ -11,12 +11,11 @@
<?import javafx.scene.layout.RowConstraints?>
<?import javafx.scene.text.Font?>
-
-<BorderPane xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/23.0.1" fx:controller="fxMMKurssit.KurssinTiedotGUIController">
+<BorderPane xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="fxMMKurssit.KurssinTiedotGUIController">
<top>
<Label text="Course Info" BorderPane.alignment="BOTTOM_LEFT">
<font>
- <Font name="System Bold Italic" size="28.0" />
+ <Font name="System Bold Italic" size="20.0" />
</font>
<BorderPane.margin>
<Insets left="10.0" right="10.0" top="10.0" />
@@ -27,7 +26,7 @@
</Label>
</top>
<center>
- <GridPane prefWidth="300.0" BorderPane.alignment="CENTER">
+ <GridPane gridLinesVisible="true" prefWidth="300.0" BorderPane.alignment="CENTER">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
@@ -76,10 +75,9 @@
</GridPane>
</center>
<bottom>
- <HBox alignment="CENTER" spacing="30.0" BorderPane.alignment="CENTER">
+ <HBox alignment="CENTER" spacing="50.0" BorderPane.alignment="CENTER">
<children>
<Button fx:id="buttonModifyCI" mnemonicParsing="false" onAction="#mofidyCourseInfo" text="Modify" />
- <Button fx:id="buttonDeleteC" mnemonicParsing="false" onAction="#deleteCourse" text="Delete" />
<Button fx:id="buttonClose" cancelButton="true" mnemonicParsing="false" text="Close" />
</children>
<BorderPane.margin>
diff --git a/mmkurssit/src/fxMMKurssit/LisaaTapaaminenGUIView.fxml b/mmkurssit/src/fxMMKurssit/LisaaTapaaminenGUIView.fxml
index 97e9d94ec8b8aad7251d1d8f25476f7b7d0c8c25..edcfa49331b81c9ac3eca97c480b1feeed1850dc 100644
--- a/mmkurssit/src/fxMMKurssit/LisaaTapaaminenGUIView.fxml
+++ b/mmkurssit/src/fxMMKurssit/LisaaTapaaminenGUIView.fxml
@@ -13,8 +13,7 @@
<?import javafx.scene.layout.RowConstraints?>
<?import javafx.scene.text.Font?>
-
-<BorderPane xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/23.0.1" fx:controller="fxMMKurssit.LisaaTapaaminenGUIController">
+<BorderPane prefWidth="400.0" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="fxMMKurssit.LisaaTapaaminenGUIController">
<top>
<Label fx:id="selectedCourse" text="Academic writing" BorderPane.alignment="TOP_LEFT">
<font>
@@ -26,10 +25,10 @@
</Label>
</top>
<center>
- <GridPane BorderPane.alignment="CENTER">
+ <GridPane gridLinesVisible="true" BorderPane.alignment="CENTER">
<columnConstraints>
- <ColumnConstraints hgrow="SOMETIMES" maxWidth="95.5" minWidth="10.0" prefWidth="72.5" />
- <ColumnConstraints hgrow="SOMETIMES" maxWidth="131.0" minWidth="10.0" prefWidth="127.5" />
+ <ColumnConstraints hgrow="SOMETIMES" maxWidth="218.0" minWidth="10.0" prefWidth="167.0" />
+ <ColumnConstraints hgrow="SOMETIMES" maxWidth="207.5" minWidth="8.5" prefWidth="182.0" />
</columnConstraints>
<rowConstraints>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
@@ -87,7 +86,7 @@
</TextField>
</children>
</HBox>
- <Label text="Duration" GridPane.rowIndex="3">
+ <Label contentDisplay="CENTER" text="Duration" GridPane.rowIndex="3">
<font>
<Font size="15.0" />
</font>
diff --git a/mmkurssit/src/fxMMKurssit/MMKurssitGUIController.java b/mmkurssit/src/fxMMKurssit/MMKurssitGUIController.java
index 23813305f5b33780e2ed380d08ff668ba74ba705..46364b99f6d821a5dcc83c454b4b28010571afde 100644
--- a/mmkurssit/src/fxMMKurssit/MMKurssitGUIController.java
+++ b/mmkurssit/src/fxMMKurssit/MMKurssitGUIController.java
@@ -1,20 +1,11 @@
package fxMMKurssit;
-import java.net.URL;
-import java.util.ResourceBundle;
-
-import javax.swing.JFrame;
-
import fi.jyu.mit.fxgui.ModalController;
-import fi.jyu.mit.fxgui.ModalControllerInterface;
//import javafx.event.ActionEvent;
import javafx.fxml.FXML;
import javafx.fxml.FXMLLoader;
-import javafx.fxml.Initializable;
import javafx.scene.Parent;
import javafx.scene.Scene;
-import javafx.scene.control.Alert;
-import javafx.scene.control.Alert.AlertType;
import javafx.scene.control.Button;
import javafx.stage.Stage;
@@ -52,14 +43,9 @@ public class MMKurssitGUIController {
@FXML void addMeeting() {
- Alert alert = new Alert(AlertType.INFORMATION);
- alert.setTitle("Not yet");
- alert.setContentText("Not ready yet.");
- alert.showAndWait();
-
- //ModalController.showModal(LisaaTapaaminenGUIController.class.getResource("LisaaTapaaminenGUIView.fxml"),
- // "Add a new meeting", null, "");
- }
+ ModalController.showModal(KurssinlisaysGUIController.class.getResource("LisaaTapaaminenGUIView.fxml"),
+ "Missä ja Milloin Kurssi", null, "");
+ }
@FXML void closeProgram() {
//
@@ -85,6 +71,7 @@ public class MMKurssitGUIController {
}
+ //TapaaminenTiedot jotain outo? Ei toimi sen takia, että renamed afterwards?
@FXML void openMeetingInfo() {
try {
FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("TapaaminenTiedotGUIView.fxml"));
diff --git a/mmkurssit/src/fxMMKurssit/TapaaminenTiedotGUIController.java b/mmkurssit/src/fxMMKurssit/TapaaminenTiedotGUIController.java
index 09c0bfd16f746b5c126904a7b09010d826a3562e..b5a2becabfbb04a8e8df38e83b3c2d6dd4ddb0f2 100644
--- a/mmkurssit/src/fxMMKurssit/TapaaminenTiedotGUIController.java
+++ b/mmkurssit/src/fxMMKurssit/TapaaminenTiedotGUIController.java
@@ -39,7 +39,7 @@ public class TapaaminenTiedotGUIController implements ModalControllerInterface<S
// Attribuutit ==============================================================================
@FXML private Button buttonClose;
- @FXML private Button buttonDeleteM;
+ //@FXML private Button buttonDeleteM; tulee vasta sen jälkeen, kun käyttäjä klikkaa "modify" sama kuin save
@FXML private Button buttonModify;
@FXML private TextField textAloitusAika;
@@ -61,6 +61,7 @@ public class TapaaminenTiedotGUIController implements ModalControllerInterface<S
void deleteMeeting() {
showWarning();
//deleteM();
+ //Modal-window is better
}
diff --git a/mmkurssit/src/fxMMKurssit/TapaaminenTiedotGUIView.fxml b/mmkurssit/src/fxMMKurssit/TapaaminenTiedotGUIView.fxml
index fc8c6ff114c134b520047a5fbf8f5bd1dfdac4cf..de310a318d25d695bb8a88494a1ede1fabf59ab2 100644
--- a/mmkurssit/src/fxMMKurssit/TapaaminenTiedotGUIView.fxml
+++ b/mmkurssit/src/fxMMKurssit/TapaaminenTiedotGUIView.fxml
@@ -150,16 +150,12 @@
</GridPane>
</center>
<bottom>
- <HBox alignment="BOTTOM_RIGHT" spacing="30.0" BorderPane.alignment="TOP_RIGHT">
+ <HBox alignment="BOTTOM_RIGHT" spacing="60.0" BorderPane.alignment="TOP_RIGHT">
<children>
<Button fx:id="buttonModify" mnemonicParsing="false" onAction="#modifyMeeting" text="Modify">
<font>
<Font size="15.0" />
</font></Button>
- <Button fx:id="buttonDeleteM" mnemonicParsing="false" onAction="#deleteMeeting" text="Delete">
- <font>
- <Font size="15.0" />
- </font></Button>
<Button fx:id="buttonClose" mnemonicParsing="false" onAction="#closeWindow" text="Close">
<font>
<Font size="15.0" />