From efb491691def2368b50cba26721028dd38c74121 Mon Sep 17 00:00:00 2001
From: Harry Linrui XU <xulr0820@hotmail.com>
Date: Wed, 19 Apr 2023 23:44:29 +0200
Subject: [PATCH] Injected new return button
---
.../demo/controller/IncomeExpenseController.java | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/java/no/ntnu/idatt1002/demo/controller/IncomeExpenseController.java b/src/main/java/no/ntnu/idatt1002/demo/controller/IncomeExpenseController.java
index 5ffc03dc..4b0beeba 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/controller/IncomeExpenseController.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/controller/IncomeExpenseController.java
@@ -105,6 +105,9 @@ public class IncomeExpenseController extends FinanceController {
@FXML
private ComboBox<?> filter;
+ @FXML
+ private Button returnToMainMenuBtn;
+
@FXML
private Button returnBtn;
@@ -487,16 +490,16 @@ public class IncomeExpenseController extends FinanceController {
public void switchScene(javafx.event.ActionEvent event) {
try {
FXMLLoader loader = new FXMLLoader();
- if (event.getSource() == returnBtn) {
+ if (event.getSource() == returnToMainMenuBtn) {
saveDataToFile();
loader.setLocation(getClass().getResource("/view/MainMenuNew.fxml"));
} else if (event.getSource() == continueBtn) {
loader.setLocation(getClass().getResource("/view/newBudgetBudgert.fxml"));
saveDisposableIncomeToFile();
- } else if (event.getSource() == null) {
+ } else if (event.getSource() == returnBtn) {
+ loader.setLocation(getClass().getResource("/view/FirstMenu.fxml"));
FileHandlingBudgetArchive.deleteBudgetDirectory(FileHandlingSelectedBudget.readSelectedBudget());
- //removeBudgetNameFromArchive
- FileHandlingSelectedBudget.updateSelectedBudget("");
+ FileHandlingSelectedBudget.clearSelectedBudget();
}
Parent root = loader.load();
Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();
--
GitLab