From 14962172f93ed9615411c4fdb209cae235902370 Mon Sep 17 00:00:00 2001 From: Jonas Hinterdorfer Date: Tue, 13 May 2025 12:23:46 +0200 Subject: [PATCH] implemented the go back --- .../controller/AnswerTextController.java | 10 ++++++++++ .../questioncatalog/controller/TestController.java | 9 +++++++++ .../questioncatalog/controller/UploadController.java | 8 ++++++++ .../questioncatalog/controller/ViewController.java | 10 ++++++++++ .../at/ionas999/questioncatalog/answerText.fxml | 3 +++ .../resources/at/ionas999/questioncatalog/test.fxml | 2 ++ .../resources/at/ionas999/questioncatalog/upload.fxml | 5 +++++ .../resources/at/ionas999/questioncatalog/view.fxml | 6 +++++- 8 files changed, 52 insertions(+), 1 deletion(-) diff --git a/src/main/java/at/ionas999/questioncatalog/controller/AnswerTextController.java b/src/main/java/at/ionas999/questioncatalog/controller/AnswerTextController.java index e26ac21..20d64f3 100644 --- a/src/main/java/at/ionas999/questioncatalog/controller/AnswerTextController.java +++ b/src/main/java/at/ionas999/questioncatalog/controller/AnswerTextController.java @@ -1,14 +1,18 @@ package at.ionas999.questioncatalog.controller; +import at.ionas999.questioncatalog.Utils; import at.ionas999.questioncatalog.model.Question; import at.ionas999.questioncatalog.model.QuestionCatalog; import at.ionas999.questioncatalog.services.QuestionCatalogService; import at.ionas999.questioncatalog.services.QuestionService; import javafx.collections.FXCollections; import javafx.collections.ObservableList; +import javafx.event.ActionEvent; import javafx.fxml.FXML; import javafx.scene.control.*; +import javafx.stage.Stage; +import java.io.IOException; import java.sql.SQLException; import java.util.List; @@ -83,4 +87,10 @@ public class AnswerTextController { private void onIncorrectBtnClick() { showNextQuestion(); } + + @FXML + private void onBackToMainPageClick(ActionEvent actionEvent) throws IOException { + Stage stage = Utils.getStageFromActionEven(actionEvent); + Utils.switchScenes("main.fxml", stage); + } } \ No newline at end of file diff --git a/src/main/java/at/ionas999/questioncatalog/controller/TestController.java b/src/main/java/at/ionas999/questioncatalog/controller/TestController.java index 20b2ba2..f025d84 100644 --- a/src/main/java/at/ionas999/questioncatalog/controller/TestController.java +++ b/src/main/java/at/ionas999/questioncatalog/controller/TestController.java @@ -13,8 +13,10 @@ import javafx.collections.ObservableList; import javafx.event.ActionEvent; import javafx.fxml.FXML; import javafx.scene.control.*; +import javafx.stage.Stage; import javafx.util.converter.NumberStringConverter; +import java.io.IOException; import java.lang.reflect.Array; import java.sql.SQLException; import java.util.ArrayList; @@ -151,4 +153,11 @@ public class TestController { { this.userAnswerArea.setText("Correct: %d \nIncorrect: %d\n".formatted(correctCount, inCorrectCount)); } + + @FXML + private void onBackToMainPageClick(ActionEvent actionEvent) throws IOException { + Stage stage = Utils.getStageFromActionEven(actionEvent); + Utils.switchScenes("main.fxml", stage); + + } } diff --git a/src/main/java/at/ionas999/questioncatalog/controller/UploadController.java b/src/main/java/at/ionas999/questioncatalog/controller/UploadController.java index 52490a9..363e5b4 100644 --- a/src/main/java/at/ionas999/questioncatalog/controller/UploadController.java +++ b/src/main/java/at/ionas999/questioncatalog/controller/UploadController.java @@ -10,7 +10,9 @@ import javafx.collections.ObservableList; import javafx.event.ActionEvent; import javafx.fxml.FXML; import javafx.scene.control.*; +import javafx.stage.Stage; +import java.io.IOException; import java.sql.SQLException; public class UploadController { @@ -61,4 +63,10 @@ public class UploadController { } csvContentArea.clear(); } + + @FXML + private void onBackToMainPageClick(ActionEvent actionEvent) throws IOException { + Stage stage = Utils.getStageFromActionEven(actionEvent); + Utils.switchScenes("main.fxml", stage); + } } \ No newline at end of file diff --git a/src/main/java/at/ionas999/questioncatalog/controller/ViewController.java b/src/main/java/at/ionas999/questioncatalog/controller/ViewController.java index 4c735cb..5bcec19 100644 --- a/src/main/java/at/ionas999/questioncatalog/controller/ViewController.java +++ b/src/main/java/at/ionas999/questioncatalog/controller/ViewController.java @@ -1,5 +1,6 @@ package at.ionas999.questioncatalog.controller; +import at.ionas999.questioncatalog.Utils; import at.ionas999.questioncatalog.model.Question; import at.ionas999.questioncatalog.model.QuestionCatalog; import at.ionas999.questioncatalog.services.QuestionCatalogService; @@ -12,9 +13,12 @@ import javafx.beans.property.SimpleObjectProperty; import javafx.collections.FXCollections; import javafx.collections.ObservableList; import javafx.collections.transformation.FilteredList; +import javafx.event.ActionEvent; import javafx.fxml.FXML; import javafx.scene.control.*; +import javafx.stage.Stage; +import java.io.IOException; import java.sql.SQLException; import static at.ionas999.questioncatalog.Utils.showConfirmationButton; @@ -96,4 +100,10 @@ public class ViewController { isInEditState.set(true); } } + + @FXML + private void onBackToMainPageClick(ActionEvent actionEvent) throws IOException { + Stage stage = Utils.getStageFromActionEven(actionEvent); + Utils.switchScenes("main.fxml", stage); + } } diff --git a/src/main/resources/at/ionas999/questioncatalog/answerText.fxml b/src/main/resources/at/ionas999/questioncatalog/answerText.fxml index 98b89f8..d5d07e1 100644 --- a/src/main/resources/at/ionas999/questioncatalog/answerText.fxml +++ b/src/main/resources/at/ionas999/questioncatalog/answerText.fxml @@ -32,5 +32,8 @@ + +