diff --git a/src/main/resources/view/DuoInfo.fxml b/src/main/resources/view/dualList.fxml similarity index 85% rename from src/main/resources/view/DuoInfo.fxml rename to src/main/resources/view/dualList.fxml index 7a583661f95fa582946eefa2bfe522e64efef10c..4b464415c3a8294b45b369c53197c4b9d4b0fc6a 100644 --- a/src/main/resources/view/DuoInfo.fxml +++ b/src/main/resources/view/dualList.fxml @@ -22,7 +22,7 @@ <?import javafx.scene.text.Font?> <?import javafx.scene.text.Text?> -<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="500.0" prefWidth="750.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.ExpensesController"> +<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="500.0" prefWidth="750.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.IncomeExpenseController"> <children> <ImageView fitHeight="500.0" fitWidth="750.0" pickOnBounds="true"> <image> @@ -59,11 +59,11 @@ <children> <TableView fx:id="expenseTableView" minWidth="300.0" prefHeight="260.0" prefWidth="485.0"> <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" /> + <TableColumn fx:id="inDateCol" prefWidth="75.0" text="Date" /> + <TableColumn fx:id="inAmountCol" prefWidth="75.0" text="Amount" /> + <TableColumn fx:id="inCategoryCol" prefWidth="75.0" text="Category" /> + <TableColumn fx:id="inDescriptionCol" prefWidth="75.0" text="Description" /> + <TableColumn fx:id="inRecurringCol" prefWidth="75.0" text="Recurring" /> </columns> <columnResizePolicy> <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" /> @@ -77,7 +77,7 @@ <Rectangle arcHeight="5.0" arcWidth="5.0" fill="#f8f8f8" height="18.0" stroke="#d9cccc" strokeType="INSIDE" width="300.0" StackPane.alignment="TOP_LEFT" /> <HBox prefHeight="18.0" prefWidth="517.0"> <children> - <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Sum: "> + <Text fx:id="inSum" strokeType="OUTSIDE" strokeWidth="0.0" text="Sum: "> <HBox.margin> <Insets left="2.0" /> </HBox.margin> @@ -102,11 +102,11 @@ <children> <TableView fx:id="expenseTableView1" minWidth="300.0" prefHeight="260.0" prefWidth="485.0"> <columns> - <TableColumn fx:id="dateColumn1" prefWidth="75.0" text="Date" /> - <TableColumn fx:id="amountColumn1" prefWidth="75.0" text="Amount" /> - <TableColumn fx:id="categoryColumn1" prefWidth="75.0" text="Category" /> - <TableColumn fx:id="descriptionColumn1" prefWidth="75.0" text="Description" /> - <TableColumn fx:id="recurringColumn1" prefWidth="75.0" text="Recurring" /> + <TableColumn fx:id="expDateCol" prefWidth="75.0" text="Date" /> + <TableColumn fx:id="expAmountCol" prefWidth="75.0" text="Amount" /> + <TableColumn fx:id="expCategoryCol" prefWidth="75.0" text="Category" /> + <TableColumn fx:id="expDescriptionCol" prefWidth="75.0" text="Description" /> + <TableColumn fx:id="expRecurringCol" prefWidth="75.0" text="Recurring" /> </columns> <columnResizePolicy> <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" /> @@ -120,7 +120,7 @@ <Rectangle arcHeight="5.0" arcWidth="5.0" fill="#f8f8f8" height="18.0" stroke="#d9cccc" strokeType="INSIDE" width="300.0" StackPane.alignment="TOP_LEFT" /> <HBox prefHeight="18.0" prefWidth="517.0"> <children> - <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Sum: "> + <Text fx:id="expSum" strokeType="OUTSIDE" strokeWidth="0.0" text="Sum: "> <HBox.margin> <Insets left="2.0" /> </HBox.margin> @@ -139,8 +139,8 @@ <children> <MenuButton mnemonicParsing="false" text="MenuButton"> <items> - <MenuItem mnemonicParsing="false" onAction="#addIncome" text="Income" /> - <MenuItem mnemonicParsing="false" onAction="#addExpense" text="Expense" /> + <MenuItem fx:id="addIncome" mnemonicParsing="false" onAction="#handleAddBtn" text="Income" /> + <MenuItem fx:id="addExpense" mnemonicParsing="false" onAction="#handleAddBtn" text="Expense" /> </items> <graphic> <ImageView fitHeight="19.0" fitWidth="16.0" pickOnBounds="true" preserveRatio="true"> @@ -160,7 +160,7 @@ </HBox> <VBox alignment="CENTER_LEFT" prefHeight="200.0" prefWidth="100.0" spacing="5.0" GridPane.columnIndex="1"> <children> - <ComboBox fx:id="show" prefWidth="150.0" promptText="Show"> + <ComboBox fx:id="filter" prefWidth="150.0" promptText="Show"> <opaqueInsets> <Insets /> </opaqueInsets> @@ -170,7 +170,7 @@ </ComboBox> </children> </VBox> - <Button mnemonicParsing="false" onAction="#switchScene" prefWidth="150.0" text="Continue" GridPane.columnIndex="1" GridPane.rowIndex="2"> + <Button fx:id="returnBtn" mnemonicParsing="false" onAction="#returnToMainMenu" prefWidth="150.0" text="Continue" GridPane.columnIndex="1" GridPane.rowIndex="2"> <GridPane.margin> <Insets bottom="5.0" /> </GridPane.margin>