From dfb73cc5081d5503c7701266809b76e6cbde5cab Mon Sep 17 00:00:00 2001
From: aichinos <aichinos@jyu.fi>
Date: Thu, 20 Feb 2025 20:10:01 +0200
Subject: [PATCH] updates
---
.../KurssinlisaysGUIController.java | 69 ++++++++-------
.../LisaaTapaaminenGUIController.java | 45 +++++-----
.../fxMMKurssit/MMKurssitGUIController.java | 44 +++++-----
.../OhjelmankaynistysGUIController.java | 2 +-
.../TapaaminenTiedotGUIController.java | 84 +++++++++++--------
.../fxMMKurssit/TapaaminenTiedotGUIView.fxml | 31 +++----
6 files changed, 144 insertions(+), 131 deletions(-)
diff --git a/mmkurssit/src/fxMMKurssit/KurssinlisaysGUIController.java b/mmkurssit/src/fxMMKurssit/KurssinlisaysGUIController.java
index 8c504c0..381e1e5 100644
--- a/mmkurssit/src/fxMMKurssit/KurssinlisaysGUIController.java
+++ b/mmkurssit/src/fxMMKurssit/KurssinlisaysGUIController.java
@@ -16,40 +16,7 @@ import javafx.scene.control.Alert.AlertType;
public class KurssinlisaysGUIController implements ModalControllerInterface<String> {
- @FXML
- private Button buttonCancel;
-
- @FXML
- private Button buttonSave;
-
- @FXML
- private TextField courseName;
-
- @FXML
- private TextField opeFamilyName;
-
- @FXML
- private TextField opeLastName;
-
- @FXML
- void closeTheWindow() {
- Platform.exit();
- Alert alert = new Alert(AlertType.INFORMATION);
- alert.setTitle("Not yet");
- alert.setContentText("Not ready yet.");
- alert.showAndWait();
- }
-
-
- @FXML
- void saveCourse() {
- Alert alert = new Alert(AlertType.INFORMATION);
- alert.setTitle("Not yet");
- alert.setContentText("Not ready yet.");
- alert.showAndWait();
- }
-
-
+
@Override
public String getResult() {
// TODO Auto-generated method stub
@@ -73,7 +40,37 @@ public class KurssinlisaysGUIController implements ModalControllerInterface<Stri
opeFamilyName.setPromptText(opeS);
String opeE = "Teacher's first name";
- opeLastName.setPromptText(opeE);
-
+ opeLastName.setPromptText(opeE);
}
+
+
+//Attribuutit============================================================================
+
+ @FXML private Button buttonCancel;
+ @FXML private Button buttonSave;
+
+ @FXML private TextField courseName;
+ @FXML private TextField opeFamilyName;
+ @FXML private TextField opeLastName;
+
+//========================================================================================
+
+
+ @FXML void closeTheWindow() {
+ Platform.exit();
+ Alert alert = new Alert(AlertType.INFORMATION);
+ alert.setTitle("Not yet");
+ alert.setContentText("Not ready yet.");
+ alert.showAndWait();
+ }
+
+
+ @FXML void saveCourse() {
+ Alert alert = new Alert(AlertType.INFORMATION);
+ alert.setTitle("Not yet");
+ alert.setContentText("Not ready yet.");
+ alert.showAndWait();
+ }
+
+
}
\ No newline at end of file
diff --git a/mmkurssit/src/fxMMKurssit/LisaaTapaaminenGUIController.java b/mmkurssit/src/fxMMKurssit/LisaaTapaaminenGUIController.java
index 470d468..49b23a4 100644
--- a/mmkurssit/src/fxMMKurssit/LisaaTapaaminenGUIController.java
+++ b/mmkurssit/src/fxMMKurssit/LisaaTapaaminenGUIController.java
@@ -19,22 +19,40 @@ import javafx.scene.control.Alert.AlertType;
public class LisaaTapaaminenGUIController implements ModalControllerInterface<String> {//ei ole string, mutta mikä tyyppi sopii tähän?
+ @Override
+ public String getResult() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public void handleShown() {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void setDefault(String arg0) {
+ // TODO Auto-generated method stub
+ }
+
+
+//Attribuutit=============================================================
+
@FXML private Button buttonAddMeeting;
@FXML private TextArea extraInfo;
+ @FXML private TextField timeHour;
+ @FXML private TextField timeMin;
@FXML private TextField kestoMin;
-
@FXML private TextField place;
@FXML private Label selectedCourse;
@FXML private DatePicker selectedDate;
- @FXML private TextField timeHour;
-
- @FXML private TextField timeMin;
-
+//==========================================================================
@FXML void addNewMeeting() {
@@ -44,22 +62,5 @@ public class LisaaTapaaminenGUIController implements ModalControllerInterface<St
alert.showAndWait();
}
- @Override
- public String getResult() {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public void handleShown() {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void setDefault(String arg0) {
- // TODO Auto-generated method stub
-
- }
}
diff --git a/mmkurssit/src/fxMMKurssit/MMKurssitGUIController.java b/mmkurssit/src/fxMMKurssit/MMKurssitGUIController.java
index 29e8a73..27a857e 100644
--- a/mmkurssit/src/fxMMKurssit/MMKurssitGUIController.java
+++ b/mmkurssit/src/fxMMKurssit/MMKurssitGUIController.java
@@ -14,8 +14,29 @@ import javafx.scene.control.Button;
*
*/
public class MMKurssitGUIController implements ModalControllerInterface<String> {
+
+
+ @Override
+ public String getResult() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public void handleShown() {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void setDefault(String oletus) {
+ //
+ }
+
+//=============================================================================
/**
+ * Avataan ensin ohjelman käynistysikkuna (ennen avaa pääikkunaa)
* @return false jos painetaan cancel Ohjelman käynistysikkunalla
*/
public boolean avaa() {
@@ -25,7 +46,8 @@ public class MMKurssitGUIController implements ModalControllerInterface<String>
return true;
}
-
+
+//Attribuutit===================================================================
@FXML private Button buttonAddMeeting;
@@ -65,28 +87,10 @@ public class MMKurssitGUIController implements ModalControllerInterface<String>
alert.setTitle("Not yet");
alert.setContentText("Not ready yet.");
alert.showAndWait();*/
- ModalController.showModal(TapaaminenTiedotGUIController.class.getResource("fxMMKurssit.TapaaminenTiedotGUIView.fxml"),
+ ModalController.showModal(TapaaminenTiedotGUIController.class.getResource("TapaaminenTiedotGUIView.fxml"),
"Meeting Info", null, "");
}
- @Override
- public String getResult() {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public void handleShown() {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void setDefault(String oletus) {
- // TODO Auto-generated method stub
-
- }
-
diff --git a/mmkurssit/src/fxMMKurssit/OhjelmankaynistysGUIController.java b/mmkurssit/src/fxMMKurssit/OhjelmankaynistysGUIController.java
index 240ddef..a7ed0af 100644
--- a/mmkurssit/src/fxMMKurssit/OhjelmankaynistysGUIController.java
+++ b/mmkurssit/src/fxMMKurssit/OhjelmankaynistysGUIController.java
@@ -50,7 +50,7 @@ public class OhjelmankaynistysGUIController implements ModalControllerInterface<
*/
@FXML void addCourse() {
ModalController.showModal(KurssinlisaysGUIController.class.getResource("KurssinlisaysGUIView.fxml"),
- "MMKurssi", null, "");
+ "Missä ja Milloin Kurssi", null, "");
}
diff --git a/mmkurssit/src/fxMMKurssit/TapaaminenTiedotGUIController.java b/mmkurssit/src/fxMMKurssit/TapaaminenTiedotGUIController.java
index 44754ec..09c0bfd 100644
--- a/mmkurssit/src/fxMMKurssit/TapaaminenTiedotGUIController.java
+++ b/mmkurssit/src/fxMMKurssit/TapaaminenTiedotGUIController.java
@@ -9,6 +9,7 @@ import javafx.scene.control.Alert.AlertType;
import javafx.scene.control.Button;
import javafx.scene.control.ButtonBar.ButtonData;
import javafx.scene.control.ButtonType;
+import javafx.scene.control.TextField;
/**
* @author aichi
@@ -17,15 +18,40 @@ import javafx.scene.control.ButtonType;
*/
public class TapaaminenTiedotGUIController implements ModalControllerInterface<String> {
- @FXML
- private Button buttonClose;
-
- @FXML
- private Button buttonDeleteM;
-
- @FXML
- private Button buttonModify;
-
+//Interface's implementation
+
+ @Override
+ public String getResult() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public void handleShown() {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void setDefault(String oletus) {
+ //
+ }
+
+// Attribuutit ==============================================================================
+ @FXML private Button buttonClose;
+ @FXML private Button buttonDeleteM;
+ @FXML private Button buttonModify;
+
+ @FXML private TextField textAloitusAika;
+ @FXML private TextField textCourseName;
+ @FXML private TextField textDate;
+ @FXML private TextField textLopetusAika;
+ @FXML private TextField textOpeName;
+ @FXML private TextField textOther;
+ @FXML private TextField textPaikka;
+
+//================================================================================
+
@FXML
void closeWindow() {
//
@@ -37,6 +63,18 @@ public class TapaaminenTiedotGUIController implements ModalControllerInterface<S
//deleteM();
}
+
+ @FXML
+ void modifyMeeting() {
+ Alert alert = new Alert(AlertType.INFORMATION);
+ alert.setTitle("Not yet");
+ alert.setContentText("Not ready yet.");
+ alert.showAndWait();
+ }
+
+
+//====================================================================================
+
/**
* Varmista, haluaako oikeasti delete a meeting.
*/
@@ -56,32 +94,4 @@ public class TapaaminenTiedotGUIController implements ModalControllerInterface<S
}
- @FXML
- void modifyMeeting() {
- Alert alert = new Alert(AlertType.INFORMATION);
- alert.setTitle("Not yet");
- alert.setContentText("Not ready yet.");
- alert.showAndWait();
- }
-
- @Override
- public String getResult() {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public void handleShown() {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void setDefault(String oletus) {
- // TODO Auto-generated method stub
-
- }
-
-
-
}
\ No newline at end of file
diff --git a/mmkurssit/src/fxMMKurssit/TapaaminenTiedotGUIView.fxml b/mmkurssit/src/fxMMKurssit/TapaaminenTiedotGUIView.fxml
index 72a90ab..fc8c6ff 100644
--- a/mmkurssit/src/fxMMKurssit/TapaaminenTiedotGUIView.fxml
+++ b/mmkurssit/src/fxMMKurssit/TapaaminenTiedotGUIView.fxml
@@ -3,6 +3,7 @@
<?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?>
@@ -12,7 +13,7 @@
<BorderPane maxHeight="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="450.0" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="fxMMKurssit.KurssitiedotGUIController">
<center>
- <GridPane gridLinesVisible="true" prefWidth="300.0" BorderPane.alignment="CENTER">
+ <GridPane gridLinesVisible="true" prefHeight="265.0" prefWidth="420.0" BorderPane.alignment="CENTER">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" maxWidth="133.5" minWidth="10.0" prefWidth="125.0" />
<ColumnConstraints hgrow="SOMETIMES" maxWidth="355.5" minWidth="10.0" prefWidth="295.0" />
@@ -83,62 +84,62 @@
<Font size="16.0" />
</font>
</Label>
- <Label text="Japani 3" textAlignment="CENTER" GridPane.columnIndex="1">
+ <TextField fx:id="textCourseName" editable="false" text="Japani 3" GridPane.columnIndex="1">
<font>
<Font size="16.0" />
</font>
<GridPane.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</GridPane.margin>
- </Label>
- <Label text="Tanaka Paul" GridPane.columnIndex="1" GridPane.rowIndex="1">
+ </TextField>
+ <TextField fx:id="textOpeName" editable="false" text="Tanaka Paul" GridPane.columnIndex="1" GridPane.rowIndex="1">
<font>
<Font size="16.0" />
</font>
<GridPane.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</GridPane.margin>
- </Label>
- <Label text="8.1.2025" GridPane.columnIndex="1" GridPane.rowIndex="2">
+ </TextField>
+ <TextField fx:id="textDate" editable="false" text="8.1.2025" GridPane.columnIndex="1" GridPane.rowIndex="2">
<font>
<Font size="16.0" />
</font>
<GridPane.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</GridPane.margin>
- </Label>
- <Label text="16:00" GridPane.columnIndex="1" GridPane.rowIndex="3">
+ </TextField>
+ <TextField fx:id="textAloitusAika" editable="false" text="16:00" GridPane.columnIndex="1" GridPane.rowIndex="3">
<font>
<Font size="16.0" />
</font>
<GridPane.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</GridPane.margin>
- </Label>
- <Label text="17:30" GridPane.columnIndex="1" GridPane.rowIndex="4">
+ </TextField>
+ <TextField fx:id="textLopetusAika" editable="false" text="17:30" GridPane.columnIndex="1" GridPane.rowIndex="4">
<font>
<Font size="16.0" />
</font>
<GridPane.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</GridPane.margin>
- </Label>
- <Label text="B247 Päätelmä" GridPane.columnIndex="1" GridPane.rowIndex="5">
+ </TextField>
+ <TextField fx:id="textPaikka" editable="false" text="B247 Päätelmä" GridPane.columnIndex="1" GridPane.rowIndex="5">
<font>
<Font size="16.0" />
</font>
<GridPane.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</GridPane.margin>
- </Label>
- <Label text="Opiskellaan verbien passiivimuoto" GridPane.columnIndex="1" GridPane.rowIndex="6">
+ </TextField>
+ <TextField fx:id="textOther" editable="false" text="Opiskellaan verbien passiivimuoto" GridPane.columnIndex="1" GridPane.rowIndex="6">
<font>
<Font size="16.0" />
</font>
<GridPane.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</GridPane.margin>
- </Label>
+ </TextField>
</children>
<BorderPane.margin>
<Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
--
GitLab