From 8eb22873c4a06342b8d6cb1d962a45cabe2885c9 Mon Sep 17 00:00:00 2001
From: Harry Linrui XU <xulr0820@hotmail.com>
Date: Fri, 24 Mar 2023 14:06:50 +0100
Subject: [PATCH] "Updated SwitchScene. Added expense- and income registers"
---
.../demo/controller/BudgetController.java | 1 -
.../demo/controller/MainMenuController.java | 35 +++++++++----------
src/main/resources/view/MainMenu.fxml | 4 +--
3 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/src/main/java/no/ntnu/idatt1002/demo/controller/BudgetController.java b/src/main/java/no/ntnu/idatt1002/demo/controller/BudgetController.java
index 973cce1b..6bb20e42 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/controller/BudgetController.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/controller/BudgetController.java
@@ -29,7 +29,6 @@ public class BudgetController {
private DialogMode dialogMode;
private GeneralBudget general = new GeneralBudget(31, 2000);
-
@FXML
private Button addBudget;
diff --git a/src/main/java/no/ntnu/idatt1002/demo/controller/MainMenuController.java b/src/main/java/no/ntnu/idatt1002/demo/controller/MainMenuController.java
index 55680195..ae9a4db3 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/controller/MainMenuController.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/controller/MainMenuController.java
@@ -12,17 +12,19 @@ import javafx.scene.control.Label;
import javafx.scene.control.ProgressBar;
import javafx.scene.image.ImageView;
import javafx.stage.Stage;
+import no.ntnu.idatt1002.demo.data.Economics.ExpenseRegister;
+import no.ntnu.idatt1002.demo.data.Economics.IncomeRegister;
public class MainMenuController {
@FXML
- private Button addExpenseButton;
+ private Button addExpenseBtn;
@FXML
private Button foodButton;
@FXML
- private Button overviewButton;
+ private Button overviewBtn;
@FXML
private ProgressBar progressbar;
@@ -36,35 +38,32 @@ public class MainMenuController {
@FXML
private Label today;
+ ExpenseRegister expenseRegister;
- //ExpenseRepository expenseRepository;
+ IncomeRegister incomeRegister;
@FXML
public void initialize() {
- progressbar.setProgress(0.5);
- //progressbar.setProgress((ExpenseRepository.getSum())/5000);
- System.out.println(progressbar.getProgress());
+ //expenseRegister = loadData();
+ //incomeRegister = loadData();
+ //progressbar.setProgress(expenseRegister.getTotalSum()/incomeRegister.getTotalSum());
progressMarker.setTranslateX(-275 + progressbar.getProgress());
today.setTranslateX(-275 + progressbar.getProgress());
}
@FXML
- public void switchExpenses(ActionEvent event) throws IOException {
- FXMLLoader loader = new FXMLLoader(SceneController.class.getResource("/view/Expenses.fxml"));
- Parent root = loader.load();
- Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();
- Scene scene = new Scene(root);
- stage.setScene(scene);
- stage.show();
- }
+ public void switchScene(ActionEvent event) throws IOException {
+ //saveDataToFile("Income");
+ FXMLLoader loader = new FXMLLoader();
+ if (event.getSource() == addExpenseBtn) {
+ loader.setLocation(SceneController.class.getResource("/view/Expenses.fxml"));
+ } else if (event.getSource() == overviewBtn) {
+ loader.setLocation(SceneController.class.getResource("/view/Budget.fxml"));
+ }
- @FXML
- public void switchOverview(ActionEvent event) throws IOException {
- FXMLLoader loader = new FXMLLoader(SceneController.class.getResource("/view/Overview.fxml"));
Parent root = loader.load();
Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();
Scene scene = new Scene(root);
stage.setScene(scene);
stage.show();
}
-
}
diff --git a/src/main/resources/view/MainMenu.fxml b/src/main/resources/view/MainMenu.fxml
index 109698ac..69be7964 100644
--- a/src/main/resources/view/MainMenu.fxml
+++ b/src/main/resources/view/MainMenu.fxml
@@ -85,7 +85,7 @@
</ImageView>
</graphic>
</Button>
- <Button fx:id="addExpenseButton" contentDisplay="TOP" mnemonicParsing="false" onAction="#switchExpenses" prefHeight="125.0" prefWidth="125.0" text="Add expense">
+ <Button fx:id="addExpenseBtn" contentDisplay="TOP" mnemonicParsing="false" onAction="#switchScene" prefHeight="125.0" prefWidth="125.0" text="Add expense">
<graphic>
<ImageView fitHeight="79.0" fitWidth="87.0" pickOnBounds="true">
<cursor>
@@ -97,7 +97,7 @@
</ImageView>
</graphic>
</Button>
- <Button fx:id="overviewButton" contentDisplay="TOP" mnemonicParsing="false" onAction="#switchOverview" prefHeight="125.0" prefWidth="125.0" text="Overview">
+ <Button fx:id="overviewBtn" contentDisplay="TOP" mnemonicParsing="false" onAction="#switchScene" prefHeight="125.0" prefWidth="125.0" text="Overview">
<graphic>
<ImageView fitHeight="63.0" fitWidth="87.0" pickOnBounds="true">
<cursor>
--
GitLab