From 9d8996d73e20bdd7106b2ea84cb5e8fab453e49d Mon Sep 17 00:00:00 2001
From: Harry Linrui XU <xulr0820@hotmail.com>
Date: Fri, 24 Mar 2023 10:45:42 +0100
Subject: [PATCH] "Switched income controller. Added id's to buttons"
---
src/main/resources/view/Income.fxml | 35 +++++++++++++----------------
1 file changed, 15 insertions(+), 20 deletions(-)
diff --git a/src/main/resources/view/Income.fxml b/src/main/resources/view/Income.fxml
index 090983df..3414dfcc 100644
--- a/src/main/resources/view/Income.fxml
+++ b/src/main/resources/view/Income.fxml
@@ -19,7 +19,7 @@
<?import javafx.scene.text.Font?>
<?import javafx.scene.text.Text?>
-<AnchorPane xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.SceneController">
+<AnchorPane xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.IncomeController">
<children>
<ImageView fitHeight="400.0" fitWidth="600.0" pickOnBounds="true">
<image>
@@ -33,7 +33,7 @@
<top>
<HBox BorderPane.alignment="CENTER">
<children>
- <Button mnemonicParsing="false" onAction="#switchStartMenu" text="Return ">
+ <Button fx:id="returnBtn" mnemonicParsing="false" onAction="#switchScene" text="Return ">
<opaqueInsets>
<Insets left="100.0" />
</opaqueInsets>
@@ -73,7 +73,7 @@
<children>
<HBox alignment="BOTTOM_LEFT" prefWidth="410.0" spacing="5.0">
<children>
- <Button fx:id="add" alignment="TOP_CENTER" mnemonicParsing="false" onAction="#addIncome" text="Add" textAlignment="CENTER">
+ <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>
@@ -82,7 +82,7 @@
</ImageView>
</graphic>
</Button>
- <Button alignment="TOP_CENTER" mnemonicParsing="false" text="Edit" textAlignment="CENTER">
+ <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>
@@ -91,7 +91,7 @@
</ImageView>
</graphic>
</Button>
- <Button alignment="TOP_CENTER" mnemonicParsing="false" text="Delete" textAlignment="CENTER">
+ <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>
@@ -122,15 +122,10 @@
</VBox>
<HBox prefHeight="100.0" prefWidth="200.0" GridPane.columnSpan="2" GridPane.rowIndex="2">
<children>
- <Button mnemonicParsing="false" onAction="#switchOverview" text="Overview">
- <HBox.margin>
- <Insets right="5.0" />
- </HBox.margin>
- </Button>
- <Button disable="true" mnemonicParsing="false" onAction="#switchIncome" text="Income" />
- <Button mnemonicParsing="false" onAction="#switchExpenses" text="Expenses" />
- <Button disable="true" mnemonicParsing="false" text="Savings" />
- <Button mnemonicParsing="false" onAction="#switchExpenses" text="Next">
+ <Button disable="true" mnemonicParsing="false" text="Income" />
+ <Button fx:id="budgetBtn" mnemonicParsing="false" onAction="#switchScene" text="Budget" />
+ <Button fx:id="expenseBtn" mnemonicParsing="false" onAction="#switchScene" text="Expenses" />
+ <Button mnemonicParsing="false" onAction="#switchScene" text="Next">
<HBox.margin>
<Insets left="170.0" />
</HBox.margin>
@@ -140,13 +135,13 @@
<Insets top="10.0" />
</padding>
</HBox>
- <TableView fx:id="expenseTableView" prefHeight="260.0" prefWidth="485.0" GridPane.columnSpan="2" GridPane.rowIndex="1">
+ <TableView fx:id="incomeTableView" prefHeight="260.0" prefWidth="485.0" GridPane.columnSpan="2" GridPane.rowIndex="1">
<columns>
- <TableColumn fx:id="date" prefWidth="75.0" text="Date" />
- <TableColumn fx:id="amount" prefWidth="75.0" text="Amount" />
- <TableColumn fx:id="category" prefWidth="75.0" text="Category" />
- <TableColumn fx:id="description" prefWidth="75.0" text="Description" />
- <TableColumn fx:id="recurring" prefWidth="75.0" text="Recurring" />
+ <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" />
--
GitLab