Skip to content
Snippets Groups Projects
Commit dfb73cc5 authored by aichinos's avatar aichinos
Browse files

updates

parent f6338075
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 144 additions and 131 deletions
mmkurssit/src/fxMMKurssit/KurssinlisaysGUIController.java
+ 33
− 36
View file @ dfb73cc5
...@@ -16,40 +16,7 @@ import javafx.scene.control.Alert.AlertType; ...@@ -16,40 +16,7 @@ import javafx.scene.control.Alert.AlertType;
public class KurssinlisaysGUIController implements ModalControllerInterface<String> { 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 @Override
public String getResult() { public String getResult() {
// TODO Auto-generated method stub // TODO Auto-generated method stub
...@@ -73,7 +40,37 @@ public class KurssinlisaysGUIController implements ModalControllerInterface<Stri ...@@ -73,7 +40,37 @@ public class KurssinlisaysGUIController implements ModalControllerInterface<Stri
opeFamilyName.setPromptText(opeS); opeFamilyName.setPromptText(opeS);
String opeE = "Teacher's first name"; 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
mmkurssit/src/fxMMKurssit/LisaaTapaaminenGUIController.java
+ 23
− 22
View file @ dfb73cc5
...@@ -19,22 +19,40 @@ import javafx.scene.control.Alert.AlertType; ...@@ -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? 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 Button buttonAddMeeting;
@FXML private TextArea extraInfo; @FXML private TextArea extraInfo;
@FXML private TextField timeHour;
@FXML private TextField timeMin;
@FXML private TextField kestoMin; @FXML private TextField kestoMin;
@FXML private TextField place; @FXML private TextField place;
@FXML private Label selectedCourse; @FXML private Label selectedCourse;
@FXML private DatePicker selectedDate; @FXML private DatePicker selectedDate;
@FXML private TextField timeHour; //==========================================================================
@FXML private TextField timeMin;
@FXML void addNewMeeting() { @FXML void addNewMeeting() {
...@@ -44,22 +62,5 @@ public class LisaaTapaaminenGUIController implements ModalControllerInterface<St ...@@ -44,22 +62,5 @@ public class LisaaTapaaminenGUIController implements ModalControllerInterface<St
alert.showAndWait(); 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
}
} }
mmkurssit/src/fxMMKurssit/MMKurssitGUIController.java
+ 24
− 20
View file @ dfb73cc5
...@@ -14,8 +14,29 @@ import javafx.scene.control.Button; ...@@ -14,8 +14,29 @@ import javafx.scene.control.Button;
* *
*/ */
public class MMKurssitGUIController implements ModalControllerInterface<String> { 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 * @return false jos painetaan cancel Ohjelman käynistysikkunalla
*/ */
public boolean avaa() { public boolean avaa() {
...@@ -25,7 +46,8 @@ public class MMKurssitGUIController implements ModalControllerInterface<String> ...@@ -25,7 +46,8 @@ public class MMKurssitGUIController implements ModalControllerInterface<String>
return true; return true;
} }
//Attribuutit===================================================================
@FXML private Button buttonAddMeeting; @FXML private Button buttonAddMeeting;
...@@ -65,28 +87,10 @@ public class MMKurssitGUIController implements ModalControllerInterface<String> ...@@ -65,28 +87,10 @@ public class MMKurssitGUIController implements ModalControllerInterface<String>
alert.setTitle("Not yet"); alert.setTitle("Not yet");
alert.setContentText("Not ready yet."); alert.setContentText("Not ready yet.");
alert.showAndWait();*/ alert.showAndWait();*/
ModalController.showModal(TapaaminenTiedotGUIController.class.getResource("fxMMKurssit.TapaaminenTiedotGUIView.fxml"), ModalController.showModal(TapaaminenTiedotGUIController.class.getResource("TapaaminenTiedotGUIView.fxml"),
"Meeting Info", null, ""); "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
}
......
mmkurssit/src/fxMMKurssit/OhjelmankaynistysGUIController.java
+ 1
− 1
View file @ dfb73cc5
...@@ -50,7 +50,7 @@ public class OhjelmankaynistysGUIController implements ModalControllerInterface< ...@@ -50,7 +50,7 @@ public class OhjelmankaynistysGUIController implements ModalControllerInterface<
*/ */
@FXML void addCourse() { @FXML void addCourse() {
ModalController.showModal(KurssinlisaysGUIController.class.getResource("KurssinlisaysGUIView.fxml"), ModalController.showModal(KurssinlisaysGUIController.class.getResource("KurssinlisaysGUIView.fxml"),
"MMKurssi", null, ""); "Missä ja Milloin Kurssi", null, "");
} }
......
mmkurssit/src/fxMMKurssit/TapaaminenTiedotGUIController.java
+ 47
− 37
View file @ dfb73cc5
...@@ -9,6 +9,7 @@ import javafx.scene.control.Alert.AlertType; ...@@ -9,6 +9,7 @@ import javafx.scene.control.Alert.AlertType;
import javafx.scene.control.Button; import javafx.scene.control.Button;
import javafx.scene.control.ButtonBar.ButtonData; import javafx.scene.control.ButtonBar.ButtonData;
import javafx.scene.control.ButtonType; import javafx.scene.control.ButtonType;
import javafx.scene.control.TextField;
/** /**
* @author aichi * @author aichi
...@@ -17,15 +18,40 @@ import javafx.scene.control.ButtonType; ...@@ -17,15 +18,40 @@ import javafx.scene.control.ButtonType;
*/ */
public class TapaaminenTiedotGUIController implements ModalControllerInterface<String> { public class TapaaminenTiedotGUIController implements ModalControllerInterface<String> {
@FXML //Interface's implementation
private Button buttonClose;
@Override
@FXML public String getResult() {
private Button buttonDeleteM; // TODO Auto-generated method stub
return null;
@FXML }
private Button buttonModify;
@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 @FXML
void closeWindow() { void closeWindow() {
// //
...@@ -37,6 +63,18 @@ public class TapaaminenTiedotGUIController implements ModalControllerInterface<S ...@@ -37,6 +63,18 @@ public class TapaaminenTiedotGUIController implements ModalControllerInterface<S
//deleteM(); //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. * Varmista, haluaako oikeasti delete a meeting.
*/ */
...@@ -56,32 +94,4 @@ public class TapaaminenTiedotGUIController implements ModalControllerInterface<S ...@@ -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
mmkurssit/src/fxMMKurssit/TapaaminenTiedotGUIView.fxml
+ 16
− 15
View file @ dfb73cc5
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<?import javafx.geometry.Insets?> <?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?> <?import javafx.scene.control.Button?>
<?import javafx.scene.control.Label?> <?import javafx.scene.control.Label?>
<?import javafx.scene.control.TextField?>
<?import javafx.scene.layout.BorderPane?> <?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.layout.ColumnConstraints?> <?import javafx.scene.layout.ColumnConstraints?>
<?import javafx.scene.layout.GridPane?> <?import javafx.scene.layout.GridPane?>
...@@ -12,7 +13,7 @@ ...@@ -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"> <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> <center>
<GridPane gridLinesVisible="true" prefWidth="300.0" BorderPane.alignment="CENTER"> <GridPane gridLinesVisible="true" prefHeight="265.0" prefWidth="420.0" BorderPane.alignment="CENTER">
<columnConstraints> <columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" maxWidth="133.5" minWidth="10.0" prefWidth="125.0" /> <ColumnConstraints hgrow="SOMETIMES" maxWidth="133.5" minWidth="10.0" prefWidth="125.0" />
<ColumnConstraints hgrow="SOMETIMES" maxWidth="355.5" minWidth="10.0" prefWidth="295.0" /> <ColumnConstraints hgrow="SOMETIMES" maxWidth="355.5" minWidth="10.0" prefWidth="295.0" />
...@@ -83,62 +84,62 @@ ...@@ -83,62 +84,62 @@
<Font size="16.0" /> <Font size="16.0" />
</font> </font>
</Label> </Label>
<Label text="Japani 3" textAlignment="CENTER" GridPane.columnIndex="1"> <TextField fx:id="textCourseName" editable="false" text="Japani 3" GridPane.columnIndex="1">
<font> <font>
<Font size="16.0" /> <Font size="16.0" />
</font> </font>
<GridPane.margin> <GridPane.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" /> <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</GridPane.margin> </GridPane.margin>
</Label> </TextField>
<Label text="Tanaka Paul" GridPane.columnIndex="1" GridPane.rowIndex="1"> <TextField fx:id="textOpeName" editable="false" text="Tanaka Paul" GridPane.columnIndex="1" GridPane.rowIndex="1">
<font> <font>
<Font size="16.0" /> <Font size="16.0" />
</font> </font>
<GridPane.margin> <GridPane.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" /> <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</GridPane.margin> </GridPane.margin>
</Label> </TextField>
<Label text="8.1.2025" GridPane.columnIndex="1" GridPane.rowIndex="2"> <TextField fx:id="textDate" editable="false" text="8.1.2025" GridPane.columnIndex="1" GridPane.rowIndex="2">
<font> <font>
<Font size="16.0" /> <Font size="16.0" />
</font> </font>
<GridPane.margin> <GridPane.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" /> <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</GridPane.margin> </GridPane.margin>
</Label> </TextField>
<Label text="16:00" GridPane.columnIndex="1" GridPane.rowIndex="3"> <TextField fx:id="textAloitusAika" editable="false" text="16:00" GridPane.columnIndex="1" GridPane.rowIndex="3">
<font> <font>
<Font size="16.0" /> <Font size="16.0" />
</font> </font>
<GridPane.margin> <GridPane.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" /> <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</GridPane.margin> </GridPane.margin>
</Label> </TextField>
<Label text="17:30" GridPane.columnIndex="1" GridPane.rowIndex="4"> <TextField fx:id="textLopetusAika" editable="false" text="17:30" GridPane.columnIndex="1" GridPane.rowIndex="4">
<font> <font>
<Font size="16.0" /> <Font size="16.0" />
</font> </font>
<GridPane.margin> <GridPane.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" /> <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</GridPane.margin> </GridPane.margin>
</Label> </TextField>
<Label text="B247 Päätelmä" GridPane.columnIndex="1" GridPane.rowIndex="5"> <TextField fx:id="textPaikka" editable="false" text="B247 Päätelmä" GridPane.columnIndex="1" GridPane.rowIndex="5">
<font> <font>
<Font size="16.0" /> <Font size="16.0" />
</font> </font>
<GridPane.margin> <GridPane.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" /> <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</GridPane.margin> </GridPane.margin>
</Label> </TextField>
<Label text="Opiskellaan verbien passiivimuoto" GridPane.columnIndex="1" GridPane.rowIndex="6"> <TextField fx:id="textOther" editable="false" text="Opiskellaan verbien passiivimuoto" GridPane.columnIndex="1" GridPane.rowIndex="6">
<font> <font>
<Font size="16.0" /> <Font size="16.0" />
</font> </font>
<GridPane.margin> <GridPane.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" /> <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</GridPane.margin> </GridPane.margin>
</Label> </TextField>
</children> </children>
<BorderPane.margin> <BorderPane.margin>
<Insets bottom="15.0" left="15.0" right="15.0" top="15.0" /> <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
......
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