diff --git a/src/main/java/no/ntnu/idatt1002/demo/controller/IncomeController.java b/src/main/java/no/ntnu/idatt1002/demo/controller/IncomeController.java
index d0daa30b7d310fa582f37c023bb6fa0597113f21..c25c5ebb849641cf227e291b9ab05e3568cc8cb1 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/controller/IncomeController.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/controller/IncomeController.java
@@ -267,9 +267,7 @@ public class IncomeController {
//Always saving the data when switching scenes
saveDataToFile("Income");
FXMLLoader loader = new FXMLLoader();
- if (event.getSource() == expenseBtn) {
- loader.setLocation(SceneController.class.getResource("/view/Expenses.fxml"));
- } else if (event.getSource() == overviewBtn) {
+ if (event.getSource() == overviewBtn) {
loader.setLocation(SceneController.class.getResource("/view/Overview.fxml"));
} else if (event.getSource() == returnBtn) {
loader.setLocation(SceneController.class.getResource("/view/FirstMenu.fxml"));
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 da5b38ef71f9ea025c20ece3f1cc7bcfeaf9e1e2..9a0fe9bca61214305b834ce9d82cee0f098a066c 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/controller/MainMenuController.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/controller/MainMenuController.java
@@ -102,11 +102,8 @@ public class MainMenuController {
@FXML
public void switchScene(ActionEvent event) throws IOException {
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"));
- }
+ loader.setLocation(SceneController.class.getResource("/view/Budget.fxml"));
+
Parent root = loader.load();
Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();
diff --git a/src/main/java/no/ntnu/idatt1002/demo/controller/SceneController.java b/src/main/java/no/ntnu/idatt1002/demo/controller/SceneController.java
index 9d70b03508cdc080c48962db303a8c59cbae45ba..a94b8678d90845c0b2b5eda9b2baa7381d30f8a7 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/controller/SceneController.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/controller/SceneController.java
@@ -41,15 +41,6 @@ public class SceneController {
stage.show();
}
- public void switchExpenses(ActionEvent event) throws IOException {
- FXMLLoader loader = new FXMLLoader(SceneController.class.getResource("/view/Expenses.fxml"));
- Parent root = loader.load();
- stage = (Stage)((Node)event.getSource()).getScene().getWindow();
- scene = new Scene(root);
- stage.setScene(scene);
- stage.show();
- }
-
public void switchOverview(ActionEvent event) throws IOException {
FXMLLoader loader = new FXMLLoader(SceneController.class.getResource("/view/Overview.fxml"));
Parent root = loader.load();
diff --git a/src/main/resources/view/Expenses.fxml b/src/main/resources/view/Expenses.fxml
deleted file mode 100644
index cf71e837d92d1a52ae01e1f3332141df90252485..0000000000000000000000000000000000000000
--- a/src/main/resources/view/Expenses.fxml
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.Cursor?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ComboBox?>
-<?import javafx.scene.control.TableColumn?>
-<?import javafx.scene.control.TableView?>
-<?import javafx.scene.image.Image?>
-<?import javafx.scene.image.ImageView?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.BorderPane?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.Region?>
-<?import javafx.scene.layout.RowConstraints?>
-<?import javafx.scene.layout.StackPane?>
-<?import javafx.scene.layout.VBox?>
-<?import javafx.scene.shape.Rectangle?>
-<?import javafx.scene.text.Font?>
-<?import javafx.scene.text.Text?>
-
-<AnchorPane prefHeight="695.0" prefWidth="1100.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.ExpensesController">
- <children>
- <ImageView fitHeight="695.0" fitWidth="1100.0" pickOnBounds="true">
- <image>
- <Image url="@../Images/backgroundMini.jpg" />
- </image>
- <cursor>
- <Cursor fx:constant="DEFAULT" />
- </cursor>
- </ImageView>
- <BorderPane prefHeight="400.0" prefWidth="600.0">
- <top>
- <HBox BorderPane.alignment="CENTER">
- <children>
- <Button fx:id="returnBtn" mnemonicParsing="false" onAction="#switchScene" text="Return ">
- <opaqueInsets>
- <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
- </opaqueInsets>
- </HBox>
- </center>
- </BorderPane>
- </top>
- <center>
- <GridPane BorderPane.alignment="CENTER">
- <BorderPane.margin>
- <Insets bottom="40.0" left="40.0" right="40.0" />
- </BorderPane.margin>
- <columnConstraints>
- <ColumnConstraints hgrow="ALWAYS" maxWidth="485.3333231608073" minWidth="10.0" prefWidth="427.33335367838544" />
- <ColumnConstraints hgrow="ALWAYS" maxWidth="111.33333333333331" minWidth="10.0" prefWidth="92.66664632161456" />
- </columnConstraints>
- <rowConstraints>
- <RowConstraints maxHeight="65.33334064483643" minHeight="10.0" prefHeight="65.33334064483643" vgrow="SOMETIMES" />
- <RowConstraints maxHeight="298.66665744781494" minHeight="10.0" prefHeight="214.00004069010413" vgrow="SOMETIMES" />
- <RowConstraints maxHeight="298.66665744781494" minHeight="10.0" prefHeight="29.999959309895814" vgrow="SOMETIMES" />
- <RowConstraints maxHeight="298.66665744781494" minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
- </rowConstraints>
- <children>
- <HBox alignment="BOTTOM_LEFT" prefWidth="410.0" spacing="5.0">
- <children>
- <Button fx:id="addBtn" alignment="TOP_CENTER" mnemonicParsing="false" onAction="#handleAddButton" text="Add" textAlignment="CENTER">
- <graphic>
- <ImageView fitHeight="19.0" fitWidth="16.0" pickOnBounds="true" preserveRatio="true">
- <image>
- <Image url="@../Images/add_image.png" />
- </image>
- </ImageView>
- </graphic></Button>
- <Button fx:id="editBtn" alignment="TOP_CENTER" mnemonicParsing="false" onAction="#handleEditButton" text="Edit" textAlignment="CENTER">
- <graphic>
- <ImageView fitHeight="19.0" fitWidth="16.0" pickOnBounds="true" preserveRatio="true">
- <image>
- <Image url="@../Images/edit.png" />
- </image>
- </ImageView>
- </graphic></Button>
- <Button fx:id="deleteBtn" alignment="TOP_CENTER" mnemonicParsing="false" onAction="#handleDeleteBtn" text="Delete" textAlignment="CENTER">
- <graphic>
- <ImageView fitHeight="19.0" fitWidth="16.0" pickOnBounds="true" preserveRatio="true">
- <image>
- <Image url="@../Images/delete.png" />
- </image>
- </ImageView>
- </graphic></Button>
- </children>
- <opaqueInsets>
- <Insets />
- </opaqueInsets>
- <padding>
- <Insets bottom="5.0" />
- </padding>
- </HBox>
- <VBox alignment="BOTTOM_LEFT" prefHeight="200.0" prefWidth="100.0" spacing="5.0" GridPane.columnIndex="1">
- <children>
- <ComboBox fx:id="show" prefWidth="150.0" promptText="Show">
- <opaqueInsets>
- <Insets />
- </opaqueInsets>
- <VBox.margin>
- <Insets bottom="5.0" />
- </VBox.margin>
- </ComboBox>
- </children>
- </VBox>
- <HBox prefHeight="100.0" prefWidth="200.0" GridPane.columnSpan="2" GridPane.rowIndex="3">
- <children>
- <Button fx:id="incomeBtn" mnemonicParsing="false" onAction="#switchScene" text="Income" />
- <Button fx:id="budgetBtn" mnemonicParsing="false" onAction="#switchScene" text="Budget" />
- <Button disable="true" mnemonicParsing="false" text="Expenses" />
- <Button mnemonicParsing="false" onAction="#switchScene" text="Next">
- <HBox.margin>
- <Insets left="170.0" />
- </HBox.margin></Button>
- </children>
- <padding>
- <Insets top="10.0" />
- </padding>
- <GridPane.margin>
- <Insets top="5.0" />
- </GridPane.margin>
- </HBox>
- <TableView fx:id="expenseTableView" prefHeight="260.0" prefWidth="485.0" GridPane.columnSpan="2" GridPane.rowIndex="1">
- <columns>
- <TableColumn fx:id="dateColumn" prefWidth="75.0" text="Date" />
- <TableColumn fx:id="amountColumn" prefWidth="75.0" text="Amount" />
- <TableColumn fx:id="categoryColumn" prefWidth="75.0" text="Category" />
- <TableColumn fx:id="descriptionColumn" prefWidth="75.0" text="Description" />
- <TableColumn fx:id="recurringColumn" prefWidth="75.0" text="Recurring" />
- </columns>
- <columnResizePolicy>
- <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
- </columnResizePolicy>
- </TableView>
- <StackPane GridPane.rowIndex="2">
- <children>
- <Rectangle arcHeight="5.0" arcWidth="5.0" fill="#f8f8f8" height="18.0" stroke="#d9cccc" strokeType="INSIDE" width="209.0" StackPane.alignment="CENTER_LEFT" />
- <HBox prefHeight="18.0" prefWidth="517.0">
- <children>
- <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Sum: ">
- <HBox.margin>
- <Insets left="2.0" />
- </HBox.margin>
- </Text>
- <Region prefHeight="18.0" prefWidth="74.0" />
- <Text fx:id="sum" strokeType="OUTSIDE" strokeWidth="0.0" text="Text" />
- </children>
- </HBox>
- </children>
- </StackPane>
- </children>
- </GridPane>
- </center>
- <opaqueInsets>
- <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
- </opaqueInsets>
- <left>
- <Region prefHeight="330.0" prefWidth="1.0" BorderPane.alignment="CENTER" />
- </left>
- <right>
- <Region prefHeight="357.0" prefWidth="0.0" BorderPane.alignment="CENTER" />
- </right>
- <bottom>
- <Region prefHeight="0.0" prefWidth="600.0" BorderPane.alignment="CENTER" />
- </bottom>
- </BorderPane>
- </children>
- <opaqueInsets>
- <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
- </opaqueInsets>
-</AnchorPane>