"Updated SwitchScene. Added expense- and income registers"

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;
 

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();
     }
-
 }

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>