diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..bee94ecc1da78ef1f1d6715889db951cf3067a3e --- /dev/null +++ b/.gitignore @@ -0,0 +1,39 @@ +############################## +## Java +############################## +.mtj.tmp/ +*.class +*.jar +*.war +*.ear +*.nar + +############################## +## Maven +############################## +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next +pom.xml.bak +release.properties +dependency-reduced-pom.xml +buildNumber.properties +.mvn/timing.properties +.mvn/wrapper/maven-wrapper.jar + +############################## +## IntelliJ +############################## +out/ +.idea/* +*.iml +*.ipr +*.iws + +############################## +## Database +############################## +*.db +*.DS_Store diff --git a/src/main/resources/Budget/Budget.budget b/src/main/resources/Budget/Budget.budget new file mode 100644 index 0000000000000000000000000000000000000000..3e8c3972235097d77c7d936e7a0e9521531bcd01 --- /dev/null +++ b/src/main/resources/Budget/Budget.budget @@ -0,0 +1,3 @@ +budgetPeriod=31 +maxAmount=1000.0 + diff --git a/src/main/resources/Economics/expenseRegisterTest.register b/src/main/resources/Economics/expenseRegisterTest.register new file mode 100644 index 0000000000000000000000000000000000000000..11dddf990a7aab151c18cf9e48c46836f288e508 --- /dev/null +++ b/src/main/resources/Economics/expenseRegisterTest.register @@ -0,0 +1,6 @@ +date=2023-03-03 +description=description +amount=59.900001525878906 +isRecurring=Not recurring +category=CLOTHES + diff --git a/src/main/resources/view/AddBudget.fxml b/src/main/resources/view/AddBudget.fxml index 96e52a73c5c6b258612b7e8a231dd91f8eb5d5fb..7dbedf0e89a599bbc1ac31c3ef66d3c39643c3b0 100644 --- a/src/main/resources/view/AddBudget.fxml +++ b/src/main/resources/view/AddBudget.fxml @@ -12,7 +12,8 @@ <?import javafx.scene.layout.VBox?> <?import javafx.scene.text.Text?> -<AnchorPane prefHeight="150.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.AddBudgetController"> + +<AnchorPane prefHeight="150.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.BudgetController"> <children> <GridPane prefHeight="400.0" prefWidth="600.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> <columnConstraints> @@ -29,7 +30,7 @@ <children> <VBox alignment="CENTER" GridPane.columnIndex="1" GridPane.valignment="CENTER"> <children> - <Label text="Category/Title" /> + <Label text="Label" /> <ComboBox fx:id="categoryVariable" maxWidth="150.0" prefWidth="150.0" /> </children> </VBox> @@ -47,8 +48,8 @@ </VBox> <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" spacing="15.0" GridPane.columnIndex="3" GridPane.rowIndex="1"> <children> - <Button fx:id="cancelButton" mnemonicParsing="false" onAction="#closeButton" text="Cancel" /> - <Button fx:id="addButton" mnemonicParsing="false" onAction="#addBudget" text="Add New Budget" /> + <Button mnemonicParsing="false" onAction="#closeButton" text="Button" /> + <Button mnemonicParsing="false" onAction="#addBudget" text="Button" /> </children> </HBox> </children> diff --git a/src/main/resources/view/addBudget.fxml b/src/main/resources/view/addBudget.fxml deleted file mode 100644 index 7dbedf0e89a599bbc1ac31c3ef66d3c39643c3b0..0000000000000000000000000000000000000000 --- a/src/main/resources/view/addBudget.fxml +++ /dev/null @@ -1,58 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<?import javafx.scene.control.Button?> -<?import javafx.scene.control.ComboBox?> -<?import javafx.scene.control.Label?> -<?import javafx.scene.control.TextField?> -<?import javafx.scene.layout.AnchorPane?> -<?import javafx.scene.layout.ColumnConstraints?> -<?import javafx.scene.layout.GridPane?> -<?import javafx.scene.layout.HBox?> -<?import javafx.scene.layout.RowConstraints?> -<?import javafx.scene.layout.VBox?> -<?import javafx.scene.text.Text?> - - -<AnchorPane prefHeight="150.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.BudgetController"> - <children> - <GridPane prefHeight="400.0" prefWidth="600.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> - <columnConstraints> - <ColumnConstraints hgrow="SOMETIMES" maxWidth="10.0" minWidth="0.0" prefWidth="0.0" /> - <ColumnConstraints hgrow="SOMETIMES" maxWidth="180.0" minWidth="10.0" prefWidth="150.0" /> - <ColumnConstraints hgrow="SOMETIMES" maxWidth="180.0" minWidth="10.0" prefWidth="150.0" /> - <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" /> - <ColumnConstraints hgrow="SOMETIMES" maxWidth="10.0" minWidth="10.0" prefWidth="0.0" /> - </columnConstraints> - <rowConstraints> - <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" /> - <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" /> - </rowConstraints> - <children> - <VBox alignment="CENTER" GridPane.columnIndex="1" GridPane.valignment="CENTER"> - <children> - <Label text="Label" /> - <ComboBox fx:id="categoryVariable" maxWidth="150.0" prefWidth="150.0" /> - </children> - </VBox> - <VBox alignment="CENTER" prefHeight="200.0" prefWidth="100.0" GridPane.columnIndex="2"> - <children> - <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Amount" /> - <TextField fx:id="amountVariable" maxWidth="150.0" /> - </children> - </VBox> - <VBox alignment="CENTER" prefHeight="200.0" prefWidth="100.0" GridPane.columnIndex="3"> - <children> - <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Description" /> - <TextField fx:id="descriptionVariable" /> - </children> - </VBox> - <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" spacing="15.0" GridPane.columnIndex="3" GridPane.rowIndex="1"> - <children> - <Button mnemonicParsing="false" onAction="#closeButton" text="Button" /> - <Button mnemonicParsing="false" onAction="#addBudget" text="Button" /> - </children> - </HBox> - </children> - </GridPane> - </children> -</AnchorPane>